Commit 203c4fef authored by Ramiro Morales's avatar Ramiro Morales
Browse files

Fixed translatability of application names in admin app. 

Also, made usage of the `filter` template tag consistent in some
breadcrumbs elements across the different admin templates.

Fixes #10436.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17378 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent aef0283f

django/contrib/admin/sites.py

+3 −3
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ class AdminSite(object): 
                        app_dict[app_label]['models'].append(model_dict)

                    else:

                        app_dict[app_label] = {

                            'name': app_label.title(),

                            'name': app_label,

                            'app_url': reverse('admin:app_list', kwargs={'app_label': app_label}, current_app=self.name),

                            'has_module_perms': has_module_perms,

                            'models': [model_dict],
@@ -415,7 +415,7 @@ class AdminSite(object): 
                            # something to display, add in the necessary meta

                            # information.

                            app_dict = {

                                'name': app_label.title(),

                                'name': app_label,

                                'app_url': '',

                                'has_module_perms': has_module_perms,

                                'models': [model_dict],
@@ -425,7 +425,7 @@ class AdminSite(object): 
        # Sort the models alphabetically within each app.

        app_dict['models'].sort(key=lambda x: x['name'])

        context = {

            'title': _('%s administration') % capfirst(app_label),

            'title': _('%(app_label)s administration') % {'app_label': capfirst(_(app_label))},

            'app_list': [app_dict],

        }

        context.update(extra_context or {})

django/contrib/admin/templates/admin/app_index.html

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>

&rsaquo;

{% for app in app_list %}

{% blocktrans with app.name as name %}{{ name }}{% endblocktrans %}

{% trans app.name|title %}

{% endfor %}

</div>

{% endblock %}

django/contrib/admin/templates/admin/auth/user/change_password.html

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ 
{% block breadcrumbs %}

<div class="breadcrumbs">

<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>

&rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_label|capfirst|escape }}</a>

&rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>

&rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{% trans opts.app_label|capfirst|escape %}</a>

&rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst|escape }}</a>

&rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}{{ original.pk }}">{{ original|truncatewords:"18" }}</a>

&rsaquo; {% trans 'Change password' %}

</div>

django/contrib/admin/templates/admin/change_form.html

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
{% block breadcrumbs %}

<div class="breadcrumbs">

<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>

&rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ app_label|capfirst|escape }}</a>

&rsaquo; {% if has_change_permission %}<a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %}

&rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{% trans app_label|capfirst|escape %}</a>

&rsaquo; {% if has_change_permission %}<a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst|escape }}</a>{% else %}{{ opts.verbose_name_plural|capfirst|escape }}{% endif %}

&rsaquo; {% if add %}{% trans 'Add' %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %}

</div>

{% endblock %}

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

+2 −2
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ 
{% block breadcrumbs %}

<div class="breadcrumbs">

<a href="{% url 'admin:index' %}">{% trans 'Home' %}</a>

&rsaquo; <a href="{% url 'admin:app_list' app_label=cl.opts.app_label %}">{{ app_label|capfirst|escape }}</a>

&rsaquo; {{ cl.opts.verbose_name_plural|capfirst }}

&rsaquo; <a href="{% url 'admin:app_list' app_label=cl.opts.app_label %}">{% trans app_label|capfirst|escape %}</a>

&rsaquo; {{ cl.opts.verbose_name_plural|capfirst|escape }}

</div>

{% endblock %}

{% endif %}