From 7fa86f7de080b26a5022e15201b666d2069d7b44 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Tue, 20 Nov 2012 12:37:16 +0100 Subject: [PATCH] Used blocktrans instead of trans --- .../templates/assignment/overview.html | 6 +-- openslides/locale/de/LC_MESSAGES/django.mo | Bin 35528 -> 35641 bytes openslides/locale/de/LC_MESSAGES/django.po | 44 +++++++++++------- 3 files changed, 31 insertions(+), 19 deletions(-) diff --git a/openslides/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html index ed3ba8ded..829a80a05 100644 --- a/openslides/assignment/templates/assignment/overview.html +++ b/openslides/assignment/templates/assignment/overview.html @@ -32,11 +32,11 @@ {% if assignment.active %}activeline{% endif %}"> {{ assignment }} - {% trans "posts" %}: {{ assignment.posts }} + {% blocktrans with posts=assignment.posts %}posts: {{ posts }}{% endblocktrans %} {% if assignment.status != 'fin' %} - | {% trans "candidates" %}: {{ assignment.get_participants|length }} + | {% blocktrans with candidates=assignment.get_participants|length %}candidates: {{ candidates }}{% endblocktrans %} {% endif %} - | {% trans "elected" %}: {{ assignment.elected|length }} + | {% blocktrans with elected=assignment.elected|length %}elected: {{ elected }}{% endblocktrans %} {{ assignment.get_status_display }} diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 19262fae97466696415dad5df38b58c6ab7e9551..e7684f7a10f08fe2740c3700eb8c1d8527308b60 100644 GIT binary patch delta 8028 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 delta 7914 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\n" "Language-Team: support@openslides.de\n" @@ -553,7 +553,6 @@ msgid "not elected" msgstr "nicht gewählt" #: assignment/views.py:298 assignment/views.py:481 -#: assignment/templates/assignment/overview.html:39 #: assignment/templates/assignment/view.html:48 msgid "elected" msgstr "gewählt" @@ -616,17 +615,17 @@ msgstr "" "E: %(ABSTAIN)s" #: assignment/views.py:454 assignment/templates/assignment/poll_view.html:35 -#: assignment/templates/assignment/view.html:187 -#: assignment/templates/projector/Assignment.html:97 +#: assignment/templates/assignment/view.html:186 +#: assignment/templates/projector/Assignment.html:96 #: motion/templates/motion/poll_view.html:31 msgid "Invalid votes" msgstr "Ungültige Stimmen" #: assignment/views.py:461 assignment/templates/assignment/poll_view.html:45 -#: assignment/templates/assignment/view.html:203 -#: assignment/templates/assignment/view.html:208 -#: assignment/templates/projector/Assignment.html:111 -#: assignment/templates/projector/Assignment.html:117 motion/views.py:804 +#: assignment/templates/assignment/view.html:202 +#: assignment/templates/assignment/view.html:207 +#: assignment/templates/projector/Assignment.html:109 +#: assignment/templates/projector/Assignment.html:115 motion/views.py:804 #: motion/templates/motion/poll_view.html:35 #: motion/templates/motion/view.html:84 #: motion/templates/projector/Motion.html:42 poll/models.py:76 @@ -739,12 +738,19 @@ msgstr[0] "Wahl" msgstr[1] "Wahlen" #: assignment/templates/assignment/overview.html:35 -msgid "posts" -msgstr "Posten" +#, python-format +msgid "posts: %(posts)s" +msgstr "Posten: %(posts)s" #: assignment/templates/assignment/overview.html:37 -msgid "candidates" -msgstr "Kandidaten/innen" +#, python-format +msgid "candidates: %(candidates)s" +msgstr "Kandidaten/innen: %(candidates)s" + +#: assignment/templates/assignment/overview.html:39 +#, python-format +msgid "elected: %(elected)s" +msgstr "Gewählt: %(elected)s" #: assignment/templates/assignment/overview.html:45 msgid "Activate election" @@ -823,7 +829,7 @@ msgid "Publish/unpublish results" msgstr "Ergebnisse veröffentlichen/unveröffentlichen" #: assignment/templates/assignment/view.html:140 -#: assignment/templates/assignment/view.html:224 +#: assignment/templates/assignment/view.html:223 msgid "New ballot" msgstr "Neuer Wahlgang" @@ -837,14 +843,14 @@ msgstr "Kandidat/in ist gewählt" msgid "was not a
candidate" msgstr "war kein Kandidat" -#: assignment/templates/assignment/view.html:192 -#: assignment/templates/projector/Assignment.html:101 motion/views.py:804 +#: assignment/templates/assignment/view.html:191 +#: assignment/templates/projector/Assignment.html:100 motion/views.py:804 #: motion/templates/motion/view.html:82 #: motion/templates/projector/Motion.html:40 msgid "Invalid" msgstr "Ungültig" -#: assignment/templates/assignment/view.html:220 +#: assignment/templates/assignment/view.html:219 msgid "No results available." msgstr "Keine Ergebnisse vorhanden." @@ -2348,3 +2354,9 @@ msgstr "undefinierter-dateiname" #: utils/jsonfield/fields.py:21 msgid "Enter valid JSON" msgstr "Gebe valides JSON ein" + +#~ msgid "posts" +#~ msgstr "Posten" + +#~ msgid "candidates" +#~ msgstr "Kandidaten/innen"