From 00bcdc754a51e4ebdd4c49ffefb2e91f6df718b6 Mon Sep 17 00:00:00 2001 From: Jaap Roes Date: Thu, 22 Sep 2011 15:23:01 +0200 Subject: [PATCH 1/4] Call block.super for extrahead/extrastyles blocks --- adminsortable/templates/adminsortable/change_list.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adminsortable/templates/adminsortable/change_list.html b/adminsortable/templates/adminsortable/change_list.html index 70cb54a..3775b00 100644 --- a/adminsortable/templates/adminsortable/change_list.html +++ b/adminsortable/templates/adminsortable/change_list.html @@ -2,11 +2,13 @@ {% load adminmedia admin_list i18n adminsortable_tags %} {% block extrastyle %} + {{ block.super }} {% endblock %} {% block extrahead %} + {{ block.super }} {% include 'adminsortable/shared/javascript_includes.html' %} {% endblock %} From 612ab190cf6c44b619b3979dc256983473e48f70 Mon Sep 17 00:00:00 2001 From: Jaap Roes Date: Thu, 22 Sep 2011 15:28:22 +0200 Subject: [PATCH 2/4] Made new template strings translateable --- .../templates/adminsortable/change_list.html | 20 ++++++++++++++----- .../change_list_with_sort_link.html | 3 ++- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/adminsortable/templates/adminsortable/change_list.html b/adminsortable/templates/adminsortable/change_list.html index 3775b00..5d40deb 100644 --- a/adminsortable/templates/adminsortable/change_list.html +++ b/adminsortable/templates/adminsortable/change_list.html @@ -27,9 +27,17 @@ {% endblock %} {% block content_title %} -

Drag and drop {% if sort_type %}{{ sort_type }} {% endif %}{{ opts.verbose_name_plural|capfirst }} to change their order.

+

+ {% if sort_type %} + {% blocktrans with opts.verbose_name_plural|capfirst as model %}Drag and drop {{ sort_type }} {{ model }} to change their order.{% endblocktrans %} + {% else %} + {% blocktrans with opts.verbose_name_plural|capfirst as model %}Drag and drop {{ model }} to change their order.{% endblocktrans %} + {% endif %} +

{% if sortable_by_class.is_sortable %} -

You may also drag and drop {{ sortable_by_class_display_name }} to change thier order.

+

+ {% blocktrans %}You may also drag and drop {{ sortable_by_class_display_name }} to change thier order.{% endblocktrans %} +

