diff --git a/MANIFEST.in b/MANIFEST.in index b1ea93c..25316ae 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,6 @@ include README.rst recursive-include django_tables2/templates * recursive-include django_tables2/static * +recursive-include django_tables2/locale * recursive-include example/app/fixtures * recursive-include example/templates * diff --git a/django_tables2/locale/en/LC_MESSAGES/django.po b/django_tables2/locale/en/LC_MESSAGES/django.po index 1dc38dc..b446f74 100644 --- a/django_tables2/locale/en/LC_MESSAGES/django.po +++ b/django_tables2/locale/en/LC_MESSAGES/django.po @@ -4,23 +4,29 @@ msgid "" msgstr "" "Project-Id-Version: django-tables2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-06 10:41+1000\n" +"POT-Creation-Date: 2012-09-18 03:12+0200\n" "PO-Revision-Date: 2011-11-06 10:41+1000\n" "Last-Translator: Bradley Ayers \n" "Language-Team: English \n" +"Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: templates/django_tables2/table.html:37 +#: templates/django_tables2/table.html:55 msgid "Previous" msgstr "" -#: templates/django_tables2/table.html:39 +#: templates/django_tables2/table.html:59 #, python-format msgid "Page %(current)s of %(total)s" msgstr "" -#: templates/django_tables2/table.html:41 +#: templates/django_tables2/table.html:63 msgid "Next" msgstr "" + +#: templates/django_tables2/table.html:66 +#, python-format +msgid "%(count)s of %(total)s" +msgstr "" diff --git a/django_tables2/locale/fr/LC_MESSAGES/django.po b/django_tables2/locale/fr/LC_MESSAGES/django.po new file mode 100644 index 0000000..fcd0560 --- /dev/null +++ b/django_tables2/locale/fr/LC_MESSAGES/django.po @@ -0,0 +1,37 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-09-18 03:09+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1)\n" + +#: templates/django_tables2/table.html:55 +msgid "Previous" +msgstr "Précédent" + +#: templates/django_tables2/table.html:59 +#, python-format +msgid "Page %(current)s of %(total)s" +msgstr "Page %(current)s sur %(total)s" + +#: templates/django_tables2/table.html:63 +msgid "Next" +msgstr "Suivant" + +#: templates/django_tables2/table.html:66 +#, python-format +msgid "%(count)s of %(total)s" +msgstr "%(count)s des %(total)s" diff --git a/django_tables2/templates/django_tables2/table.html b/django_tables2/templates/django_tables2/table.html index 799cf34..05f831d 100644 --- a/django_tables2/templates/django_tables2/table.html +++ b/django_tables2/templates/django_tables2/table.html @@ -63,7 +63,7 @@ {% nospaceless %}{% block pagination.next %}{% endblock pagination.next %}{% endnospaceless %} {% endif %} - {% nospaceless %}{% block pagination.cardinality %}
  • {% if total != count %}{{ table.page|length }} of {% endif %}{{ total }} {% if total == 1 %}{{ table.data.verbose_name }}{% else %}{{ table.data.verbose_name_plural }}{% endif %}
  • {% endblock pagination.cardinality %}{% endnospaceless %} + {% nospaceless %}{% block pagination.cardinality %}
  • {% if total != count %}{% blocktrans %}{{ count }} of {{ total }}{% endblocktrans %}{% else %}{{ total }}{% endif %} {% if total == 1 %}{{ table.data.verbose_name }}{% else %}{{ table.data.verbose_name_plural }}{% endif %}
  • {% endblock pagination.cardinality %}{% endnospaceless %} {% endblock pagination %} {% endwith %}