mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 17:59:13 +00:00
Code Issues 32 Releases Wiki Activity

magic-removal: Uncapitalized verbose_name and verbose_name_plural in contrib apps, because the title should be in lower case

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2745 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2006-04-24 01:13:44 +00:00
parent 489d5bae5c
commit 5d7c1fe714
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,25 +14,25 @@ class Permission(models.Model):
content_type = models.ForeignKey(ContentType) content_type = models.ForeignKey(ContentType)
codename = models.CharField(_('codename'), maxlength=100) codename = models.CharField(_('codename'), maxlength=100)
class Meta: class Meta:
verbose_name = _('Permission') verbose_name = _('permission')
verbose_name_plural = _('Permissions') verbose_name_plural = _('permissions')
unique_together = (('content_type', 'codename'),) unique_together = (('content_type', 'codename'),)
ordering = ('content_type', 'codename') ordering = ('content_type', 'codename')
def __repr__(self): def __str__(self):
return "%r | %s" % (self.content_type, self.name) return "%r | %s" % (self.content_type, self.name)
class Group(models.Model): class Group(models.Model):
name = models.CharField(_('name'), maxlength=80, unique=True) name = models.CharField(_('name'), maxlength=80, unique=True)
permissions = models.ManyToManyField(Permission, verbose_name=_('permissions'), blank=True, filter_interface=models.HORIZONTAL) permissions = models.ManyToManyField(Permission, verbose_name=_('permissions'), blank=True, filter_interface=models.HORIZONTAL)
class Meta: class Meta:
verbose_name = _('Group') verbose_name = _('group')
verbose_name_plural = _('Groups') verbose_name_plural = _('groups')
ordering = ('name',) ordering = ('name',)
class Admin: class Admin:
search_fields = ('name',) search_fields = ('name',)
def __repr__(self): def __str__(self):
return self.name return self.name
class UserManager(models.Manager): class UserManager(models.Manager):
@ -67,8 +67,8 @@ class User(models.Model):
user_permissions = models.ManyToManyField(Permission, verbose_name=_('user permissions'), blank=True, filter_interface=models.HORIZONTAL) user_permissions = models.ManyToManyField(Permission, verbose_name=_('user permissions'), blank=True, filter_interface=models.HORIZONTAL)
objects = UserManager() objects = UserManager()
class Meta: class Meta:
verbose_name = _('User') verbose_name = _('user')
verbose_name_plural = _('Users') verbose_name_plural = _('users')
ordering = ('username',) ordering = ('username',)
class Admin: class Admin:
fields = ( fields = (
@ -82,7 +82,7 @@ class User(models.Model):
list_filter = ('is_staff', 'is_superuser') list_filter = ('is_staff', 'is_superuser')
search_fields = ('username', 'first_name', 'last_name', 'email') search_fields = ('username', 'first_name', 'last_name', 'email')
def __repr__(self): def __str__(self):
return self.username return self.username
def get_absolute_url(self): def get_absolute_url(self):
@ -216,9 +216,9 @@ class User(models.Model):
class Message(models.Model): class Message(models.Model):
user = models.ForeignKey(User) user = models.ForeignKey(User)
message = models.TextField(_('Message')) message = models.TextField(_('message'))
def __repr__(self): def __str__(self):
return self.message return self.message
class AnonymousUser(object): class AnonymousUser(object):
@ -228,7 +228,7 @@ class AnonymousUser(object):
def __init__(self): def __init__(self):
pass pass
def __repr__(self): def __str__(self):
return 'AnonymousUser' return 'AnonymousUser'
def save(self): def save(self):

20
django/contrib/comments/models.py
View File

@ -86,8 +86,8 @@ class Comment(models.Model):
site = models.ForeignKey(Site) site = models.ForeignKey(Site)
objects = CommentManager() objects = CommentManager()
class Meta: class Meta:
verbose_name = _('Comment') verbose_name = _('comment')
verbose_name_plural = _('Comments') verbose_name_plural = _('comments')
ordering = ('-submit_date',) ordering = ('-submit_date',)
class Admin: class Admin:
fields = ( fields = (
@ -172,8 +172,8 @@ class FreeComment(models.Model):
approved = models.BooleanField(_('approved by staff')) approved = models.BooleanField(_('approved by staff'))
site = models.ForeignKey(Site) site = models.ForeignKey(Site)
class Meta: class Meta:
verbose_name = _('Free comment') verbose_name = _('free comment')
verbose_name_plural = _('Free comments') verbose_name_plural = _('free comments')
ordering = ('-submit_date',) ordering = ('-submit_date',)
class Admin: class Admin:
fields = ( fields = (
@ -233,8 +233,8 @@ class KarmaScore(models.Model):
scored_date = models.DateTimeField(_('score date'), auto_now=True) scored_date = models.DateTimeField(_('score date'), auto_now=True)
objects = KarmaScoreManager() objects = KarmaScoreManager()
class Meta: class Meta:
verbose_name = _('Karma score') verbose_name = _('karma score')
verbose_name_plural = _('Karma scores') verbose_name_plural = _('karma scores')
unique_together = (('user', 'comment'),) unique_together = (('user', 'comment'),)
def __repr__(self): def __repr__(self):
@ -264,8 +264,8 @@ class UserFlag(models.Model):
flag_date = models.DateTimeField(_('flag date'), auto_now_add=True) flag_date = models.DateTimeField(_('flag date'), auto_now_add=True)
objects = UserFlagManager() objects = UserFlagManager()
class Meta: class Meta:
verbose_name = _('User flag') verbose_name = _('user flag')
verbose_name_plural = _('User flags') verbose_name_plural = _('user flags')
unique_together = (('user', 'comment'),) unique_together = (('user', 'comment'),)
def __repr__(self): def __repr__(self):
@ -276,8 +276,8 @@ class ModeratorDeletion(models.Model):
comment = models.ForeignKey(Comment) comment = models.ForeignKey(Comment)
deletion_date = models.DateTimeField(_('deletion date'), auto_now_add=True) deletion_date = models.DateTimeField(_('deletion date'), auto_now_add=True)
class Meta: class Meta:
verbose_name = _('Moderator deletion') verbose_name = _('moderator deletion')
verbose_name_plural = _('Moderator deletions') verbose_name_plural = _('moderator deletions')
unique_together = (('user', 'comment'),) unique_together = (('user', 'comment'),)
def __repr__(self): def __repr__(self):