i18n: added a lot more translations to the admin stuff, especially model related stuff

git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@912 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 70 insertions, 48 deletions

diff --git a/django/models/auth.py b/django/models/auth.py
index 9a10434c94..5d74d4645f 100644
--- a/django/models/auth.py
+++ b/django/models/auth.py
@@ -1,12 +1,14 @@
 from django.core import meta, validators
 from django.models import core
-from django.utils.translation import gettext_lazy
+from django.utils.translation import gettext_lazy as _
 
 class Permission(meta.Model):
-    name = meta.CharField(maxlength=50)
+    name = meta.CharField(_('name'), maxlength=50)
     package = meta.ForeignKey(core.Package, db_column='package')
-    codename = meta.CharField(maxlength=100)
+    codename = meta.CharField(_('codename'), maxlength=100)
     class META:
+        verbose_name = _('Permission')
+        verbose_name_plural = _('Permissions')
         unique_together = (('package', 'codename'),)
         ordering = ('package', 'codename')
 
@@ -14,9 +16,11 @@ class Permission(meta.Model):
         return "%s | %s" % (self.package, self.name)
 
 class Group(meta.Model):
-    name = meta.CharField(maxlength=80, unique=True)
+    name = meta.CharField(_('name'), maxlength=80, unique=True)
     permissions = meta.ManyToManyField(Permission, blank=True, filter_interface=meta.HORIZONTAL)
     class META:
+        verbose_name = _('Group')
+        verbose_name_plural = _('Groups')
         ordering = ('name',)
         admin = meta.Admin(
             search_fields = ('name',),
@@ -26,20 +30,22 @@ class Group(meta.Model):
         return self.name
 
 class User(meta.Model):
-    username = meta.CharField(maxlength=30, unique=True, validator_list=[validators.isAlphaNumeric])
-    first_name = meta.CharField(maxlength=30, blank=True)
-    last_name = meta.CharField(maxlength=30, blank=True)
-    email = meta.EmailField('e-mail address', blank=True)
-    password_md5 = meta.CharField('password', maxlength=32, help_text=gettext_lazy("Use an MD5 hash -- not the raw password."))
-    is_staff = meta.BooleanField('staff status', help_text=gettext_lazy("Designates whether the user can log into this admin site."))
-    is_active = meta.BooleanField('active', default=True)
-    is_superuser = meta.BooleanField('superuser status')
-    last_login = meta.DateTimeField(default=meta.LazyDate())
-    date_joined = meta.DateTimeField(default=meta.LazyDate())
+    username = meta.CharField(_('username'), maxlength=30, unique=True, validator_list=[validators.isAlphaNumeric])
+    first_name = meta.CharField(_('first name'), maxlength=30, blank=True)
+    last_name = meta.CharField(_('last name'), maxlength=30, blank=True)
+    email = meta.EmailField(_('e-mail address'), blank=True)
+    password_md5 = meta.CharField(_('password'), maxlength=32, help_text=_("Use an MD5 hash -- not the raw password."))
+    is_staff = meta.BooleanField(_('staff status'), help_text=_("Designates whether the user can log into this admin site."))
+    is_active = meta.BooleanField(_('active'), default=True)
+    is_superuser = meta.BooleanField(_('superuser status'))
+    last_login = meta.DateTimeField(_('last login'), default=meta.LazyDate())
+    date_joined = meta.DateTimeField(_('date joined'), default=meta.LazyDate())
     groups = meta.ManyToManyField(Group, blank=True,
-        help_text=gettext_lazy("In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."))
+        help_text=_("In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."))
     user_permissions = meta.ManyToManyField(Permission, blank=True, filter_interface=meta.HORIZONTAL)
     class META:
+        verbose_name = _('User')
+        verbose_name_plural = _('Users')
         module_constants = {
             'SESSION_KEY': '_auth_user_id',
         }
