diff --git a/openslides/application/templates/projector/ItemApplication.html b/openslides/application/templates/projector/ItemApplication.html deleted file mode 100644 index 8bbde4567..000000000 --- a/openslides/application/templates/projector/ItemApplication.html +++ /dev/null @@ -1,60 +0,0 @@ -{% extends "beamer.html" %} -{% load tags %} -{% block title %}{{ block.super }} - {{ item.title }}{% endblock %} -{% block content %} - - - -

{% trans "Application No." %} {{ item.application.number }}

- {{ item.title }} -

-

{{ item.application.public_version.text|linebreaks }}
- {% if item.application.public_version.reason %} -
-

{% trans "Reason" %}:

- {{ item.application.public_version.reason|linebreaks }}
- {% endif %} -

-{% endblock %} diff --git a/openslides/application/templates/projector/ItemAssignment.html b/openslides/application/templates/projector/ItemAssignment.html deleted file mode 100644 index e0b175128..000000000 --- a/openslides/application/templates/projector/ItemAssignment.html +++ /dev/null @@ -1,105 +0,0 @@ -{% extends "beamer.html" %} -{% block title %}{{ block.super }} - #{{ item.title }}{% endblock %} -{% block header %} - - -{% endblock %} -{% block content %} -

{% trans "Election" %}: {{ item.assignment }}

- - {% if item.assignment.status != "fin" %} - - {% endif %} - - {% if not item.assignment.profile.exists %} -

-

{{ item.assignment.description|linebreaks }}
-

- {% endif %} - - {% if item.assignment.profile.exists and item.assignment.status != "fin" %} -

{% trans "Candidates" %}

-
    - {% for profile in item.assignment.profile.all|dictsort:"user.first_name" %} -
  1. {{ profile }}
  2. - {% empty %} -
  3. - {% trans "No candidates available." %} -
  4. - {% endfor %} -
-


- {% endif %} - - {% with polls|first as firstpoll %} - {% if polls.count > 0 and firstpoll.published %} -

{% trans "Election results" %}

- - - - {% for poll in item.assignment.poll_set.all %} - {% if poll.published %} - - {% endif %} - {% endfor %} - - {% for vote in votes %} - - {% with vote|first as candidate %} - - {% for v in vote|last %} - - {% endfor %} - {% endwith %} - - {% empty %} - - - - {% endfor %} - - - {% for p in polls %} - {% if p.published %} - - {% endif %} - {% endfor %} - - - - {% for p in polls %} - {% if p.published %} - - {% endif %} - {% endfor %} - -
{% trans "Candidates" %}{{forloop.counter}}. {% trans "ballot" %}
- {% if candidate.1 %} - - {% endif %} - {{ candidate.0 }} - {% if v %} - {% if v|length == 3 %} - {% if v.0 %}{{ v.0 }}{% else %}∅{% endif %}
- {% if v.1 %}{{ v.1 }}{% else %}∅{% endif %}
- {% if v.2 %}{{ v.2 }}{% else %}∅{% endif %}
- {% else %} - {% if v != "-" %}{% endif %} - {{ v }} - {% endif %} - {% endif %} -
{% trans "No ballots available." %}
{%trans 'Invalid votes' %} {{ p.votesinvalidf }}
{%trans 'Votes cast' %} {{ p.votescastf }}
- {% endif %} - {% endwith %} - -
-{% endblock %} diff --git a/openslides/application/templates/projector/ItemPoll.html b/openslides/application/templates/projector/ItemPoll.html deleted file mode 100644 index fe26c9197..000000000 --- a/openslides/application/templates/projector/ItemPoll.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "beamer.html" %} -{% block title %}{{ block.super }} - {{ item.title }}{% endblock %} -{% block content %} - {%trans "Poll about" %}: -

{{ item.title }}

- - - {% for option in item.poll.get_options %} - - - - {% if item.poll.optiondecision %} - - - {% endif %} - - {% endfor %} -
{{ option }}{{ option.voteyes }}{{ option.voteno }}{{ option.voteundesided }}
-{% endblock %} diff --git a/openslides/application/templates/projector/ItemText.html b/openslides/application/templates/projector/ItemText.html deleted file mode 100644 index 36626b53d..000000000 --- a/openslides/application/templates/projector/ItemText.html +++ /dev/null @@ -1,10 +0,0 @@ -{% extends "beamer.html" %} -{% block title %}{{ block.super }} - {{ item.title }}{% endblock %} -{% block content %} - {% if item.text %} -

{{ item.title }}

