ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #809 from emanuelschuetze/fixes-1.4

Browse Source 
Fixed #798 and #803
This commit is contained in:
Oskar Hahn 2013-07-05 08:08:48 -07:00
commit 04ee38dcc0
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
openslides/locale/de/LC_MESSAGES/django.mo
View File

Binary file not shown.

8
openslides/locale/de/LC_MESSAGES/django.po
View File

@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: OpenSlides\n" "Project-Id-Version: OpenSlides\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-06-25 00:58+0200\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 <emanuel@intevation.de>\n" "Last-Translator: emanuel <emanuel@intevation.de>\n"
"Language-Team: German (http://www.transifex.com/projects/p/openslides/language/de/)\n" "Language-Team: German (http://www.transifex.com/projects/p/openslides/language/de/)\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -1210,7 +1210,7 @@ msgstr "Hochgeladen durch"
#: mediafile/models.py:50 #: mediafile/models.py:50
msgid "Can see the list of files" msgid "Can see the list of files"
msgstr "Darf Dateilisten sehen" msgstr "Darf die Dateiliste sehen"
#: mediafile/models.py:51 #: mediafile/models.py:51
msgid "Can upload files" msgid "Can upload files"
@ -1739,7 +1739,7 @@ msgstr "Sachgebiete"
#: motion/templates/motion/category_list.html:41 #: motion/templates/motion/category_list.html:41
msgid "No categories available." msgid "No categories available."
msgstr "Keine Sachgebieter vorhanden." msgstr "Keine Sachgebiete vorhanden."
#: motion/templates/motion/motion_detail.html:23 #: motion/templates/motion/motion_detail.html:23
#: motion/templates/motion/motion_diff.html:21 #: motion/templates/motion/motion_diff.html:21
@ -2099,7 +2099,7 @@ msgstr "Darf Teilnehmer sehen"
#: participant/models.py:116 #: participant/models.py:116
msgid "Can manage participant" msgid "Can manage participant"
msgstr "Darf Teilnehmer hinzufügen" msgstr "Darf Teilnehmer verwalten"
#: participant/models.py:138 #: participant/models.py:138
msgid "Use this group as participant" msgid "Use this group as participant"

7
openslides/participant/templates/participant/user_detail.html
View File

@ -52,7 +52,12 @@
{{ shown_user.committee }} {{ shown_user.committee }}
<label>{% trans "Groups" %}</label> <label>{% trans "Groups" %}</label>
{% if shown_user.groups.all %} {% 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 %} {% else %}
{% trans "The participant is not member of any group." %} {% trans "The participant is not member of any group." %}
{% endif %} {% endif %}

2
openslides/participant/views.py
View File

@ -219,7 +219,7 @@ class ParticipantsListPDF(PDFView):
groups = '' groups = ''
for group in user.groups.all(): for group in user.groups.all():
if group.pk != 2: if group.pk != 2:
groups += "%s<br/>" % unicode(group) groups += "%s<br/>" % unicode(_(group.name))
data.append([ data.append([
counter, counter,
Paragraph(user.title, stylesheet['Tablecell']), Paragraph(user.title, stylesheet['Tablecell']),