Author: kmtracey
Date: 2009-12-14 10:05:28 -0600 (Mon, 14 Dec 2009)
New Revision: 11865
Modified:
django/branches/releases/1.1.X/
django/branches/releases/1.1.X/django/contrib/admin/options.py
Log:
[1.1.X] Made the message strings added in r11838 visible to makemessages. Refs
#12281.
r11864 from trunk.
Property changes on: django/branches/releases/1.1.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-11500,11523,11527-11528,11531-11552,11554,11577,11579-11581,11588-11589,11591-11592,11596-11599,11601-11617,11619-11626,11628-11635,11637-11638,11643-11644,11648-11653,11656,11670,11678,11681,11684,11686,11688,11691,11693,11695,11697,11699,11701,11703,11705,11707,11714,11719,11732,11734,11740,11748,11751,11753,11756,11760,11800,11808,11815,11817,11822,11826,11833,11835,11837,11839,11841,11844,11857
+
/django/trunk:1-11500,11523,11527-11528,11531-11552,11554,11577,11579-11581,11588-11589,11591-11592,11596-11599,11601-11617,11619-11626,11628-11635,11637-11638,11643-11644,11648-11653,11656,11670,11678,11681,11684,11686,11688,11691,11693,11695,11697,11699,11701,11703,11705,11707,11714,11719,11732,11734,11740,11748,11751,11753,11756,11760,11800,11808,11815,11817,11822,11826,11833,11835,11837,11839,11841,11844,11857,11864
Modified: django/branches/releases/1.1.X/django/contrib/admin/options.py
===================================================================
--- django/branches/releases/1.1.X/django/contrib/admin/options.py
2009-12-14 16:01:43 UTC (rev 11864)
+++ django/branches/releases/1.1.X/django/contrib/admin/options.py
2009-12-14 16:05:28 UTC (rev 11865)
@@ -690,8 +690,8 @@
selected = request.POST.getlist(helpers.ACTION_CHECKBOX_NAME)
if not selected:
# Reminder that something needs to be selected or nothing will
happen
- msg = "Items must be selected in order to perform actions on
them. No items have been changed."
- self.message_user(request, _(msg))
+ msg = _("Items must be selected in order to perform actions on
them. No items have been changed.")
+ self.message_user(request, msg)
return None
response = func(self, request, queryset.filter(pk__in=selected))
@@ -704,8 +704,8 @@
else:
return HttpResponseRedirect(".")
else:
- msg = "No action selected."
- self.message_user(request, _(msg))
+ msg = _("No action selected.")
+ self.message_user(request, msg)
def add_view(self, request, form_url='', extra_context=None):
"The 'add' admin view for this model."
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