- {{ item.text|safe|linebreaks }} - {% else %} -
{{ item.title }}
- {% endif %} -{% endblock %} diff --git a/openslides/application/templates/projector/overview.html b/openslides/application/templates/projector/overview.html deleted file mode 100644 index 1a5b240a4..000000000 --- a/openslides/application/templates/projector/overview.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends "beamer.html" %} -{% block title %}{{ block.super }} - - {% if title %} {{ title }} {% else %} {%trans "Agenda" %} {% endif %} -{% endblock %} - -{% block content %} - {% if title %} -

{{ title }}

- {% else %} -

{%trans "Agenda" %}

- {% endif %} - -{% endblock %} diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 8d9361b48..e57b7865d 100644 Binary files a/openslides/locale/de/LC_MESSAGES/django.mo and b/openslides/locale/de/LC_MESSAGES/django.mo differ diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index 968a39e94..19d2464fc 100644 --- a/openslides/locale/de/LC_MESSAGES/django.po +++ b/openslides/locale/de/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenSlides 1.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-18 10:52+0200\n" +"POT-Creation-Date: 2012-07-19 11:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Emanuel Schuetze \n" "Language-Team: German\n" @@ -69,6 +69,8 @@ msgstr "Darf die Tagesordung verwalten" #: agenda/templates/agenda/overview.html:77 #: agenda/templates/projector/AgendaSummary.html:6 #: agenda/templates/projector/AgendaSummary.html:10 +#: application/templates/projector/overview.html:3 +#: application/templates/projector/overview.html:10 msgid "Agenda" msgstr "Tagesordnung" @@ -105,6 +107,9 @@ msgstr "Eintrag %s wurde erfolgreich gelöscht." #: application/views.py:487 application/views.py:809 application/views.py:860 #: application/templates/application/view.html:82 #: application/templates/projector/Application.html:37 +#: application/templates/projector/ItemApplication.html:30 +#: application/templates/projector/ItemAssignment.html:67 +#: application/templates/projector/ItemAssignment.html:71 #: assignment/models.py:240 assignment/views.py:557 #: assignment/templates/assignment/view.html:158 #: assignment/templates/assignment/view.html:162 @@ -119,6 +124,8 @@ msgstr "Ja" #: application/views.py:487 application/views.py:809 application/views.py:861 #: application/templates/application/view.html:83 #: application/templates/projector/Application.html:38 +#: application/templates/projector/ItemApplication.html:31 +#: application/templates/projector/ItemAssignment.html:68 #: assignment/models.py:240 assignment/views.py:558 #: assignment/templates/assignment/view.html:159 #: assignment/templates/projector/Assignment.html:79 utils/utils.py:53 @@ -342,6 +349,7 @@ msgstr "Bearbeiten" #: application/templates/application/view.html:232 #: application/templates/application/view.html:252 #: application/templates/projector/Application.html:77 +#: application/templates/projector/ItemApplication.html:56 msgid "Reason" msgstr "Begründung" @@ -357,6 +365,7 @@ msgstr "Triviale Änderungen erzeugen keine neue Version." #: application/templates/application/overview.html:41 #: application/templates/application/view.html:18 #: application/templates/projector/Application.html:55 +#: application/templates/projector/ItemApplication.html:19 msgid "Submitter" msgstr "Antragsteller/in" @@ -793,6 +802,7 @@ msgstr "Keine Anträge vorhanden." #: application/views.py:738 #: application/templates/application/base_application.html:24 #: application/templates/projector/Application.html:63 +#: application/templates/projector/ItemApplication.html:50 msgid "Application No." msgstr "Antrag Nr." @@ -800,6 +810,8 @@ msgstr "Antrag Nr." #: application/templates/application/overview.html:40 #: application/templates/application/view.html:37 #: application/templates/projector/Application.html:11 +#: application/templates/projector/ItemApplication.html:8 +#: application/templates/projector/ItemAssignment.html:13 #: assignment/templates/assignment/overview.html:14 #: assignment/templates/assignment/overview.html:27 #: assignment/templates/assignment/view.html:11 @@ -809,7 +821,7 @@ msgid "Status" msgstr "Status" #: application/views.py:792 application/templates/application/view.html:217 -#: application/templates/application/view.html:247 config/models.py:131 +#: application/templates/application/view.html:247 config/models.py:133 #: config/templates/config/version.html:5 #: config/templates/config/version.html:8 #: config/templates/config/version.html:11 @@ -828,19 +840,24 @@ msgstr "Abstimmungsergebnis" #: application/templates/application/view.html:69 #: application/templates/application/view.html:77 #: application/templates/projector/Application.html:33 +#: application/templates/projector/ItemApplication.html:27 msgid "Vote" msgstr "Abstimmung" #: application/views.py:809 application/views.py:862 #: application/templates/application/view.html:84 -#: application/templates/projector/Application.html:39 assignment/views.py:558 -#: assignment/templates/assignment/view.html:160 +#: application/templates/projector/Application.html:39 +#: application/templates/projector/ItemApplication.html:32 +#: application/templates/projector/ItemAssignment.html:69 +#: assignment/views.py:558 assignment/templates/assignment/view.html:160 #: assignment/templates/projector/Assignment.html:80 msgid "Abstention" msgstr "Enthaltung" #: application/views.py:809 application/templates/application/view.html:85 #: application/templates/projector/Application.html:40 +#: application/templates/projector/ItemApplication.html:33 +#: application/templates/projector/ItemAssignment.html:88 #: assignment/templates/assignment/view.html:182 #: assignment/templates/projector/Assignment.html:101 msgid "Invalid" @@ -849,8 +866,11 @@ msgstr "Ungültig" #: application/views.py:809 #: application/templates/application/poll_view.html:35 #: application/templates/application/view.html:87 -#: application/templates/projector/Application.html:42 assignment/views.py:442 -#: assignment/templates/assignment/poll_view.html:45 +#: application/templates/projector/Application.html:42 +#: application/templates/projector/ItemApplication.html:35 +#: application/templates/projector/ItemAssignment.html:93 +#: application/templates/projector/ItemAssignment.html:96 +#: assignment/views.py:442 assignment/templates/assignment/poll_view.html:45 #: assignment/templates/assignment/view.html:194 #: assignment/templates/assignment/view.html:199 #: assignment/templates/projector/Assignment.html:111 @@ -1027,8 +1047,9 @@ msgstr "Wahlmöglichkeit" msgid "Votes" msgstr "Stimmen" -#: application/templates/application/poll_view.html:31 assignment/views.py:435 -#: assignment/templates/assignment/poll_view.html:35 +#: application/templates/application/poll_view.html:31 +#: application/templates/projector/ItemAssignment.html:85 +#: assignment/views.py:435 assignment/templates/assignment/poll_view.html:35 #: assignment/templates/assignment/view.html:177 #: assignment/templates/projector/Assignment.html:97 msgid "Invalid votes" @@ -1168,19 +1189,83 @@ msgid "Log" msgstr "Log" #: application/templates/projector/Application.html:29 +#: application/templates/projector/ItemApplication.html:23 msgid "Poll result" msgstr "Abstimmungsergebnis" #: application/templates/projector/Application.html:47 +#: application/templates/projector/ItemApplication.html:41 msgid "No poll results available." msgstr "Keine Abstimmungen vorhanden." +#: application/templates/projector/ItemAssignment.html:8 +#: assignment/views.py:501 assignment/views.py:517 +#: assignment/templates/assignment/overview.html:25 +#: assignment/templates/assignment/poll_view.html:5 +#: assignment/templates/assignment/view.html:6 +#: assignment/templates/projector/Assignment.html:27 +msgid "Election" +msgstr "Wahl" + +#: application/templates/projector/ItemAssignment.html:16 #: assignment/forms.py:24 assignment/models.py:44 assignment/views.py:364 #: assignment/templates/assignment/view.html:13 #: assignment/templates/projector/Assignment.html:21 msgid "Number of available posts" msgstr "Anzahl der zur Wahl stehenden Posten" +#: application/templates/projector/ItemAssignment.html:30 +#: application/templates/projector/ItemAssignment.html:48 +#: assignment/views.py:370 assignment/views.py:403 +#: assignment/templates/assignment/overview.html:26 +#: assignment/templates/assignment/poll_view.html:18 +#: assignment/templates/assignment/view.html:36 +#: assignment/templates/assignment/view.html:110 +#: assignment/templates/projector/Assignment.html:38 +#: assignment/templates/projector/Assignment.html:56 +msgid "Candidates" +msgstr "Kandidaten/innen" + +#: application/templates/projector/ItemAssignment.html:36 +#: assignment/templates/assignment/view.html:47 +#: assignment/templates/projector/Assignment.html:44 +msgid "No candidates available." +msgstr "Keine Kandidaten/innen vorhanden." + +#: application/templates/projector/ItemAssignment.html:45 +#: assignment/templates/assignment/view.html:95 +#: assignment/templates/projector/Assignment.html:52 +msgid "Election results" +msgstr "Wahlergebnisse" + +#: application/templates/projector/ItemAssignment.html:51 +#: assignment/views.py:395 +#: assignment/templates/assignment/base_assignment.html:71 +#: assignment/templates/assignment/poll_view.html:5 +#: assignment/templates/assignment/poll_view.html:8 +#: assignment/templates/assignment/view.html:104 +#: assignment/templates/assignment/view.html:113 +#: assignment/templates/projector/Assignment.html:59 +msgid "ballot" +msgstr "Wahlgang" + +#: application/templates/projector/ItemAssignment.html:60 +#: assignment/templates/assignment/view.html:145 +#: assignment/templates/projector/Assignment.html:69 +msgid "Candidate is elected" +msgstr "Kandidat/in ist gewählt" + +#: application/templates/projector/ItemAssignment.html:81 +#: assignment/templates/assignment/view.html:213 +#: assignment/templates/projector/Assignment.html:126 +msgid "No ballots available." +msgstr "Keine Wahlgänge vorhanden." + +#: application/templates/projector/ItemPoll.html:4 +#, fuzzy +msgid "Poll about" +msgstr "Abstimmungsergebnis" + #: assignment/forms.py:35 msgid "Nominate a participant" msgstr "Teilnehmer/in vorschlagen" @@ -1382,26 +1467,6 @@ msgstr "Keine Wahlen vorhanden." msgid "Election: %s" msgstr "Wahlen: %s" -#: assignment/views.py:370 assignment/views.py:403 -#: assignment/templates/assignment/overview.html:26 -#: assignment/templates/assignment/poll_view.html:18 -#: assignment/templates/assignment/view.html:36 -#: assignment/templates/assignment/view.html:110 -#: assignment/templates/projector/Assignment.html:38 -#: assignment/templates/projector/Assignment.html:56 -msgid "Candidates" -msgstr "Kandidaten/innen" - -#: assignment/views.py:395 -#: assignment/templates/assignment/base_assignment.html:71 -#: assignment/templates/assignment/poll_view.html:5 -#: assignment/templates/assignment/poll_view.html:8 -#: assignment/templates/assignment/view.html:104 -#: assignment/templates/assignment/view.html:113 -#: assignment/templates/projector/Assignment.html:59 -msgid "ballot" -msgstr "Wahlgang" - #: assignment/views.py:398 msgid "ballots" msgstr "Wahlgänge" @@ -1417,14 +1482,6 @@ msgstr "" "N: %(NO)s\n" "E: %(ABSTAIN)s" -#: assignment/views.py:501 assignment/views.py:517 -#: assignment/templates/assignment/overview.html:25 -#: assignment/templates/assignment/poll_view.html:5 -#: assignment/templates/assignment/view.html:6 -#: assignment/templates/projector/Assignment.html:27 -msgid "Election" -msgstr "Wahl" - #: assignment/views.py:523 #, python-format msgid "%d. ballot" @@ -1512,11 +1569,6 @@ msgstr "Status ändern" msgid "Remove candidate" msgstr "Kandidate/in entfernen" -#: assignment/templates/assignment/view.html:47 -#: assignment/templates/projector/Assignment.html:44 -msgid "No candidates available." -msgstr "Keine Kandidaten/innen vorhanden." - #: assignment/templates/assignment/view.html:60 msgid "Withdraw self candidature" msgstr "Eigene Kandidatur zurückziehen" @@ -1529,11 +1581,6 @@ msgstr "Selbst kandidieren" msgid "Add new participant" msgstr "Neue/n Teilnehmer/in hinzufügen" -#: assignment/templates/assignment/view.html:95 -#: assignment/templates/projector/Assignment.html:52 -msgid "Election results" -msgstr "Wahlergebnisse" - #: assignment/templates/assignment/view.html:118 msgid "Publish/unpublish results" msgstr "Ergebnisse veröffentlichen/unveröffentlichen" @@ -1543,21 +1590,11 @@ msgstr "Ergebnisse veröffentlichen/unveröffentlichen" msgid "New ballot" msgstr "Neuer Wahlgang" -#: assignment/templates/assignment/view.html:145 -#: assignment/templates/projector/Assignment.html:69 -msgid "Candidate is elected" -msgstr "Kandidat/in ist gewählt" - #: assignment/templates/assignment/view.html:164 #: assignment/templates/projector/Assignment.html:84 msgid "was not a
candidate" msgstr "war kein Kandidat" -#: assignment/templates/assignment/view.html:213 -#: assignment/templates/projector/Assignment.html:126 -msgid "No ballots available." -msgstr "Keine Wahlgänge vorhanden." - #: config/forms.py:24 msgid "Event name" msgstr "Veranstaltungsname" @@ -1644,6 +1681,10 @@ msgstr "Startseite" msgid "System" msgstr "System" +#: participant/__init__.py:3 +msgid "Participant" +msgstr "Teilnehmer" + #: participant/forms.py:24 msgid "Keep applications, try to reassign submitter" msgstr "Anträge beibehalten, versuchen Antragssteller erneut zuzuweisen" diff --git a/openslides/participant/__init__.py b/openslides/participant/__init__.py index e69de29bb..f04c201d4 100644 --- a/openslides/participant/__init__.py +++ b/openslides/participant/__init__.py @@ -0,0 +1,3 @@ +from django.utils.translation import ugettext_noop + +NAME = ugettext_noop('Participant')