[Mpuls-commits] r2656 - in wasko/branches/2.0/mpulsweb: controllers i18n i18n/de/LC_MESSAGES
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed May 5 14:53:11 CEST 2010
Author: roland
Date: 2010-05-05 14:53:09 +0200 (Wed, 05 May 2010)
New Revision: 2656
Modified:
wasko/branches/2.0/mpulsweb/controllers/news.py
wasko/branches/2.0/mpulsweb/controllers/repeatgroup.py
wasko/branches/2.0/mpulsweb/controllers/usersettings.py
wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot
Log:
Moved hard-coded strings into gettext
Modified: wasko/branches/2.0/mpulsweb/controllers/news.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/news.py 2010-05-05 12:45:05 UTC (rev 2655)
+++ wasko/branches/2.0/mpulsweb/controllers/news.py 2010-05-05 12:53:09 UTC (rev 2656)
@@ -13,7 +13,7 @@
log = logging.getLogger(__name__)
-MARK_NEWS_AS_READ_CONFIRM = _(u"Mark message as read")
+MARK_NEWS_AS_READ_CONFIRM = _(u"Mark message as read")
MARK_NEWS_AS_READ_CONFIRM_TEXT = _(u"""Do you really want to mark the message as read?
It will permanently disappear from the overview.""")
Modified: wasko/branches/2.0/mpulsweb/controllers/repeatgroup.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/repeatgroup.py 2010-05-05 12:45:05 UTC (rev 2655)
+++ wasko/branches/2.0/mpulsweb/controllers/repeatgroup.py 2010-05-05 12:53:09 UTC (rev 2656)
@@ -17,12 +17,10 @@
log = logging.getLogger(__name__)
-DELETE_RG_ENTRY_CONFIRM = u"""Datensatz löschen?"""
-DELETE_RG_ENTRY_CONFIRM_TEXT = u"""\
-Wollen Sie wirklich diesen Datensatz löschen und die Daten
-unwiederbringlich verlieren?"""
+DELETE_RG_ENTRY_CONFIRM = _(u"Delete dataset?")
+DELETE_RG_ENTRY_CONFIRM_TEXT = _(u"""Do you want to delete this dataset and
+irrevocably lose the data?""")
-
class RepeatgroupController(BaseController):
def list(self, id):
Modified: wasko/branches/2.0/mpulsweb/controllers/usersettings.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/usersettings.py 2010-05-05 12:45:05 UTC (rev 2655)
+++ wasko/branches/2.0/mpulsweb/controllers/usersettings.py 2010-05-05 12:53:09 UTC (rev 2656)
@@ -32,6 +32,8 @@
import logging
import formencode
+from pylons.i18n import _
+
from mpulsweb.lib.base import BaseController, c, h, render, request, session, _
from mpulsweb.lib.validators import BaseFormValidator, NewPasswordForm
@@ -43,14 +45,11 @@
log = logging.getLogger(__name__)
+SET_PASSWORD_NOTIFICATION_HEADER = _(u"User password changed!")
+SET_PASSWORD_NOTIFICATION_TEXT = _(u"You password was successfully changed") + " " + _("Please click OK to continue.")
-SET_PASSWORD_NOTIFICATION_HEADER = u"""Benutzerpasswort geändert!"""
-SET_PASSWORD_NOTIFICATION_TEXT = u"""\
-Ihr Passwort wurde erfolgreich geändert. Bitte klicken Sie auf "OK",
-um fortzufahren."""
-
EDIT_STANDIN_SUCCESS_HEADER = _('adm_edit_standin_success_header')
-EDIT_STANDIN_SUCCESS_TEXT = _('adm_edit_standin_success_text')
+EDIT_STANDIN_SUCCESS_TEXT = _('adm_edit_standin_success_text')
class UsersettingsController(BaseController):
Modified: wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2010-05-05 12:45:05 UTC (rev 2655)
+++ wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2010-05-05 12:53:09 UTC (rev 2656)
@@ -8,7 +8,7 @@
"Project-Id-Version: mpulsweb 0.0.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
"POT-Creation-Date: 2009-10-08 09:54+0200\n"
-"PO-Revision-Date: 2010-05-05 14:42+0100\n"
+"PO-Revision-Date: 2010-05-05 14:50+0100\n"
"Last-Translator: Roland Geider <roland.geider at intevation.de>\n"
"Language-Team: de <LL at li.org>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -238,6 +238,7 @@
#: mpulsweb/controllers/case_bundle.py:37
#: mpulsweb/controllers/casedocument.py:22
#: mpulsweb/controllers/document.py:43
+#: mpulsweb/controllers/usersettings.py:49
msgid "Please click OK to continue."
msgstr "Bitte klicken Sie auf OK, um fortzufahren."
@@ -487,8 +488,6 @@
msgstr "Wollen Sie die Nachricht wirklich als gelesen markieren? Sie wird dadurch dauerhaft aus der übersicht entfernt."
#: mpulsweb/controllers/phase.py:12
-#| msgid "Case anonymised!"
-#| msgid_plural "Cases anonymised!"
msgid "Phase changed!"
msgstr "Phase gewechselt!"
@@ -534,11 +533,21 @@
msgid "The case will be anonymised if you retract the privacy statement."
msgstr "Die Akte wird anonymisiert, falls die Erklärung zurückgezogen wird."
-#: mpulsweb/controllers/repeatgroup.py:48
+#: mpulsweb/controllers/repeatgroup.py:20
+msgid "Delete dataset?"
+msgstr "Datensatz löschen?"
+
+#: mpulsweb/controllers/repeatgroup.py:21
+msgid ""
+"Do you want to delete this dataset and\n"
+"irrevocably lose the data?"
+msgstr "Wollen Sie wirklich den Datensatz löschen und die Daten unwiederbringlich verlieren?"
+
+#: mpulsweb/controllers/repeatgroup.py:46
msgid "Repeat group not found."
msgstr "Wiederholung nicht gefunden"
-#: mpulsweb/controllers/repeatgroup.py:81
+#: mpulsweb/controllers/repeatgroup.py:79
msgid "repeat group container not found."
msgstr "Wiederholungscontainer nicht gefunden"
@@ -550,11 +559,23 @@
msgid "adm_edit_agency_text"
msgstr "Bitte klicken Sie auf OK, um fortzufahren."
-#: mpulsweb/controllers/usersettings.py:52
+#: mpulsweb/controllers/usersettings.py:48
+#| msgid "Phase changed!"
+msgid "User password changed!"
+msgstr "Benutzerpasswort geändert!"
+
+#: mpulsweb/controllers/usersettings.py:49
+#, python-format
+#| msgid "%s case was sucessfully anonymised."
+#| msgid_plural "%s cases were sucessfully anonymised."
+msgid "You password was successfully changed"
+msgstr "Ihr Passwort wurde erfolgreich geändert."
+
+#: mpulsweb/controllers/usersettings.py:56
msgid "adm_edit_standin_success_header"
msgstr "Vertretung gespeichert!"
-#: mpulsweb/controllers/usersettings.py:53
+#: mpulsweb/controllers/usersettings.py:57
msgid "adm_edit_standin_success_text"
msgstr "Ihre Standard-Vertretung wurde gespeichert. Bitte klicken Sie auf OK, um fortzufahren."
@@ -2556,6 +2577,3 @@
msgid "adm_np_changepassword"
msgstr "Benutzerpasswort geändert!"
-#~ msgid "Phase chabged!"
-#~ msgstr ""
-
Modified: wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot 2010-05-05 12:45:05 UTC (rev 2655)
+++ wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot 2010-05-05 12:53:09 UTC (rev 2656)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: mpulsweb 0.1\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2010-05-05 14:42+0200\n"
+"POT-Creation-Date: 2010-05-05 14:49+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -239,7 +239,7 @@
msgstr ""
#: mpulsweb/controllers/case_bundle.py:37 mpulsweb/controllers/casedocument.py:22
-#: mpulsweb/controllers/document.py:43
+#: mpulsweb/controllers/document.py:43 mpulsweb/controllers/usersettings.py:49
msgid "Please click OK to continue."
msgstr ""
@@ -540,11 +540,21 @@
msgid "The case will be anonymised if you retract the privacy statement."
msgstr ""
-#: mpulsweb/controllers/repeatgroup.py:48
+#: mpulsweb/controllers/repeatgroup.py:20
+msgid "Delete dataset?"
+msgstr ""
+
+#: mpulsweb/controllers/repeatgroup.py:21
+msgid ""
+"Do you want to delete this dataset and\n"
+"irrevocably lose the data?"
+msgstr ""
+
+#: mpulsweb/controllers/repeatgroup.py:46
msgid "Repeat group not found."
msgstr ""
-#: mpulsweb/controllers/repeatgroup.py:81
+#: mpulsweb/controllers/repeatgroup.py:79
msgid "repeat group container not found."
msgstr ""
@@ -556,11 +566,19 @@
msgid "adm_edit_agency_text"
msgstr ""
-#: mpulsweb/controllers/usersettings.py:52
+#: mpulsweb/controllers/usersettings.py:48
+msgid "User password changed!"
+msgstr ""
+
+#: mpulsweb/controllers/usersettings.py:49
+msgid "You password was successfully changed"
+msgstr ""
+
+#: mpulsweb/controllers/usersettings.py:56
msgid "adm_edit_standin_success_header"
msgstr ""
-#: mpulsweb/controllers/usersettings.py:53
+#: mpulsweb/controllers/usersettings.py:57
msgid "adm_edit_standin_success_text"
msgstr ""
More information about the Mpuls-commits
mailing list