mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-06-05 11:39:13 +00:00
Code Issues 32 Releases Wiki Activity

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

Browse Source
This commit is contained in:
Szilveszter Farkas 2015-07-12 10:39:44 -05:00 committed by Tim Graham
parent f46a774758
commit f576b23a65
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/admin/models.py
View File

@ -27,8 +27,8 @@ class LogEntryManager(models.Manager):
@python_2_unicode_compatible @python_2_unicode_compatible
class LogEntry(models.Model): class LogEntry(models.Model):
action_time = models.DateTimeField(_('action time'), auto_now=True) action_time = models.DateTimeField(_('action time'), auto_now=True)
user = models.ForeignKey(settings.AUTH_USER_MODEL) user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_('user'))
content_type = models.ForeignKey(ContentType, blank=True, null=True) content_type = models.ForeignKey(ContentType, verbose_name=_('content type'), blank=True, null=True)
object_id = models.TextField(_('object id'), blank=True, null=True) object_id = models.TextField(_('object id'), blank=True, null=True)
object_repr = models.CharField(_('object repr'), max_length=200) object_repr = models.CharField(_('object repr'), max_length=200)
action_flag = models.PositiveSmallIntegerField(_('action flag')) action_flag = models.PositiveSmallIntegerField(_('action flag'))

2
django/contrib/auth/models.py
View File

@ -59,7 +59,7 @@ class Permission(models.Model):
created for each Django model. created for each Django model.
""" """
name = models.CharField(_('name'), max_length=255) 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) codename = models.CharField(_('codename'), max_length=100)
objects = PermissionManager() objects = PermissionManager()

2
django/contrib/flatpages/models.py
View File

@ -22,7 +22,7 @@ class FlatPage(models.Model):
registration_required = models.BooleanField(_('registration required'), registration_required = models.BooleanField(_('registration required'),
help_text=_("If this is checked, only logged-in users will be able to view the page."), help_text=_("If this is checked, only logged-in users will be able to view the page."),
default=False) default=False)
sites = models.ManyToManyField(Site) sites = models.ManyToManyField(Site, verbose_name=_('sites'))
class Meta: class Meta:
db_table = 'django_flatpage' db_table = 'django_flatpage'

2
django/contrib/redirects/models.py
View File

@ -6,7 +6,7 @@ from django.utils.translation import ugettext_lazy as _
@python_2_unicode_compatible @python_2_unicode_compatible
class Redirect(models.Model): 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, 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/'.")) 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, new_path = models.CharField(_('redirect to'), max_length=200, blank=True,