{% endif %} {% endblock %} @@ -38,14 +46,16 @@ {% block object-tools %} {% endblock %} {% if objects %}
{% if group_expression %} - {% render_nested_sortable_objects objects group_expression %} + {% render_nested_sortable_objects objects group_expression %} {% else %} {% render_sortable_objects objects %} {% endif %} diff --git a/adminsortable/templates/adminsortable/change_list_with_sort_link.html b/adminsortable/templates/adminsortable/change_list_with_sort_link.html index b7de9c5..f5df853 100644 --- a/adminsortable/templates/adminsortable/change_list_with_sort_link.html +++ b/adminsortable/templates/adminsortable/change_list_with_sort_link.html @@ -1,8 +1,9 @@ {% extends 'admin/change_list.html' %} +{% load i18n %} {% block object-tools-items %}
  • - Change Order + {% trans 'Change Order' %}
    • {{ block.super }} {% endblock %} \ No newline at end of file From def6b940f23541dd9e915bc9e0fc5fad96b96370 Mon Sep 17 00:00:00 2001 From: Jaap Roes Date: Thu, 22 Sep 2011 15:52:27 +0200 Subject: [PATCH 3/4] Added i18n files and Dutch translations, also included locale directory in MANIFEST file --- MANIFEST.in | 1 + adminsortable/locale/en/LC_MESSAGES/django.po | 36 ++++++++++++++++ adminsortable/locale/nl/LC_MESSAGES/django.mo | Bin 0 -> 1009 bytes adminsortable/locale/nl/LC_MESSAGES/django.po | 39 ++++++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 adminsortable/locale/en/LC_MESSAGES/django.po create mode 100644 adminsortable/locale/nl/LC_MESSAGES/django.mo create mode 100644 adminsortable/locale/nl/LC_MESSAGES/django.po diff --git a/MANIFEST.in b/MANIFEST.in index da9edbe..2a63cc6 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,4 @@ recursive-include adminsortable/static * recursive-include adminsortable/templates * +recursive-include adminsortable/locale * prune sample_project \ No newline at end of file diff --git a/adminsortable/locale/en/LC_MESSAGES/django.po b/adminsortable/locale/en/LC_MESSAGES/django.po new file mode 100644 index 0000000..0b74825 --- /dev/null +++ b/adminsortable/locale/en/LC_MESSAGES/django.po @@ -0,0 +1,36 @@ +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: adminsortable\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-09-22 15:42+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: templates/adminsortable/change_list.html:32 +#, python-format +msgid "Drag and drop %(sort_type)s %(model)s to change their order." +msgstr "" + +#: templates/adminsortable/change_list.html:34 +#, python-format +msgid "Drag and drop %(model)s to change their order." +msgstr "" + +#: templates/adminsortable/change_list.html:39 +#, python-format +msgid "" +"You may also drag and drop %(sortable_by_class_display_name)s to change " +"thier order." +msgstr "" + +#: templates/adminsortable/change_list.html:50 +#, python-format +msgid "Return to %(model)s" +msgstr "" + +#: templates/adminsortable/change_list_with_sort_link.html:6 +msgid "Change Order" +msgstr "" diff --git a/adminsortable/locale/nl/LC_MESSAGES/django.mo b/adminsortable/locale/nl/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..54154932d65fdf45a40667c55e6b3e2a80a9c278 GIT binary patch literal 1009 zcmah{!EVz)5M7{fFmM5m9HvM}t;z<+qNq3x0+Lh|C28fl6`Z0?JUDLcU2At;5s3>& z#F;B+_yInL8~?#$;RfLwp+@*l z*e3iW+$P++#8^!HnD_(X6T$7@yu#Q6;#K01xKDhC_#<&d{DqjLXSMR19l0E?E>DS( zj9qo>)>z0CVNWNhSzC(~giIjOs)YM%g-S4AH((WvraC*uOoMXj+Fx>`v>n(!!jDj!Ovw;LQe<*w=tWqPH}9D=OZbZ_H9S@!c>8-XZ)p^kT6kMn3?cCAb?!gm zK>+p5@KLbg2fj~29^q-`te5IG{SCiPy54TDGtW@3`Cdy&i_-F#9xVim@9aamQ6?Mi zy|qExJdAhv)?BBBG;dM!jvT2ZlW7QB!_0bJVaUY&%!O4tgjYh85GgdUeN4+|n5AP| zllfDU%Cr(G@)$+oZkbnFX_tzZ57>pR jG3qJ>DTH2_vqLzcoS@VRZO+EvpL1n$EK$Nm$JE#_E0!im literal 0 HcmV?d00001 diff --git a/adminsortable/locale/nl/LC_MESSAGES/django.po b/adminsortable/locale/nl/LC_MESSAGES/django.po new file mode 100644 index 0000000..71c5bc0 --- /dev/null +++ b/adminsortable/locale/nl/LC_MESSAGES/django.po @@ -0,0 +1,39 @@ +msgid "" +msgstr "" +"Project-Id-Version: adminsortable\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-09-22 15:42+0200\n" +"PO-Revision-Date: 2011-09-22 15:50+0100\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Last-Translator: Jaap Roes \n" +"Language-Team: \n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-Language: Dutch\n" +"X-Poedit-Country: NETHERLANDS\n" + +#: templates/adminsortable/change_list.html:32 +#, python-format +msgid "Drag and drop %(sort_type)s %(model)s to change their order." +msgstr "Sleep %(sort_type)s %(model)s om de volgorde te veranderen" + +#: templates/adminsortable/change_list.html:34 +#, python-format +msgid "Drag and drop %(model)s to change their order." +msgstr "Sleep %(model)s om de volgorde te veranderen" + +#: templates/adminsortable/change_list.html:39 +#, python-format +msgid "You may also drag and drop %(sortable_by_class_display_name)s to change thier order." +msgstr "U kunt ook %(sortable_by_class_display_name)s slepen om de volgorde te veranderen." + +#: templates/adminsortable/change_list.html:50 +#, python-format +msgid "Return to %(model)s" +msgstr "Terug naar %(model)s" + +#: templates/adminsortable/change_list_with_sort_link.html:6 +msgid "Change Order" +msgstr "Volgorde veranderen" + From 3bc05b0fa5005745d0063940dba26292ca2134ca Mon Sep 17 00:00:00 2001 From: Jaap Roes Date: Thu, 22 Sep 2011 15:54:29 +0200 Subject: [PATCH 4/4] Back link now returns to change list --- adminsortable/templates/adminsortable/change_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adminsortable/templates/adminsortable/change_list.html b/adminsortable/templates/adminsortable/change_list.html index 5d40deb..f5e7562 100644 --- a/adminsortable/templates/adminsortable/change_list.html +++ b/adminsortable/templates/adminsortable/change_list.html @@ -46,7 +46,7 @@ {% block object-tools %}