Author: jacob
Date: 2008-08-28 15:17:31 -0500 (Thu, 28 Aug 2008)
New Revision: 8679
Modified:
django/trunk/django/contrib/admin/sites.py
django/trunk/django/contrib/admin/widgets.py
django/trunk/django/contrib/formtools/wizard.py
Log:
Marked a handful of missed strings for translation. Fixes #8644, #8617, and
#8610.
Modified: django/trunk/django/contrib/admin/sites.py
===================================================================
--- django/trunk/django/contrib/admin/sites.py 2008-08-28 19:54:43 UTC (rev
8678)
+++ django/trunk/django/contrib/admin/sites.py 2008-08-28 20:17:31 UTC (rev
8679)
@@ -403,7 +403,7 @@
# Sort the models alphabetically within each app.
app_dict['models'].sort(lambda x, y: cmp(x['name'], y['name']))
context = {
- 'title': _('%s administration' % capfirst(app_label)),
+ 'title': _('%s administration') % capfirst(app_label),
'app_list': [app_dict],
'root_path': self.root_path,
}
Modified: django/trunk/django/contrib/admin/widgets.py
===================================================================
--- django/trunk/django/contrib/admin/widgets.py 2008-08-28 19:54:43 UTC
(rev 8678)
+++ django/trunk/django/contrib/admin/widgets.py 2008-08-28 20:17:31 UTC
(rev 8679)
@@ -112,7 +112,7 @@
# API to determine the ID dynamically.
output.append('<a href="%s%s" class="related-lookup" id="lookup_id_%s"
onclick="return showRelatedObjectLookupPopup(this);"> ' % \
(related_url, url, name))
- output.append('<img src="%simg/admin/selector-search.gif" width="16"
height="16" alt="Lookup" /></a>' % settings.ADMIN_MEDIA_PREFIX)
+ output.append('<img src="%simg/admin/selector-search.gif" width="16"
height="16" alt="%s" /></a>' % (settings.ADMIN_MEDIA_PREFIX, _('Lookup')))
if value:
output.append(self.label_for_value(value))
return mark_safe(u''.join(output))
@@ -192,7 +192,7 @@
# API to determine the ID dynamically.
output.append(u'<a href="%sadd/" class="add-another"
id="add_id_%s" onclick="return showAddAnotherPopup(this);"> ' % \
(related_url, name))
- output.append(u'<img src="%simg/admin/icon_addlink.gif" width="10"
height="10" alt="Add Another"/></a>' % settings.ADMIN_MEDIA_PREFIX)
+ output.append(u'<img src="%simg/admin/icon_addlink.gif" width="10"
height="10" alt="%s"/></a>' % (settings.ADMIN_MEDIA_PREFIX, _('Add Another')))
return mark_safe(u''.join(output))
def build_attrs(self, extra_attrs=None, **kwargs):
Modified: django/trunk/django/contrib/formtools/wizard.py
===================================================================
--- django/trunk/django/contrib/formtools/wizard.py 2008-08-28 19:54:43 UTC
(rev 8678)
+++ django/trunk/django/contrib/formtools/wizard.py 2008-08-28 20:17:31 UTC
(rev 8679)
@@ -12,6 +12,7 @@
from django.shortcuts import render_to_response
from django.template.context import RequestContext
from django.utils.hashcompat import md5_constructor
+from django.utils.translation import ugettext_lazy as _
from django.contrib.formtools.utils import security_hash
class FormWizard(object):
@@ -126,7 +127,7 @@
This default implementation simply renders the form for the given step,
but subclasses may want to display an error message, etc.
"""
- return self.render(self.get_form(step), request, step,
context={'wizard_error': 'We apologize, but your form has expired. Please
continue filling out the form from this page.'})
+ return self.render(self.get_form(step), request, step,
context={'wizard_error': _('We apologize, but your form has expired. Please
continue filling out the form from this page.')})
def render_revalidation_failure(self, request, step, form):
"""
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
