From a4d77a9309ef1f66aed8f89dfad6b48d0c822b01 Mon Sep 17 00:00:00 2001
From: Andrew Ingram <andy@andrewingram.net>
Date: Sat, 25 May 2013 18:44:48 +0100
Subject: [PATCH] Template internationalization

---
 djadmin2/templates/admin2/bootstrap/base.html   |  2 +-
 .../bootstrap/delete_selected_confirmation.html |  4 ++--
 djadmin2/templates/admin2/bootstrap/index.html  | 11 +++++------
 .../admin2/bootstrap/model_confirm_delete.html  |  7 ++++---
 .../templates/admin2/bootstrap/model_list.html  | 17 +++++++++--------
 .../admin2/bootstrap/model_update_form.html     | 12 ++++++------
 djadmin2/templatetags/admin2_tags.py            |  2 +-
 7 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/djadmin2/templates/admin2/bootstrap/base.html b/djadmin2/templates/admin2/bootstrap/base.html
index 2c6b179..40f3b38 100644
--- a/djadmin2/templates/admin2/bootstrap/base.html
+++ b/djadmin2/templates/admin2/bootstrap/base.html
@@ -55,7 +55,7 @@
         <div class="container-fluid">
             <div class="row">
                 <div class="span10">
-                    <h3>{% block page_title %}Site administration{% endblock %}</h3>
+                    <h3>{% block page_title %}{% trans "Site administration" %}{% endblock %}</h3>
                 </div>
             </div>
             {% block content %}{% endblock %}
diff --git a/djadmin2/templates/admin2/bootstrap/delete_selected_confirmation.html b/djadmin2/templates/admin2/bootstrap/delete_selected_confirmation.html
index 111d8c2..787df06 100644
--- a/djadmin2/templates/admin2/bootstrap/delete_selected_confirmation.html
+++ b/djadmin2/templates/admin2/bootstrap/delete_selected_confirmation.html
@@ -1,8 +1,8 @@
 {% extends "admin2/bootstrap/base.html" %}
-
+{% load i18n %}
 {% block content %}
 
-<p>Are you sure you want to delete the selected {{ objects_name }}?</p>
+<p>{% blocktrans with objects_name=objects_name %}Are you sure you want to delete the selected {{ objects_name }}?{% endblocktrans %}</p>
 
 <ul>
     {% for item in queryset %}
diff --git a/djadmin2/templates/admin2/bootstrap/index.html b/djadmin2/templates/admin2/bootstrap/index.html
index 5a1cc3d..3b1e375 100644
--- a/djadmin2/templates/admin2/bootstrap/index.html
+++ b/djadmin2/templates/admin2/bootstrap/index.html
@@ -1,5 +1,5 @@
 {% extends "admin2/bootstrap/base.html" %}
-{% load admin2_tags %}
+{% load admin2_tags i18n %}
 
 {% block content %}
 
