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

Merge pull request #1962 from emanuelschuetze/templateFixes3

Browse Source 
Motion state translation strings are still used by motion pdf.
This commit is contained in:
Norman Jäckel 2016-02-09 09:32:21 +01:00
commit 0fe2b9cd8a
2 changed files with 64 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
openslides/locale/en/LC_MESSAGES/django.po
View File

@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-01-30 09:21+0100\n"
"POT-Creation-Date: 2016-02-09 00:11+0100\n"
"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -761,6 +761,54 @@ msgstr ""
msgid "Show paragraph numbering (only in PDF)"
msgstr ""
#: motions/signals.py:185
msgid "submitted"
msgstr ""
#: motions/signals.py:190 motions/signals.py:219
msgid "accepted"
msgstr ""
#: motions/signals.py:194 motions/signals.py:224
msgid "rejected"
msgstr ""
#: motions/signals.py:198
msgid "not decided"
msgstr ""
#: motions/signals.py:207
msgid "published"
msgstr ""
#: motions/signals.py:212 motions/views.py:159
msgid "permitted"
msgstr ""
#: motions/signals.py:229
msgid "withdrawed"
msgstr ""
#: motions/signals.py:234
msgid "adjourned"
msgstr ""
#: motions/signals.py:239
msgid "not concerned"
msgstr ""
#: motions/signals.py:244
msgid "commited a bill"
msgstr ""
#: motions/signals.py:249
msgid "needs review"
msgstr ""
#: motions/signals.py:254
msgid "rejected (not authorized)"
msgstr ""
#: motions/views.py:85
msgid "Motion created"
msgstr ""
@ -773,10 +821,6 @@ msgstr ""
msgid "All supporters removed"
msgstr ""
#: motions/views.py:159
msgid "permitted"
msgstr ""
#: motions/views.py:161
#, python-format
msgid "Version %d permitted successfully."

30
openslides/motions/signals.py
View File

@ -1,6 +1,6 @@
from django.core.validators import MinValueValidator
from django.utils.translation import ugettext as _
from django.utils.translation import pgettext, ugettext_lazy
from django.utils.translation import pgettext, ugettext_lazy, ugettext_noop
from openslides.core.config import ConfigVariable
from openslides.poll.models import PERCENT_BASE_CHOICES
@ -182,20 +182,20 @@ def create_builtin_workflows(sender, **kwargs):
return
workflow_1 = Workflow.objects.create(name='Simple Workflow')
state_1_1 = State.objects.create(name='submitted',
state_1_1 = State.objects.create(name=ugettext_noop('submitted'),
workflow=workflow_1,
allow_create_poll=True,
allow_support=True,
allow_submitter_edit=True)
state_1_2 = State.objects.create(name='accepted',
state_1_2 = State.objects.create(name=ugettext_noop('accepted'),
workflow=workflow_1,
action_word='Accept',
css_class='success')
state_1_3 = State.objects.create(name='rejected',
state_1_3 = State.objects.create(name=ugettext_noop('rejected'),
workflow=workflow_1,
action_word='Reject',
css_class='danger')
state_1_4 = State.objects.create(name='not decided',
state_1_4 = State.objects.create(name=ugettext_noop('not decided'),
workflow=workflow_1,
action_word='Do not decide',
css_class='default')
@ -204,54 +204,54 @@ def create_builtin_workflows(sender, **kwargs):
workflow_1.save()
workflow_2 = Workflow.objects.create(name='Complex Workflow')
state_2_1 = State.objects.create(name='published',
state_2_1 = State.objects.create(name=ugettext_noop('published'),
workflow=workflow_2,
allow_support=True,
allow_submitter_edit=True,
dont_set_identifier=True)
state_2_2 = State.objects.create(name='permitted',
state_2_2 = State.objects.create(name=ugettext_noop('permitted'),
workflow=workflow_2,
action_word='Permit',
allow_create_poll=True,
allow_submitter_edit=True,
versioning=True,
leave_old_version_active=True)
state_2_3 = State.objects.create(name='accepted',
state_2_3 = State.objects.create(name=ugettext_noop('accepted'),
workflow=workflow_2,
action_word='Accept',
versioning=True,
css_class='success')
state_2_4 = State.objects.create(name='rejected',
state_2_4 = State.objects.create(name=ugettext_noop('rejected'),
workflow=workflow_2,
action_word='Reject',
versioning=True,
css_class='danger')
state_2_5 = State.objects.create(name='withdrawed',
state_2_5 = State.objects.create(name=ugettext_noop('withdrawed'),
workflow=workflow_2,
action_word='Withdraw',
versioning=True,
css_class='default')
state_2_6 = State.objects.create(name='adjourned',
state_2_6 = State.objects.create(name=ugettext_noop('adjourned'),
workflow=workflow_2,
action_word='Adjourn',
versioning=True,
css_class='default')
state_2_7 = State.objects.create(name='not concerned',
state_2_7 = State.objects.create(name=ugettext_noop('not concerned'),
workflow=workflow_2,
action_word='Do not concern',
versioning=True,
css_class='default')
state_2_8 = State.objects.create(name='commited a bill',
state_2_8 = State.objects.create(name=ugettext_noop('commited a bill'),
workflow=workflow_2,
action_word='Commit a bill',
versioning=True,
css_class='default')
state_2_9 = State.objects.create(name='needs review',
state_2_9 = State.objects.create(name=ugettext_noop('needs review'),
workflow=workflow_2,
action_word='Needs review',
versioning=True,
css_class='default')
state_2_10 = State.objects.create(name='rejected (not authorized)',
state_2_10 = State.objects.create(name=ugettext_noop('rejected (not authorized)'),
workflow=workflow_2,
action_word='Reject (not authorized)',
versioning=True,