[Mpuls-commits] r2658 - 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 15:07:07 CEST 2010
Author: roland
Date: 2010-05-05 15:07:06 +0200 (Wed, 05 May 2010)
New Revision: 2658
Modified:
wasko/branches/2.0/mpulsweb/controllers/logbook.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/logbook.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/logbook.py 2010-05-05 12:54:49 UTC (rev 2657)
+++ wasko/branches/2.0/mpulsweb/controllers/logbook.py 2010-05-05 13:07:06 UTC (rev 2658)
@@ -29,44 +29,38 @@
import formencode
from datetime import datetime
+from pylons.i18n import _, ungettext
+
from mpulsweb.lib.security import checkRole
from mpulsweb.model.logbook import Logbook, LogbookEntry, LogbookEntryChecker
from mpulsweb.lib.base import BaseController, c, render, request, session
from mpulsweb.lib.validators import CreateLogbookForm, EditLogbookForm
-LOGBOOK_ENTRY_CREATE_FAILED = u"Tagebucheintrag wurde nicht angelegt!"
-LOGBOOK_ENTRY_CREATE_FAILED_TEXT = u"\
-Beim Anlegen eines Tagebucheintrages is ein Fehler aufgetreten."
+LOGBOOK_ENTRY_CREATE_FAILED = _(u"Logbook entry was not created!")
+LOGBOOK_ENTRY_CREATE_FAILED_TEXT = _(u"An error occured while creating a logbook entry")
-CREATE_LOGBOOK_ENTRY_SUCCESS = u"Eintrag ins Tagebuch erfolgreich."
-CREATE_LOGBOOK_ENTRY_SUCCESS_TEXT = u"\
-Der Tagebucheintrag wurde erfolgreich durchgeführt."
+CREATE_LOGBOOK_ENTRY_SUCCESS = _(u"Entry successfully created.")
+CREATE_LOGBOOK_ENTRY_SUCCESS_TEXT = _(u"The logbook entry was sucessfully created")
-DELETE_LOGBOOK_ENTRY_CONFIRM = u"Tagebucheintrag löschen?"
-DELETE_LOGBOOK_ENTRY_CONFIRM_TEXT = u"""\
-Wollen Sie diesen Tagebucheintrag wirklich löschen?
-Er ginge damit unwiederbringlich verloren."""
+DELETE_LOGBOOK_ENTRY_CONFIRM = _(u"Delete logbook entry?")
+DELETE_LOGBOOK_ENTRY_CONFIRM_TEXT = _(u"""Do you want to delete this logbook entry?
+The data will be irrevocably lost.""")
-LOGBOOK_ENTRY_DELETE_SUCCESS = u"Tagebucheintrag erfolgreich gelöscht!"
-LOGBOOK_ENTRY_DELETE_SUCCESS_TEXT = u"\
-Der Tagebucheintrag wurde erfolgreich gelöscht!"
+LOGBOOK_ENTRY_DELETE_SUCCESS = _(u"Logbook entry successfully deleted!")
+LOGBOOK_ENTRY_DELETE_SUCCESS_TEXT = _(u"Logbook entry was successfully deleted!")
-LOGBOOK_ENTRY_DELETE_FAILED = u"Löschen des Tagebucheintrags fehlgeschlagen!"
-LOGBOOK_ENTRY_DELETE_FAILED_TEXT = u"\
-Beim Löschen des Tagebucheintrags ist ein Fehler aufgetreten."
+LOGBOOK_ENTRY_DELETE_FAILED = _(u"Deletion of logbook entry failed!")
+LOGBOOK_ENTRY_DELETE_FAILED_TEXT = _(u"An error occured while deleting the logbook entry.")
-LOGBOOK_ENTRY_SHOW_FAILED = u"Anzeigen des Tagebucheintrags fehlgeschlagen!"
-LOGBOOK_ENTRY_SHOW_FAILED_TEXT = u"\
-Beim Anzeigen des Tagebucheintrags ist ein Fehler aufgetreten."
+LOGBOOK_ENTRY_SHOW_FAILED = _(u"Showing of logbook entry failed!")
+LOGBOOK_ENTRY_SHOW_FAILED_TEXT = _(u"An error occured while showing the logbook entry.")
-LOGBOOK_ENTRY_SAVE_SUCCESS = u"Änderung des Eintrages erfolgreich!"
-LOGBOOK_ENTRY_SAVE_SUCCESS_TEXT = u"\
-Der Eintrag im Tagebuch wurde erfolgreich geändert."
+LOGBOOK_ENTRY_SAVE_SUCCESS = _(u"Changes on logbook successfull!")
+LOGBOOK_ENTRY_SAVE_SUCCESS_TEXT = _(u"The changes on the logbook entry were applied successfully.")
-LOGBOOK_ENTRY_SAVE_FAILED = u"Änderung des Eintrages fehlgeschlagen!"
-LOGBOOK_ENTRY_SAVE_FAILED_TEXT = u"\
-Die Änderung des Eintrages im Tagebuch ist fehlgeschlagen."
+LOGBOOK_ENTRY_SAVE_FAILED = _(u"Changes on logbook failed!")
+LOGBOOK_ENTRY_SAVE_FAILED_TEXT = _(u"An error occured applying changes on the logbook entry")
log = logging.getLogger(__name__)
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:54:49 UTC (rev 2657)
+++ wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2010-05-05 13:07:06 UTC (rev 2658)
@@ -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:50+0100\n"
+"PO-Revision-Date: 2010-05-05 15:06+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"
@@ -477,6 +477,72 @@
msgid "CSV Export failed"
msgstr "CSV-Export fehlgeschlagen"
+#: mpulsweb/controllers/logbook.py:40
+msgid "Logbook entry was not created!"
+msgstr "Tagebucheintrag wurde nicht angelegt!"
+
+#: mpulsweb/controllers/logbook.py:41
+msgid "An error occured while creating a logbook entry"
+msgstr "Beim Anlegen eines Tagebucheintrages is ein Fehler aufgetreten."
+
+#: mpulsweb/controllers/logbook.py:47
+msgid "Entry successfully created."
+msgstr "Eintrag ins Tagebuch erfolgreich erstellt."
+
+#: mpulsweb/controllers/logbook.py:48
+msgid "The logbook entry was sucessfully created"
+msgstr "Der Tagebucheintrag wurde erfolgreich durchgeführt."
+
+#: mpulsweb/controllers/logbook.py:54
+msgid "Delete logbook entry?"
+msgstr "Tagebucheintrag löschen?"
+
+#: mpulsweb/controllers/logbook.py:55
+msgid ""
+"Do you want to delete this logbook entry?\n"
+"The data will be irrevocably lost."
+msgstr "Wollen Sie diesen Tagebucheintrag wirklich löschen? Er ginge damit unwiederbringlich verloren."
+
+#: mpulsweb/controllers/logbook.py:63
+msgid "Logbook entry successfully deleted!"
+msgstr "Tagebucheintrag erfolgreich gelöscht!"
+
+#: mpulsweb/controllers/logbook.py:64
+msgid "Logbook entry was successfully deleted!"
+msgstr "Der Tagebucheintrag wurde erfolgreich gelöscht!"
+
+#: mpulsweb/controllers/logbook.py:70
+msgid "Deletion of logbook entry failed!"
+msgstr "Löschen des Tagebucheintrags fehlgeschlagen!"
+
+#: mpulsweb/controllers/logbook.py:71
+msgid "An error occured while deleting the logbook entry."
+msgstr "Beim Löschen des Tagebucheintrags ist ein Fehler aufgetreten."
+
+#: mpulsweb/controllers/logbook.py:77
+msgid "Showing of logbook entry failed!"
+msgstr "Anzeigen des Tagebucheintrags fehlgeschlagen!"
+
+#: mpulsweb/controllers/logbook.py:78
+msgid "An error occured while showing the logbook entry."
+msgstr "Anzeigen des Tagebucheintrags fehlgeschlagen!"
+
+#: mpulsweb/controllers/logbook.py:84
+msgid "Changes on logbook successfull!"
+msgstr "Änderung des Eintrages erfolgreich!"
+
+#: mpulsweb/controllers/logbook.py:85
+msgid "The changes on the logbook entry were applied successfully."
+msgstr "Der Eintrag im Tagebuch wurde erfolgreich geändert."
+
+#: mpulsweb/controllers/logbook.py:91
+msgid "Changes on logbook failed!"
+msgstr "Änderung des Eintrages fehlgeschlagen!"
+
+#: mpulsweb/controllers/logbook.py:92
+msgid "An error occured applying changes on the logbook entry"
+msgstr "Die Änderung des Eintrages im Tagebuch ist fehlgeschlagen."
+
#: mpulsweb/controllers/news.py:16
msgid "Mark message as read"
msgstr "Nachricht als gelesen markieren"
@@ -560,22 +626,18 @@
msgstr "Bitte klicken Sie auf OK, um fortzufahren."
#: 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
+#: mpulsweb/controllers/usersettings.py:51
msgid "adm_edit_standin_success_header"
msgstr "Vertretung gespeichert!"
-#: mpulsweb/controllers/usersettings.py:57
+#: mpulsweb/controllers/usersettings.py:52
msgid "adm_edit_standin_success_text"
msgstr "Ihre Standard-Vertretung wurde gespeichert. Bitte klicken Sie auf OK, um fortzufahren."
Modified: wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot 2010-05-05 12:54:49 UTC (rev 2657)
+++ wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot 2010-05-05 13:07:06 UTC (rev 2658)
@@ -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:49+0200\n"
+"POT-Creation-Date: 2010-05-05 15:01+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"
@@ -481,6 +481,72 @@
msgid "CSV Export failed"
msgstr ""
+#: mpulsweb/controllers/logbook.py:40
+msgid "Logbook entry was not created!"
+msgstr ""
+
+#: mpulsweb/controllers/logbook.py:41
+msgid "An error occured while creating a logbook entry"
+msgstr ""
+
+#: mpulsweb/controllers/logbook.py:47
+msgid "Entry successfully created."
+msgstr ""
+
+#: mpulsweb/controllers/logbook.py:48
+msgid "The logbook entry was sucessfully created"
+msgstr ""
+
+#: mpulsweb/controllers/logbook.py:54
+msgid "Delete logbook entry?"
+msgstr ""
+
+#: mpulsweb/controllers/logbook.py:55
+msgid ""
+"Do you want to delete this logbook entry?\n"
+"The data will be irrevocably lost."
+msgstr ""
+
+#: mpulsweb/controllers/logbook.py:63
+msgid "Logbook entry successfully deleted!"
+msgstr ""
+
+#: mpulsweb/controllers/logbook.py:64
+msgid "Logbook entry was successfully deleted!"
+msgstr ""
+
+#: mpulsweb/controllers/logbook.py:70
+msgid "Deletion of logbook entry failed!"
+msgstr ""
+
+#: mpulsweb/controllers/logbook.py:71
+msgid "An error occured while deleting the logbook entry."
+msgstr ""
+
+#: mpulsweb/controllers/logbook.py:77
+msgid "Showing of logbook entry failed!"
+msgstr ""
+
+#: mpulsweb/controllers/logbook.py:78
+msgid "An error occured while showing the logbook entry."
+msgstr ""
+
+#: mpulsweb/controllers/logbook.py:84
+msgid "Changes on logbook successfull!"
+msgstr ""
+
+#: mpulsweb/controllers/logbook.py:85
+msgid "The changes on the logbook entry were applied successfully."
+msgstr ""
+
+#: mpulsweb/controllers/logbook.py:91
+msgid "Changes on logbook failed!"
+msgstr ""
+
+#: mpulsweb/controllers/logbook.py:92
+msgid "An error occured applying changes on the logbook entry"
+msgstr ""
+
#: mpulsweb/controllers/news.py:16
msgid "Mark message as read"
msgstr ""
@@ -574,11 +640,11 @@
msgid "You password was successfully changed"
msgstr ""
-#: mpulsweb/controllers/usersettings.py:56
+#: mpulsweb/controllers/usersettings.py:51
msgid "adm_edit_standin_success_header"
msgstr ""
-#: mpulsweb/controllers/usersettings.py:57
+#: mpulsweb/controllers/usersettings.py:52
msgid "adm_edit_standin_success_text"
msgstr ""
More information about the Mpuls-commits
mailing list