@@ -26,15 +26,14 @@
                         {# if has_add_permission #}
                             <a href="{% url model_admin|admin2_urlname:'create' %}">
                                 <i class="icon-plus"></i>
-
-                                Add
+                                {% trans "Add" %}
                             </a>
                         {# endif #}
                         </td>
                         <td class="text-right">
                             <a href="{{ model_admin.get_index_url }}">
                                 <i class="icon-pencil"></i>
-                                Change
+                                {% trans "Change" %}
                             </a>
                         </td>
                     </tr>
@@ -44,8 +43,8 @@
         {% endfor %}
     </div>
     <div class="span5">
-        <h4>Recent Actions</h4>
-        <h5>My Actions</h5>
+        <h4>{% trans "Recent Actions" %}</h4>
+        <h5>{% trans "My Actions" %}</h5>
         TODO
     </div>
 </div>
diff --git a/djadmin2/templates/admin2/bootstrap/model_confirm_delete.html b/djadmin2/templates/admin2/bootstrap/model_confirm_delete.html
index 6025b9a..c4b479f 100644
--- a/djadmin2/templates/admin2/bootstrap/model_confirm_delete.html
+++ b/djadmin2/templates/admin2/bootstrap/model_confirm_delete.html
@@ -1,11 +1,12 @@
 {% extends "admin2/bootstrap/base.html" %}
+{% load i18n %}
 
-{% block title %}Are you sure?{% endblock %}
+{% block title %}{% trans "Are you sure?" %}{% endblock %}
 
-{% block page_title %}Are you sure?{% endblock %}
+{% block page_title %}{% trans "Are you sure?" %}{% endblock %}
 
 {% block content %}
-<p>Are you sure you want to delete the {{ model }} "{{ object }}"? All of the following related items will be deleted:</p>
+<p>{% blocktrans with model=model object=object %}Are you sure you want to delete the {{ model }} "{{ object }}"? All of the following related items will be deleted:{% endblocktrans %}</p>
 
 TODO
 
diff --git a/djadmin2/templates/admin2/bootstrap/model_list.html b/djadmin2/templates/admin2/bootstrap/model_list.html
index d8bb933..6f4f673 100644
--- a/djadmin2/templates/admin2/bootstrap/model_list.html
+++ b/djadmin2/templates/admin2/bootstrap/model_list.html
@@ -1,9 +1,9 @@
 {% extends "admin2/bootstrap/base.html" %}
-{% load admin2_tags %}
+{% load admin2_tags i18n %}
 
-{% block title %}Select {{ model|model_verbose_name }} to change{% endblock %}
+{% block title %}{% blocktrans with model_verbose_name=model|model_verbose_name %}Select {{ model_verbose_name }} to change{% endblocktrans %}{% endblock %}
 
-{% block page_title %}Select {{ model|model_verbose_name }} to change{% endblock %}
+{% block page_title %}{% blocktrans with model_verbose_name=model|model_verbose_name %}Select {{ model_verbose_name }} to change{% endblocktrans %}{% endblock %}
 
 {% block extrajs %}
 <script src="/static/themes/bootstrap/js/actions.js"></script>
@@ -25,7 +25,7 @@
 		<span id="selected-count">0</span> of {{ object_list|length }} selected
                 <div class="pull-right">
                     {# if has_add_permission #}
-                    <a href="{% url view|admin2_urlname:'create' %}" class="btn"><i class="icon-plus"></i> Add {{ model|model_verbose_name }}</a>
+                    <a href="{% url view|admin2_urlname:'create' %}" class="btn"><i class="icon-plus"></i> {% blocktrans with model_verbose_name=model|model_verbose_name %}Add {{ model_verbose_name }}{% endblocktrans %}</a>
                     {# endif #}
                 </div>
             </div>
@@ -40,12 +40,13 @@
                     <tr>
                         <td><input type="checkbox" class="model-select" name="selected_model_pk" value="{{ obj.pk }}"></td>
                         <td>
-                            {{ obj }} <a href="{% url view|admin2_urlname:'detail' pk=obj.pk %}">detail</a>
+                            {{ obj }}
+                            <a href="{% url view|admin2_urlname:'detail' pk=obj.pk %}">{% trans "Detail" %}</a>
                             {# if has_edit_permission #}
-                            <a href="{% url view|admin2_urlname:'update' pk=obj.pk %}">edit</a>
+                            <a href="{% url view|admin2_urlname:'update' pk=obj.pk %}">{% trans "Edit" %}</a>
                             {# endif #}
                             {# if has_delete_permission #}
-                            <a href="{% url view|admin2_urlname:'delete' pk=obj.pk %}">delete</a>
+                            <a href="{% url view|admin2_urlname:'delete' pk=obj.pk %}">{% trans "Delete" %}</a>
                             {# endif #}
                         </td>
                     </tr>
@@ -53,7 +54,7 @@
                 </tbody>
             </table>
 
-            {{ object_list|length }} {{ model|model_verbose_name }} 
+            {{ object_list|length }} {{ model|model_verbose_name_plural }} 
         </div>
     </form>
 </div>
diff --git a/djadmin2/templates/admin2/bootstrap/model_update_form.html b/djadmin2/templates/admin2/bootstrap/model_update_form.html
index 5189603..6e8ab96 100644
--- a/djadmin2/templates/admin2/bootstrap/model_update_form.html
+++ b/djadmin2/templates/admin2/bootstrap/model_update_form.html
@@ -1,10 +1,10 @@
 {% extends "admin2/bootstrap/base.html" %}
 
-{% load admin2_tags %}
+{% load admin2_tags i18n %}
 
-{% block title %}{{ action }} {{ model|model_verbose_name }}{% endblock %}
+{% block title %}{% blocktrans with action=action model_verbose_name=model|model_verbose_name %}{{ action }} {{ model_verbose_name }}{% endblocktrans %}{% endblock %}
 
-{% block page_title %}{{ action }} {{ model|model_verbose_name }}{% endblock %}
+{% block page_title %}{% blocktrans with action=action model_verbose_name=model|model_verbose_name %}{{ action }} {{ model_verbose_name }}{% endblocktrans %}{% endblock %}
 
 {% block content %}
 
@@ -44,9 +44,9 @@
 			</table>
 			{% endfor %}
 
-            <button class="btn btn-small" type="submit" name="_addanother">Save and add another</button>
-            <button class="btn btn-small" type="submit" name="_continue">Save and continue editing</button>
-            <button class="btn btn-small btn-success" type="submit" name="_save">Save</button>
+            <button class="btn btn-small" type="submit" name="_addanother">{% trans "Save and add another" %}</button>
+            <button class="btn btn-small" type="submit" name="_continue">{% trans "Save and continue editing" %}</button>
+            <button class="btn btn-small btn-success" type="submit" name="_save">{% trans "Save" %}</button>
         </form>
     </div>
 </div>
diff --git a/djadmin2/templatetags/admin2_tags.py b/djadmin2/templatetags/admin2_tags.py
index e518326..d2135a7 100644
--- a/djadmin2/templatetags/admin2_tags.py
+++ b/djadmin2/templatetags/admin2_tags.py
@@ -26,7 +26,7 @@ def model_verbose_name_plural(obj):
     """
     Returns the pluralized verbose name of a model instance or class.
     """
-    utils.model_verbose_name_plural(obj)
+    return utils.model_verbose_name_plural(obj)
 
 
 @register.filter