@@ -48,10 +54,10 @@ class User(meta.Model):
         admin = meta.Admin(
             fields = (
                 (None, {'fields': ('username', 'password_md5')}),
-                ('Personal info', {'fields': ('first_name', 'last_name', 'email')}),
-                ('Permissions', {'fields': ('is_staff', 'is_active', 'is_superuser', 'user_permissions')}),
-                ('Important dates', {'fields': ('last_login', 'date_joined')}),
-                ('Groups', {'fields': ('groups',)}),
+                (_('Personal info'), {'fields': ('first_name', 'last_name', 'email')}),
+                (_('Permissions'), {'fields': ('is_staff', 'is_active', 'is_superuser', 'user_permissions')}),
+                (_('Important dates'), {'fields': ('last_login', 'date_joined')}),
+                (_('Groups'), {'fields': ('groups',)}),
             ),
             list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff'),
             list_filter = ('is_staff', 'is_superuser'),
@@ -173,22 +179,27 @@ class User(meta.Model):
 
 class Message(meta.Model):
     user = meta.ForeignKey(User)
-    message = meta.TextField()
+    message = meta.TextField(_('Message'))
 
     def __repr__(self):
         return self.message
 
+    class META:
+        verbose_name = _('Message')
+        verbose_name_plural = _('Messages')
+
 class LogEntry(meta.Model):
-    action_time = meta.DateTimeField(auto_now=True)
+    action_time = meta.DateTimeField(_('action time'), auto_now=True)
     user = meta.ForeignKey(User)
     content_type = meta.ForeignKey(core.ContentType, blank=True, null=True) # TODO: content_type_id name?
-    object_id = meta.TextField(blank=True, null=True)
-    object_repr = meta.CharField(maxlength=200)
-    action_flag = meta.PositiveSmallIntegerField()
+    object_id = meta.TextField(_('object id'), blank=True, null=True)
+    object_repr = meta.CharField(_('object repr'), maxlength=200)
+    action_flag = meta.PositiveSmallIntegerField(_('action flag'))
     change_message = meta.TextField(blank=True)
     class META:
         module_name = 'log'
-        verbose_name_plural = 'log entries'
+        verbose_name = _('log entry')
+        verbose_name_plural = _('log entries')
         db_table = 'auth_admin_log'
         ordering = ('-action_time',)
         module_constants = {
diff --git a/django/models/core.py b/django/models/core.py
index d56a4fc64b..89695c21b2 100644
--- a/django/models/core.py
+++ b/django/models/core.py
@@ -1,10 +1,12 @@
 from django.core import meta, validators
-from django.utils.translation import gettext_lazy
+from django.utils.translation import gettext_lazy as _
 
 class Site(meta.Model):
-    domain = meta.CharField('domain name', maxlength=100)
-    name = meta.CharField('display name', maxlength=50)
+    domain = meta.CharField(_('domain name'), maxlength=100)
+    name = meta.CharField(_('display name'), maxlength=50)
     class META:
+        verbose_name = _('site')
+        verbose_name_plural = _('sites')
         db_table = 'sites'
         ordering = ('domain',)
 
@@ -17,9 +19,11 @@ class Site(meta.Model):
         return get_object(pk=SITE_ID)
 
 class Package(meta.Model):
-    label = meta.CharField(maxlength=20, primary_key=True)
-    name = meta.CharField(maxlength=30, unique=True)
+    label = meta.CharField(_('label'), maxlength=20, primary_key=True)
+    name = meta.CharField(_('name'), maxlength=30, unique=True)
     class META:
+        verbose_name = _('package')
+        verbose_name_plural = _('packages')
         db_table = 'packages'
         ordering = ('name',)
 
@@ -27,10 +31,12 @@ class Package(meta.Model):
         return self.name
 
 class ContentType(meta.Model):
-    name = meta.CharField(maxlength=100)
+    name = meta.CharField(_('name'), maxlength=100)
     package = meta.ForeignKey(Package, db_column='package')
-    python_module_name = meta.CharField(maxlength=50)
+    python_module_name = meta.CharField(_('python module name'), maxlength=50)
     class META:
+        verbose_name = _('content type')
+        verbose_name_plural = _('content types')
         db_table = 'content_types'
         ordering = ('package', 'name')
         unique_together = (('package', 'python_module_name'),)
@@ -53,11 +59,13 @@ class ContentType(meta.Model):
 
 class Redirect(meta.Model):
     site = meta.ForeignKey(Site, radio_admin=meta.VERTICAL)
-    old_path = meta.CharField('redirect from', maxlength=200, db_index=True,
-        help_text=gettext_lazy("This should be an absolute path, excluding the domain name. Example: '/events/search/'."))
-    new_path = meta.CharField('redirect to', maxlength=200, blank=True,
-        help_text=gettext_lazy("This can be either an absolute path (as above) or a full URL starting with 'http://'."))
+    old_path = meta.CharField(_('redirect from'), maxlength=200, db_index=True,
+        help_text=_("This should be an absolute path, excluding the domain name. Example: '/events/search/'."))
+    new_path = meta.CharField(_('redirect to'), maxlength=200, blank=True,
+        help_text=_("This can be either an absolute path (as above) or a full URL starting with 'http://'."))
     class META:
+        verbose_name = _('redirect')
+        verbose_name_plural = _('redirects')
         db_table = 'redirects'
         unique_together=(('site', 'old_path'),)
         ordering = ('old_path',)
@@ -70,18 +78,19 @@ class Redirect(meta.Model):
         return "%s ---> %s" % (self.old_path, self.new_path)
 
 class FlatFile(meta.Model):
-    url = meta.CharField('URL', maxlength=100, validator_list=[validators.isAlphaNumericURL],
-        help_text=gettext_lazy("Example: '/about/contact/'. Make sure to have leading and trailing slashes."))
-    title = meta.CharField(maxlength=200)
-    content = meta.TextField()
-    enable_comments = meta.BooleanField()
-    template_name = meta.CharField(maxlength=70, blank=True,
-        help_text=gettext_lazy("Example: 'flatfiles/contact_page'. If this isn't provided, the system will use 'flatfiles/default'."))
-    registration_required = meta.BooleanField(help_text=gettext_lazy("If this is checked, only logged-in users will be able to view the page."))
+    url = meta.CharField(_('URL'), maxlength=100, validator_list=[validators.isAlphaNumericURL],
+        help_text=_("Example: '/about/contact/'. Make sure to have leading and trailing slashes."))
+    title = meta.CharField(_('title'), maxlength=200)
+    content = meta.TextField(_('content'))
+    enable_comments = meta.BooleanField(_('enable comments'))
+    template_name = meta.CharField(_('template name'), maxlength=70, blank=True,
+        help_text=_("Example: 'flatfiles/contact_page'. If this isn't provided, the system will use 'flatfiles/default'."))
+    registration_required = meta.BooleanField(_('registration required'), help_text=_("If this is checked, only logged-in users will be able to view the page."))
     sites = meta.ManyToManyField(Site)
     class META:
         db_table = 'flatfiles'
-        verbose_name = 'flat page'
+        verbose_name = _('flat page')
+        verbose_name_plural = _('flat pages')
         ordering = ('url',)
         admin = meta.Admin(
             fields = (
@@ -102,10 +111,12 @@ import base64, md5, random, sys
 import cPickle as pickle
 
 class Session(meta.Model):
-    session_key = meta.CharField(maxlength=40, primary_key=True)
-    session_data = meta.TextField()
-    expire_date = meta.DateTimeField()
+    session_key = meta.CharField(_('session key'), maxlength=40, primary_key=True)
+    session_data = meta.TextField(_('session data'))
+    expire_date = meta.DateTimeField(_('expire date'))
     class META:
+        verbose_name = _('session')
+        verbose_name_plural = _('sessions')
         module_constants = {
             'base64': base64,
             'md5': md5,