From 4625c4731d19df7c74816bbb509a5339180a38c5 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Fri, 5 Jul 2013 14:51:37 +0200 Subject: [PATCH 1/2] Updated translation. Fixed #798 (typo in translation of permissions). --- openslides/locale/de/LC_MESSAGES/django.mo | Bin 41594 -> 41593 bytes openslides/locale/de/LC_MESSAGES/django.po | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 9bc1c8b743ba5cc64f65f6aa95aa22d0116100b4..41de0034b849e6aa2adefe815c50a759a6d55466 100644 GIT binary patch delta 2980 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 diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index 68dfb7a07..10fe21c58 100644 --- a/openslides/locale/de/LC_MESSAGES/django.po +++ b/openslides/locale/de/LC_MESSAGES/django.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: OpenSlides\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-06-25 00:58+0200\n" -"PO-Revision-Date: 2013-06-26 18:52+0000\n" +"PO-Revision-Date: 2013-07-05 12:49+0000\n" "Last-Translator: emanuel \n" "Language-Team: German (http://www.transifex.com/projects/p/openslides/language/de/)\n" "MIME-Version: 1.0\n" @@ -1210,7 +1210,7 @@ msgstr "Hochgeladen durch" #: mediafile/models.py:50 msgid "Can see the list of files" -msgstr "Darf Dateilisten sehen" +msgstr "Darf die Dateiliste sehen" #: mediafile/models.py:51 msgid "Can upload files" @@ -1739,7 +1739,7 @@ msgstr "Sachgebiete" #: motion/templates/motion/category_list.html:41 msgid "No categories available." -msgstr "Keine Sachgebieter vorhanden." +msgstr "Keine Sachgebiete vorhanden." #: motion/templates/motion/motion_detail.html:23 #: motion/templates/motion/motion_diff.html:21 @@ -2099,7 +2099,7 @@ msgstr "Darf Teilnehmer sehen" #: participant/models.py:116 msgid "Can manage participant" -msgstr "Darf Teilnehmer hinzufügen" +msgstr "Darf Teilnehmer verwalten" #: participant/models.py:138 msgid "Use this group as participant" From 3fadb99ffd3c22d31c19594c4ed63316b3f17aa8 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Fri, 5 Jul 2013 15:49:10 +0200 Subject: [PATCH 2/2] Fixed #803 (Groups not translated on user detail view and overview pdf) --- .../participant/templates/participant/user_detail.html | 7 ++++++- openslides/participant/views.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/openslides/participant/templates/participant/user_detail.html b/openslides/participant/templates/participant/user_detail.html index 8a0540e00..40f0925a0 100644 --- a/openslides/participant/templates/participant/user_detail.html +++ b/openslides/participant/templates/participant/user_detail.html @@ -52,7 +52,12 @@ {{ shown_user.committee }} {% if shown_user.groups.all %} - {{ shown_user.groups.all|join:", " }} + {% for group in shown_user.groups.all %} + {% if group.pk != 2 %} + {% trans group.name %} + {% if not forloop.last %}, {% endif %} + {% endif %} + {% endfor %} {% else %} {% trans "The participant is not member of any group." %} {% endif %} diff --git a/openslides/participant/views.py b/openslides/participant/views.py index c8e19d8cd..882b90c56 100644 --- a/openslides/participant/views.py +++ b/openslides/participant/views.py @@ -219,7 +219,7 @@ class ParticipantsListPDF(PDFView): groups = '' for group in user.groups.all(): if group.pk != 2: - groups += "%s
" % unicode(group) + groups += "%s
" % unicode(_(group.name)) data.append([ counter, Paragraph(user.title, stylesheet['Tablecell']),