Ticket #5519: 06-support-for-cs.diff

django/contrib/admin/options.py

@@ -521 +521 @@
             inline_admin_formsets.append(inline_admin_formset)
 
         c = template.RequestContext(request, {
-            'title': _('Add %s') % uncapfirst(opts.verbose_name),
+            'title': capfirst(_('Add %s') % uncapfirst(opts.verbose_name)),
             'adminform': adminForm,
             'is_popup': request.REQUEST.has_key('_popup'),
             'media': media,
@@ -596 +596 @@
             inline_admin_formsets.append(inline_admin_formset)
 
         c = template.RequestContext(request, {
-            'title': _('Change %s') % uncapfirst(opts.verbose_name),
+            'title': capfirst(_('Change %s') % uncapfirst(opts.verbose_name)),
             'adminform': adminForm,
             'object_id': object_id,
             'original': obj,

django/contrib/admin/templates/admin/change_list.html

@@ -15 +15 @@
 <div id="content-main">
 {% block object-tools %}
 {% if has_add_permission %}
-<ul class="object-tools"><li><a href="add/{% if is_popup %}?_popup=1{% endif %}" class="addlink">{% blocktrans with cl.opts.verbose_name|uncapfirst|escape as name %}Add {{ name }}{% endblocktrans %}</a></li></ul>
+<ul class="object-tools"><li><a href="add/{% if is_popup %}?_popup=1{% endif %}" class="addlink">{% filter capfirst %}{% blocktrans with cl.opts.verbose_name|uncapfirst|escape as name %}Add {{ name }}{% endblocktrans %}{% endfilter %}</a></li></ul>
 {% endif %}
 {% endblock %}
 <div class="module{% if cl.has_filters %} filtered{% endif %}" id="changelist">

django/contrib/admin/templates/admin/pagination.html

@@ -7 +7 @@
 {% endfor %}
 {% endif %}
 {% ifequal cl.result_count 1 %}
-        {% blocktrans with cl.result_count as count and cl.opts.verbose_name|uncapfirst|escape as verbose_name %}{{ count }} {{ verbose_name }}{% endblocktrans %}
+        {% filter capfirst %}{% blocktrans with cl.result_count as count and cl.opts.verbose_name|uncapfirst|escape as verbose_name %}{{ count }} {{ verbose_name }}{% endblocktrans %}{% endfilter %}
 {% else %}
-        {% blocktrans with cl.result_count as count and cl.opts.verbose_name_plural|uncapfirst|escape as verbose_name_plural %}{{ count }} {{ verbose_name_plural }}{% endblocktrans %}
+        {% filter capfirst %}{% blocktrans with cl.result_count as count and cl.opts.verbose_name_plural|uncapfirst|escape as verbose_name_plural %}{{ count }} {{ verbose_name_plural }}{% endblocktrans %}{% endfilter %}
 {% endifequal %}
 {% if show_all_url %}&nbsp;&nbsp;<a href="{{ show_all_url }}" class="showall">{% trans 'Show all' %}</a>{% endif %}
 </p>

django/contrib/admin/views/main.py

@@ -9 +9 @@
 from django.db.models.query import handle_legacy_orderlist, QuerySet
 from django.http import Http404
 from django.utils.encoding import force_unicode, smart_str
-from django.utils.text import uncapfirst
+from django.utils.text import capfirst, uncapfirst
 from django.utils.translation import ugettext
 import operator
 
@@ -147 +147 @@
         self.query = request.GET.get(SEARCH_VAR, '')
         self.query_set = self.get_query_set()
         self.get_results(request)
-        self.title = (self.is_popup and ugettext('Select %s') % force_unicode(uncapfirst(self.opts.verbose_name)) or ugettext('Select %s to change') % force_unicode(uncapfirst(self.opts.verbose_name)))
+        self.title = capfirst((self.is_popup and ugettext('Select %s') % force_unicode(uncapfirst(self.opts.verbose_name)) or ugettext('Select %s to change') % force_unicode(uncapfirst(self.opts.verbose_name))))
         self.filter_specs, self.has_filters = self.get_filters(request)
         self.pk_attname = self.lookup_opts.pk.attname