Ticket #4107: diff.2.diff

contrib/auth/models.py

@@ -258 +258 @@
         pass
 
     def __str__(self):
-        return 'AnonymousUser'
+        return _('AnonymousUser')
 
     def __eq__(self, other):
         return isinstance(other, self.__class__)

contrib/admindocs/views.py

@@ -168 +168 @@
             model = m
             break
     if model is None:
-        raise Http404, _("Model %r not found in app %r") % (model_name, app_label)
+        raise Http404, _("Model %(name)r not found in app %(app)r") % {'name': model_name, 'app': app_label}
 
     opts = model._meta
 
@@ -180 +180 @@
         if isinstance(field, models.ForeignKey):
             data_type = related_object_name = field.rel.to.__name__
             app_label = field.rel.to._meta.app_label
-            verbose = utils.parse_rst((_("the related `%s.%s` object")  % (app_label, data_type)), 'model', _('model:') + data_type)
+            verbose = utils.parse_rst((_("the related `%(app)s.%(type)s` object")  % {'app': app_label, 'type': data_type}), 'model', _('model:') + data_type)
         else:
             data_type = get_readable_field_data_type(field)
             verbose = field.verbose_name
@@ -211 +211 @@
 
     # Gather related objects
     for rel in opts.get_all_related_objects():
-        verbose = _("related `%s.%s` objects") % (rel.opts.app_label, rel.opts.object_name)
+        verbose = _("related `%(app)s.%(name)s` objects") % {'app': rel.opts.app_label, 'name': rel.opts.object_name}
         accessor = rel.get_accessor_name()
         fields.append({
             'name'      : "%s.all" % accessor,

template/defaultfilters.py

@@ -2 +2 @@
 
 from django.template import resolve_variable, Library
 from django.conf import settings
-from django.utils.translation import gettext
+from django.utils.translation import gettext, ngettext
 import re
 import random as random_module
 
@@ -517 +517 @@
         return "0 bytes"
         
     if bytes < 1024:
-        return "%d byte%s" % (bytes, bytes != 1 and 's' or '')
+        return ngettext("%(size)d byte", "%(size)d bytes", bytes) % {'size': bytes}
     if bytes < 1024 * 1024:
-        return "%.1f KB" % (bytes / 1024)
+        return gettext("%.1f KB") % (bytes / 1024)
     if bytes < 1024 * 1024 * 1024:
-        return "%.1f MB" % (bytes / (1024 * 1024))
-    return "%.1f GB" % (bytes / (1024 * 1024 * 1024))
+        return gettext("%.1f MB") % (bytes / (1024 * 1024))
+    return gettext("%.1f GB") % (bytes / (1024 * 1024 * 1024))
 
 def pluralize(value, arg='s'):
     """