Commit f51205d0 authored by Ramiro Morales's avatar Ramiro Morales
Browse files

Updated uses of i18n.blocktrans template tag to use the new more compact syntax introduced in 1.3. 

Ref r14922.

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

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

+2 −2
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ 
{% if is_popup %}<input type="hidden" name="_popup" value="1" />{% endif %}

{% if form.errors %}

    <p class="errornote">

    {% blocktrans count form.errors.items|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}

    {% blocktrans count counter=form.errors.items|length %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}

    </p>

{% endif %}



<p>{% blocktrans with original.username as username %}Enter a new password for the user <strong>{{ username }}</strong>.{% endblocktrans %}</p>

<p>{% blocktrans with username=original.username %}Enter a new password for the user <strong>{{ username }}</strong>.{% endblocktrans %}</p>



<fieldset class="module aligned">

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

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
{% if save_on_top %}{% block submit_buttons_top %}{% submit_row %}{% endblock %}{% endif %}

{% if errors %}

    <p class="errornote">

    {% blocktrans count errors|length as counter %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}

    {% blocktrans count counter=errors|length %}Please correct the error below.{% plural %}Please correct the errors below.{% endblocktrans %}

    </p>

    {{ adminform.form.non_field_errors }}

{% endif %}

django/contrib/admin/templates/admin/delete_confirmation.html

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
{% block content %}

{% if perms_lacking or protected %}

    {% if perms_lacking %}

        <p>{% blocktrans with object as escaped_object %}Deleting the {{ object_name }} '{{ escaped_object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}</p>

        <p>{% blocktrans with escaped_object=object %}Deleting the {{ object_name }} '{{ escaped_object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}</p>

        <ul>

        {% for obj in perms_lacking %}

            <li>{{ obj }}</li>
@@ -24,7 +24,7 @@ 
        </ul>

    {% endif %}

    {% if protected %}

        <p>{% blocktrans with object as escaped_object %}Deleting the {{ object_name }} '{{ escaped_object }}' would require deleting the following protected related objects:{% endblocktrans %}</p>

        <p>{% blocktrans with escaped_object=object %}Deleting the {{ object_name }} '{{ escaped_object }}' would require deleting the following protected related objects:{% endblocktrans %}</p>

        <ul>

        {% for obj in protected %}

            <li>{{ obj }}</li>
@@ -32,7 +32,7 @@ 
        </ul>

    {% endif %}

{% else %}

    <p>{% blocktrans with object as escaped_object %}Are you sure you want to delete the {{ object_name }} "{{ escaped_object }}"? All of the following related items will be deleted:{% endblocktrans %}</p>

    <p>{% blocktrans with escaped_object=object %}Are you sure you want to delete the {{ object_name }} "{{ escaped_object }}"? All of the following related items will be deleted:{% endblocktrans %}</p>

    <ul>{{ deleted_objects|unordered_list }}</ul>

    <form action="" method="post">{% csrf_token %}

    <div>

django/contrib/admin/templates/admin/edit_inline/stacked.html

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
        }

        $(rows).formset({

            prefix: "{{ inline_admin_formset.formset.prefix }}",

            addText: "{% blocktrans with inline_admin_formset.opts.verbose_name|title as verbose_name %}Add another {{ verbose_name }}{% endblocktrans %}",

            addText: "{% blocktrans with verbose_name=inline_admin_formset.opts.verbose_name|title %}Add another {{ verbose_name }}{% endblocktrans %}",

            formCssClass: "dynamic-{{ inline_admin_formset.formset.prefix }}",

            deleteCssClass: "inline-deletelink",

            deleteText: "{% trans "Remove" %}",

django/contrib/admin/templates/admin/edit_inline/tabular.html

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ 
        }

        $(rows).formset({

            prefix: "{{ inline_admin_formset.formset.prefix }}",

            addText: "{% blocktrans with inline_admin_formset.opts.verbose_name|title as verbose_name %}Add another {{ verbose_name }}{% endblocktrans %}",

            addText: "{% blocktrans with verbose_name=inline_admin_formset.opts.verbose_name|title %}Add another {{ verbose_name }}{% endblocktrans %}",

            formCssClass: "dynamic-{{ inline_admin_formset.formset.prefix }}",

            deleteCssClass: "inline-deletelink",

            deleteText: "{% trans "Remove" %}",