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

#311: Updated first login message and translations.

Browse Source
This commit is contained in:
Emanuel Schuetze 2012-07-19 08:21:51 +02:00
parent 7ff3d1382d
commit c678b557fa
4 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/application/models.py
View File

@ -106,7 +106,7 @@ class Application(models.Model, SlideMixin):
if version.id > self.permitted.id: if version.id > self.permitted.id:
version.rejected = True version.rejected = True
version.save() version.save()
self.writelog(pgettext("Rejected meens not permittd", "Version %d rejected") self.writelog(pgettext("Rejected means not permitted", "Version %d rejected")
% (version.aid, ), user) % (version.aid, ), user)
return True return True
return False return False

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

Binary file not shown.

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

@ -6,7 +6,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: OpenSlides 1.x\n" "Project-Id-Version: OpenSlides 1.x\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-07-18 21:11+0200\n" "POT-Creation-Date: 2012-07-19 08:19+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Emanuel Schuetze <emanuel@intevation.de>\n" "Last-Translator: Emanuel Schuetze <emanuel@intevation.de>\n"
"Language-Team: German\n" "Language-Team: German\n"
@ -156,22 +156,28 @@ msgstr "Neuer Eintrag"
msgid "Agenda as PDF" msgid "Agenda as PDF"
msgstr "Tagesordnung als PDF" msgstr "Tagesordnung als PDF"
#: agenda/templates/agenda/base_agenda.html:26 #: agenda/templates/agenda/base_agenda.html:19
#: projector/templates/projector/base_projector.html:20
#: templates/front_page.html:25
msgid "Projector view"
msgstr "Projektor-Ansicht"
#: agenda/templates/agenda/base_agenda.html:31
msgid "View item" msgid "View item"
msgstr "Eintrag anzeigen" msgstr "Eintrag anzeigen"
#: agenda/templates/agenda/base_agenda.html:31 #: agenda/templates/agenda/base_agenda.html:36
#: agenda/templates/agenda/edit.html:8 agenda/templates/agenda/edit.html:16 #: agenda/templates/agenda/edit.html:8 agenda/templates/agenda/edit.html:16
#: agenda/templates/agenda/item_row.html:49 #: agenda/templates/agenda/item_row.html:49
msgid "Edit item" msgid "Edit item"
msgstr "Eintrag bearbeiten" msgstr "Eintrag bearbeiten"
#: agenda/templates/agenda/base_agenda.html:33 #: agenda/templates/agenda/base_agenda.html:38
#: agenda/templates/agenda/item_row.html:50 #: agenda/templates/agenda/item_row.html:50
msgid "Delete item" msgid "Delete item"
msgstr "Eintrag löschen" msgstr "Eintrag löschen"
#: agenda/templates/agenda/base_agenda.html:38 #: agenda/templates/agenda/base_agenda.html:43
msgid "Show item" msgid "Show item"
msgstr "Eintrag projizieren" msgstr "Eintrag projizieren"
@ -484,6 +490,12 @@ msgstr "Benötigt Review"
msgid "Version %d permitted" msgid "Version %d permitted"
msgstr "Version %d zugelassen" msgstr "Version %d zugelassen"
#: application/models.py:109
#, python-format
msgctxt "Rejected means not permitted"
msgid "Version %d rejected"
msgstr "Version %d verworfen"
#: application/models.py:138 #: application/models.py:138
msgid "Searching for supporters." msgid "Searching for supporters."
msgstr "Auf Unterstützersuche." msgstr "Auf Unterstützersuche."
@ -1744,7 +1756,7 @@ msgstr "Mitarbeiter"
msgid "Guest" msgid "Guest"
msgstr "Gast" msgstr "Gast"
#: participant/models.py:39 participant/views.py:605 #: participant/models.py:39 participant/views.py:608
#: participant/templates/participant/overview.html:29 #: participant/templates/participant/overview.html:29
#: participant/templates/participant/overview.html:67 #: participant/templates/participant/overview.html:67
msgid "Group" msgid "Group"
@ -1766,7 +1778,7 @@ msgstr "Nur zum Filtern der Benutzerliste."
msgid "Typ" msgid "Typ"
msgstr "Typ" msgstr "Typ"
#: participant/models.py:46 participant/views.py:606 #: participant/models.py:46 participant/views.py:609
#: participant/templates/participant/overview.html:44 #: participant/templates/participant/overview.html:44
#: participant/templates/participant/overview.html:69 #: participant/templates/participant/overview.html:69
msgid "Committee" msgid "Committee"
@ -1921,12 +1933,16 @@ msgstr "Soll das Passwort für <b>%s</b> wirklich zurückgesetzt werden?"
#, python-format #, python-format
msgid "" msgid ""
"Installation was successfully! Use %(user)s (password: %(password)s) for " "Installation was successfully! Use %(user)s (password: %(password)s) for "
"first login and change password!" "first login.<br><strong>Important:</strong> Please change the password after "
"first login! Otherwise this message still appears for everyone and could be "
"a security risk."
msgstr "" msgstr ""
"Die Installation war erfolgreich! Bitte %(user)s (Passwort: %(password)s) für " "Die Installation war erfolgreich! Bitte %(user)s (Passwort: %(password)s) "
"die erste Anmeldung verwenden und das Passwort ändern!" "für die erste Anmeldung verwenden.<br><strong>Wichtig:</strong> Bitte ändern "
"Sie das Passwort direkt nach der erster Anmeldung! Andernfalls erscheint "
"diese Nachricht für alle Teilnehmer/innen und wäre ein Sicherheitsrisiko."
#: participant/views.py:588 #: participant/views.py:591
#: participant/templates/participant/base_participant.html:12 #: participant/templates/participant/base_participant.html:12
#: participant/templates/participant/overview.html:7 #: participant/templates/participant/overview.html:7
#: participant/templates/participant/overview.html:17 #: participant/templates/participant/overview.html:17
@ -1934,56 +1950,56 @@ msgstr ""
msgid "Participants" msgid "Participants"
msgstr "Teilnehmer/innen" msgstr "Teilnehmer/innen"
#: participant/views.py:601 #: participant/views.py:604
msgid "Participant-list" msgid "Participant-list"
msgstr "Teilnehmerliste" msgstr "Teilnehmerliste"
#: participant/views.py:602 #: participant/views.py:605
msgid "List of Participants" msgid "List of Participants"
msgstr "Teilnehmerliste" msgstr "Teilnehmerliste"
#: participant/views.py:605 participant/templates/participant/overview.html:66 #: participant/views.py:608 participant/templates/participant/overview.html:66
msgid "Last Name" msgid "Last Name"
msgstr "Nachname" msgstr "Nachname"
#: participant/views.py:605 participant/templates/participant/overview.html:65 #: participant/views.py:608 participant/templates/participant/overview.html:65
msgid "First Name" msgid "First Name"
msgstr "Vorname" msgstr "Vorname"
#: participant/views.py:605 participant/templates/participant/overview.html:36 #: participant/views.py:608 participant/templates/participant/overview.html:36
#: participant/templates/participant/overview.html:68 #: participant/templates/participant/overview.html:68
msgid "Type" msgid "Type"
msgstr "Typ" msgstr "Typ"
#: participant/views.py:642 #: participant/views.py:645
msgid "Participant-passwords" msgid "Participant-passwords"
msgstr "Teilnehmer-Passwoerter" msgstr "Teilnehmer-Passwoerter"
#: participant/views.py:661 #: participant/views.py:664
msgid "Account for OpenSlides" msgid "Account for OpenSlides"
msgstr "Zugang für OpenSlides" msgstr "Zugang für OpenSlides"
#: participant/views.py:663 #: participant/views.py:666
#, python-format #, python-format
msgid "for %s" msgid "for %s"
msgstr "für %s" msgstr "für %s"
#: participant/views.py:666 #: participant/views.py:669
#, python-format #, python-format
msgid "User: %s" msgid "User: %s"
msgstr "Nutzername: %s" msgstr "Nutzername: %s"
#: participant/views.py:668 #: participant/views.py:671
#, python-format #, python-format
msgid "Password: %s" msgid "Password: %s"
msgstr "Passwort: %s" msgstr "Passwort: %s"
#: participant/views.py:671 #: participant/views.py:674
#, python-format #, python-format
msgid "URL: %s" msgid "URL: %s"
msgstr "URL: %s" msgstr "URL: %s"
#: participant/views.py:716 #: participant/views.py:719
msgid "Participants settings successfully saved." msgid "Participants settings successfully saved."
msgstr "Teilnehmer/innen-Einstellungen wurden erfolgreich gespeichert." msgstr "Teilnehmer/innen-Einstellungen wurden erfolgreich gespeichert."
@ -2171,11 +2187,6 @@ msgstr "Projektor"
msgid "Overview" msgid "Overview"
msgstr "Übersicht" msgstr "Übersicht"
#: projector/templates/projector/base_projector.html:20
#: templates/front_page.html:25
msgid "Projector view"
msgstr "Projektor-Ansicht"
#: projector/templates/projector/control.html:20 #: projector/templates/projector/control.html:20
msgid "Adjust projector view" msgid "Adjust projector view"
msgstr "Projektor-Ansicht anpassen" msgstr "Projektor-Ansicht anpassen"
@ -2217,6 +2228,7 @@ msgid "Custom slides"
msgstr "Benutzerdefinierte Folien" msgstr "Benutzerdefinierte Folien"
#: projector/templates/projector/control_countdown.html:6 #: projector/templates/projector/control_countdown.html:6
msgctxt "seconds"
msgid "s" msgid "s"
msgstr "s" msgstr "s"

5
openslides/participant/views.py
View File

@ -569,7 +569,10 @@ def login(request):
admin = User.objects.get(pk=1) admin = User.objects.get(pk=1)
if admin.check_password(config['admin_password']): if admin.check_password(config['admin_password']):
first_time_message = _("Installation was successfully! Use %(user)s " first_time_message = _("Installation was successfully! Use %(user)s "
"(password: %(password)s) for first login and change password!") % { "(password: %(password)s) for first login.<br>"
"<strong>Important:</strong> Please change the password after "
"first login! Otherwise this message still appears for everyone "
"and could be a security risk.") % {
'user': html_strong(admin.username), 'user': html_strong(admin.username),
'password': html_strong(config['admin_password'])} 'password': html_strong(config['admin_password'])}
else: else: