Commit f576b23a authored by Szilveszter Farkas's avatar Szilveszter Farkas Committed by Tim Graham
Browse files

Fixed #25073 -- Added verbose_name to contrib's model fields that were missing it.

parent f46a7747

django/contrib/admin/models.py

+2 −2
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ class LogEntryManager(models.Manager): 
@python_2_unicode_compatible

class LogEntry(models.Model):

    action_time = models.DateTimeField(_('action time'), auto_now=True)

    user = models.ForeignKey(settings.AUTH_USER_MODEL)

    content_type = models.ForeignKey(ContentType, blank=True, null=True)

    user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_('user'))

    content_type = models.ForeignKey(ContentType, verbose_name=_('content type'), blank=True, null=True)

    object_id = models.TextField(_('object id'), blank=True, null=True)

    object_repr = models.CharField(_('object repr'), max_length=200)

    action_flag = models.PositiveSmallIntegerField(_('action flag'))

django/contrib/auth/models.py

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ class Permission(models.Model): 
    created for each Django model.

    """

    name = models.CharField(_('name'), max_length=255)

    content_type = models.ForeignKey(ContentType)

    content_type = models.ForeignKey(ContentType, verbose_name=_('content type'))

    codename = models.CharField(_('codename'), max_length=100)

    objects = PermissionManager()

django/contrib/flatpages/models.py

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ class FlatPage(models.Model): 
    registration_required = models.BooleanField(_('registration required'),

        help_text=_("If this is checked, only logged-in users will be able to view the page."),

        default=False)

    sites = models.ManyToManyField(Site)

    sites = models.ManyToManyField(Site, verbose_name=_('sites'))



    class Meta:

        db_table = 'django_flatpage'

django/contrib/redirects/models.py

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ from django.utils.translation import ugettext_lazy as _ 


@python_2_unicode_compatible

class Redirect(models.Model):

    site = models.ForeignKey(Site)

    site = models.ForeignKey(Site, verbose_name=_('site'))

    old_path = models.CharField(_('redirect from'), max_length=200, db_index=True,

        help_text=_("This should be an absolute path, excluding the domain name. Example: '/events/search/'."))

    new_path = models.CharField(_('redirect to'), max_length=200, blank=True,