Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #19114 -- Fixed LogEntry unicode representation

Thanks niko at neagee.net for the report and Emil Stenstrom for
the patch.
  • Loading branch information...
commit e0363c688d9b85124ec4fbac00debe5f4dc1e63c 1 parent 2a67374
Claude Paroz claudep authored
13 django/contrib/admin/models.py
View
@@ -4,7 +4,7 @@
from django.conf import settings
from django.contrib.contenttypes.models import ContentType
from django.contrib.admin.util import quote
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext, ugettext_lazy as _
from django.utils.encoding import smart_text
from django.utils.encoding import python_2_unicode_compatible
@@ -42,13 +42,16 @@ def __repr__(self):
def __str__(self):
if self.action_flag == ADDITION:
- return _('Added "%(object)s".') % {'object': self.object_repr}
+ return ugettext('Added "%(object)s".') % {'object': self.object_repr}
elif self.action_flag == CHANGE:
- return _('Changed "%(object)s" - %(changes)s') % {'object': self.object_repr, 'changes': self.change_message}
+ return ugettext('Changed "%(object)s" - %(changes)s') % {
+ 'object': self.object_repr,
+ 'changes': self.change_message,
+ }
elif self.action_flag == DELETION:
- return _('Deleted "%(object)s."') % {'object': self.object_repr}
+ return ugettext('Deleted "%(object)s."') % {'object': self.object_repr}
- return _('LogEntry Object')
+ return ugettext('LogEntry Object')
def is_addition(self):
return self.action_flag == ADDITION
4 tests/regressiontests/admin_util/tests.py
View
@@ -274,6 +274,10 @@ def test_logentry_unicode(self):
six.text_type(log_entry).startswith('Deleted ')
)
+ # Make sure custom action_flags works
+ log_entry.action_flag = 4
+ self.assertEqual(six.text_type(log_entry), 'LogEntry Object')
+
def test_safestring_in_field_label(self):
# safestring should not be escaped
class MyForm(forms.Form):
Please sign in to comment.
Something went wrong with that request. Please try again.