Merge branch 'master' of github.com:btaylordesign/django-admin-sortable

MANIFEST.in

@@ -1,3 +1,4 @@
 recursive-include adminsortable/static *
 recursive-include adminsortable/templates *
+recursive-include adminsortable/locale *
 prune sample_project

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 ""

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 <jaap@eight.nl>\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"
+

adminsortable/templates/adminsortable/change_list.html

@@ -2,11 +2,13 @@
 {% load adminmedia admin_list i18n adminsortable_tags %}
 
 {% block extrastyle %}
+	{{ block.super }}
 	<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/changelists.css" />
 	<link rel="stylesheet" href="{{ STATIC_URL }}adminsortable/css/admin.sortable.css" />
 {% endblock %}
 
 {% block extrahead %}
+	{{ block.super }}
 	{% include 'adminsortable/shared/javascript_includes.html' %}
 {% endblock %}
 
@@ -25,9 +27,17 @@
 {% endblock %}
 
 {% block content_title %}
-	<h1>Drag and drop {% if sort_type %}{{ sort_type }} {% endif %}{{ opts.verbose_name_plural|capfirst }} to change their order.</h1>
+	<h1>
+	{% 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 %}
+	</h1>
 	{% if sortable_by_class.is_sortable %}
-	<p>You may also drag and drop {{ sortable_by_class_display_name }} to change thier order.</p>
+	<p>
+	{% blocktrans %}You may also drag and drop {{ sortable_by_class_display_name }} to change thier order.{% endblocktrans %}
+	</p>
 	{% endif %}
 {% endblock %}
 
@@ -36,14 +46,16 @@
 		{% block object-tools %}
 	        <ul class="object-tools">
 	            <li>
-					<a href="../../">Return to {{ opts.verbose_name_plural|capfirst }}</a>
+                        <a href="../">
-				</li>
+                        {% blocktrans with opts.verbose_name_plural|capfirst as model %}Return to {{ model }}{% endblocktrans %}
+                        </a>
+                    </li>
 	        </ul>
 	    {% endblock %}
 		{% if objects %}
 		<div id="sortable">
 			{% if group_expression %}
-				{% render_nested_sortable_objects objects group_expression %}
+                            {% render_nested_sortable_objects objects group_expression %}
 			{% else %}
 			     {% render_sortable_objects objects %}
 			{% endif %}

adminsortable/templates/adminsortable/change_list_with_sort_link.html

@@ -1,8 +1,9 @@
 {% extends 'admin/change_list.html' %}
+{% load i18n %}
 
 {% block object-tools-items %}
 	<li>
-		<a href="./sort/">Change Order</a>
+		<a href="./sort/">{% trans 'Change Order' %}</a>
 	</li>
 	{{ block.super }}
 {% endblock %}