[Mpuls-commits] r4095 - in base/trunk: . mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/templates mpulsweb/templates/annotations mpulsweb/templates/auth mpulsweb/templates/settings
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Nov 2 17:50:43 CET 2010
Author: torsten
Date: 2010-11-02 17:50:40 +0100 (Tue, 02 Nov 2010)
New Revision: 4095
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
base/trunk/mpulsweb/templates/annotations/main.mako
base/trunk/mpulsweb/templates/auth/login.mako
base/trunk/mpulsweb/templates/auth/main.mako
base/trunk/mpulsweb/templates/main.mako
base/trunk/mpulsweb/templates/settings/edit.mako
Log:
Added internationalisation in templates
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2010-11-02 16:18:13 UTC (rev 4094)
+++ base/trunk/ChangeLog 2010-11-02 16:50:40 UTC (rev 4095)
@@ -10,9 +10,15 @@
* mpulsweb/i18n/mpulsweb.pot,
mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po,
- mpulsweb/templates/home/home.mako: Added internationalisation in home
+ mpulsweb/templates/home/home.mako,
+ mpulsweb/templates/annotations/main.mako,
+ mpulsweb/templates/settings/edit.mako,
+ mpulsweb/templates/auth/main.mako,
+ mpulsweb/templates/auth/login.mako,
+ mpulsweb/templates/main.mako:Added internationalisation in home
template.
+
2010-11-01 Torsten Irlaender <torsten at intevation.de>
Issue1313:
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2010-11-02 16:18:13 UTC (rev 4094)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2010-11-02 16:50:40 UTC (rev 4095)
@@ -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-11-02 17:08+0100\n"
+"PO-Revision-Date: 2010-11-02 17:48+0100\n"
"Last-Translator: Torsten Irländer <torsten.irlaender at intevation.de>\n"
"Language-Team: de <LL at li.org>\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -1130,6 +1130,24 @@
msgid "menu_adm_link_showsettings"
msgstr "Einrichtung"
+#: mpulsweb/templates/main.mako:247 mpulsweb/templates/annotations/main.mako:33
+#: mpulsweb/templates/auth/main.mako:6
+msgid "Logo agency"
+msgstr "Logo Einrichtung"
+
+#: mpulsweb/templates/main.mako:274
+msgid "Notice"
+msgstr "Hinweis"
+
+#: mpulsweb/templates/main.mako:275
+#, python-format
+msgid ""
+"This session will be automatically terminated at %s. Please make sure you"
+" have saved you entries!"
+msgstr ""
+"Gegen %s Uhr wird diese Sitzung automatisch beendet. Speichern sie bitte "
+"vorher Ihre Eingaben!"
+
#: mpulsweb/templates/administration/delete_user_helper.mako:6
#: mpulsweb/templates/administration/edit_user.mako:13
#: mpulsweb/templates/administration/edit_usergroup.mako:10
@@ -1390,7 +1408,6 @@
msgstr "Raumnummer"
#: mpulsweb/templates/administration/new_user_result.mako:42
-#: mpulsweb/templates/auth/login.mako:44
msgid "adm_form_label_agency"
msgstr "Einrichtung"
@@ -1851,6 +1868,10 @@
msgid "login_input_error_message"
msgstr "Anmeldekennung und/oder Passwort sind nicht korrekt"
+#: mpulsweb/templates/auth/login.mako:17 mpulsweb/templates/auth/login.mako:44
+msgid "Agency"
+msgstr "Einrichtung"
+
#: mpulsweb/templates/auth/login.mako:18
msgid "login_p_insert_pw_and_identifier"
msgstr "Geben Sie bitte Anmeldekennung und Passwort ein, um sich anzumelden."
@@ -1863,6 +1884,10 @@
msgid "login_label_pw"
msgstr "Passwort:"
+#: mpulsweb/templates/auth/login.mako:56
+msgid "Login"
+msgstr "Anmelden"
+
#: mpulsweb/templates/auth/logout.mako:3
#, python-format
msgid "%s Abmeldung"
@@ -2688,51 +2713,51 @@
msgid "Helppage for %s"
msgstr "Hilfe für %s"
-#: mpulsweb/templates/home/home.mako:7
+#: mpulsweb/templates/home/home.mako:6
msgid "start_header_blackboard"
msgstr "Schwarzes Brett"
-#: mpulsweb/templates/home/home.mako:14
+#: mpulsweb/templates/home/home.mako:11
msgid "You reside in the central administration"
msgstr "Sie befinden sich in der zentralen Administration"
-#: mpulsweb/templates/home/home.mako:15
+#: mpulsweb/templates/home/home.mako:12
msgid "Under the menu item \"User\" you can"
msgstr "Im Menüpunkt \"Benutzer\" können sie"
-#: mpulsweb/templates/home/home.mako:17
+#: mpulsweb/templates/home/home.mako:14
msgid "Create new user"
msgstr "Neue Benutzer anlegen"
-#: mpulsweb/templates/home/home.mako:18
+#: mpulsweb/templates/home/home.mako:15
msgid "Organise already existing user"
msgstr "Bereits vorhandene Benutzer verwalten"
-#: mpulsweb/templates/home/home.mako:20
+#: mpulsweb/templates/home/home.mako:17
msgid "Under the menu item \"Agency\" you can"
msgstr "Im Menüpunkt \"Einrichtung\" können sie"
-#: mpulsweb/templates/home/home.mako:22
+#: mpulsweb/templates/home/home.mako:19
msgid "Configure the name and other settings of the agency"
msgstr "Den Namen und weitere Einstellungen der Einrichtung konfigurieren"
-#: mpulsweb/templates/home/home.mako:23
+#: mpulsweb/templates/home/home.mako:20
msgid "Activate the transmission of anonymised cases"
msgstr "Die Übermittlung anonymisierter Fallakten aktivieren"
-#: mpulsweb/templates/home/home.mako:33
+#: mpulsweb/templates/home/home.mako:28
msgid "Current information"
msgstr "Aktuelle Informationen"
-#: mpulsweb/templates/home/home.mako:42
+#: mpulsweb/templates/home/home.mako:36
msgid "Automatic reminders"
msgstr "Automatisierte Wiedervorlagen"
-#: mpulsweb/templates/home/home.mako:47
+#: mpulsweb/templates/home/home.mako:41
msgid "Own appointments"
msgstr "Eigene Termine"
-#: mpulsweb/templates/home/home.mako:52
+#: mpulsweb/templates/home/home.mako:46
msgid "Agency-wide appointments"
msgstr "Einrichtungsweite Termine"
@@ -2899,17 +2924,48 @@
msgid "adm_con_es_editsettings"
msgstr "Hier können Sie die einrichtungsweiten Einstellungen bearbeiten."
+#: mpulsweb/templates/settings/edit.mako:46
+msgid "Specification for agency"
+msgstr "Angaben zur Einrichtung"
+
#: mpulsweb/templates/settings/edit.mako:60
#: mpulsweb/templates/settings/show.mako:42
msgid "adm_form_settings_kaadress"
msgstr "Adresse der Einrichtung"
+#: mpulsweb/templates/settings/edit.mako:85
+msgid "Specification for cases"
+msgstr "Angaben zur Fallakte"
+
+#: mpulsweb/templates/settings/edit.mako:103
+#, python-format
+msgid ""
+"Automatic reminders are used to identify cases, which has not been edited"
+" for longer than the specified value. Additionally there can be further "
+"conditions when a reminder is created. Further condition: %s"
+msgstr ""
+"Automatische Wiedervorlagen dienen zum Auffinden von Fallakten, die "
+"länger als der angegebene Wert nicht bearbeitet wurden. Neben diesem "
+"Kriterium kann es weitere Bedingungen geben ab wann eine Wiedervorlage "
+"erstellt wird. Weitere Bedingungen: %s"
+
#: mpulsweb/templates/settings/edit.mako:119
#: mpulsweb/templates/settings/show.mako:60
msgid "adm_form_settings_anontransfer"
msgstr "Fallakten übermitteln"
-#: mpulsweb/templates/settings/edit.mako:130
+#: mpulsweb/templates/settings/edit.mako:122
+msgid ""
+"If this option is activated, anonymized cases are transmitted for "
+"evaluation purpose to a central agency. Anonymized cases do to not "
+"contain any personal data such as name or addresses."
+msgstr ""
+"Ist die Option aktiviert, werden anonymisierte Fallakten zu "
+"Auswertungszwecken an eine zentrale Einrichtung übermittelt. "
+"Anonymisierte Fallakten enthalten keine persönlichen Daten wie Namen oder"
+" Adressen."
+
+#: mpulsweb/templates/settings/edit.mako:127
msgid "adm_form_settings_save"
msgstr "Einstellungen speichern"
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2010-11-02 16:18:13 UTC (rev 4094)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2010-11-02 16:50:40 UTC (rev 4095)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: mpulsweb 2.0.0-pre\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2010-11-02 17:02+0100\n"
+"POT-Creation-Date: 2010-11-02 17:47+0100\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"
@@ -976,6 +976,22 @@
msgid "menu_adm_link_showsettings"
msgstr ""
+#: mpulsweb/templates/main.mako:247 mpulsweb/templates/annotations/main.mako:33
+#: mpulsweb/templates/auth/main.mako:6
+msgid "Logo agency"
+msgstr ""
+
+#: mpulsweb/templates/main.mako:274
+msgid "Notice"
+msgstr ""
+
+#: mpulsweb/templates/main.mako:275
+#, python-format
+msgid ""
+"This session will be automatically terminated at %s. Please make sure you "
+"have saved you entries!"
+msgstr ""
+
#: mpulsweb/templates/administration/delete_user_helper.mako:6
#: mpulsweb/templates/administration/edit_user.mako:13
#: mpulsweb/templates/administration/edit_usergroup.mako:10
@@ -1231,7 +1247,6 @@
msgstr ""
#: mpulsweb/templates/administration/new_user_result.mako:42
-#: mpulsweb/templates/auth/login.mako:44
msgid "adm_form_label_agency"
msgstr ""
@@ -1690,6 +1705,10 @@
msgid "login_input_error_message"
msgstr ""
+#: mpulsweb/templates/auth/login.mako:17 mpulsweb/templates/auth/login.mako:44
+msgid "Agency"
+msgstr ""
+
#: mpulsweb/templates/auth/login.mako:18
msgid "login_p_insert_pw_and_identifier"
msgstr ""
@@ -1702,6 +1721,10 @@
msgid "login_label_pw"
msgstr ""
+#: mpulsweb/templates/auth/login.mako:56
+msgid "Login"
+msgstr ""
+
#: mpulsweb/templates/auth/logout.mako:3
#, python-format
msgid "%s Abmeldung"
@@ -2513,51 +2536,51 @@
msgid "Helppage for %s"
msgstr ""
-#: mpulsweb/templates/home/home.mako:7
+#: mpulsweb/templates/home/home.mako:6
msgid "start_header_blackboard"
msgstr ""
-#: mpulsweb/templates/home/home.mako:14
+#: mpulsweb/templates/home/home.mako:11
msgid "You reside in the central administration"
msgstr ""
-#: mpulsweb/templates/home/home.mako:15
+#: mpulsweb/templates/home/home.mako:12
msgid "Under the menu item \"User\" you can"
msgstr ""
-#: mpulsweb/templates/home/home.mako:17
+#: mpulsweb/templates/home/home.mako:14
msgid "Create new user"
msgstr ""
-#: mpulsweb/templates/home/home.mako:18
+#: mpulsweb/templates/home/home.mako:15
msgid "Organise already existing user"
msgstr ""
-#: mpulsweb/templates/home/home.mako:20
+#: mpulsweb/templates/home/home.mako:17
msgid "Under the menu item \"Agency\" you can"
msgstr ""
-#: mpulsweb/templates/home/home.mako:22
+#: mpulsweb/templates/home/home.mako:19
msgid "Configure the name and other settings of the agency"
msgstr ""
-#: mpulsweb/templates/home/home.mako:23
+#: mpulsweb/templates/home/home.mako:20
msgid "Activate the transmission of anonymised cases"
msgstr ""
-#: mpulsweb/templates/home/home.mako:33
+#: mpulsweb/templates/home/home.mako:28
msgid "Current information"
msgstr ""
-#: mpulsweb/templates/home/home.mako:42
+#: mpulsweb/templates/home/home.mako:36
msgid "Automatic reminders"
msgstr ""
-#: mpulsweb/templates/home/home.mako:47
+#: mpulsweb/templates/home/home.mako:41
msgid "Own appointments"
msgstr ""
-#: mpulsweb/templates/home/home.mako:52
+#: mpulsweb/templates/home/home.mako:46
msgid "Agency-wide appointments"
msgstr ""
@@ -2707,17 +2730,40 @@
msgid "adm_con_es_editsettings"
msgstr ""
+#: mpulsweb/templates/settings/edit.mako:46
+msgid "Specification for agency"
+msgstr ""
+
#: mpulsweb/templates/settings/edit.mako:60
#: mpulsweb/templates/settings/show.mako:42
msgid "adm_form_settings_kaadress"
msgstr ""
+#: mpulsweb/templates/settings/edit.mako:85
+msgid "Specification for cases"
+msgstr ""
+
+#: mpulsweb/templates/settings/edit.mako:103
+#, python-format
+msgid ""
+"Automatic reminders are used to identify cases, which has not been edited for"
+" longer than the specified value. Additionally there can be further "
+"conditions when a reminder is created. Further condition: %s"
+msgstr ""
+
#: mpulsweb/templates/settings/edit.mako:119
#: mpulsweb/templates/settings/show.mako:60
msgid "adm_form_settings_anontransfer"
msgstr ""
-#: mpulsweb/templates/settings/edit.mako:130
+#: mpulsweb/templates/settings/edit.mako:122
+msgid ""
+"If this option is activated, anonymized cases are transmitted for evaluation "
+"purpose to a central agency. Anonymized cases do to not contain any personal "
+"data such as name or addresses."
+msgstr ""
+
+#: mpulsweb/templates/settings/edit.mako:127
msgid "adm_form_settings_save"
msgstr ""
Modified: base/trunk/mpulsweb/templates/annotations/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/annotations/main.mako 2010-11-02 16:18:13 UTC (rev 4094)
+++ base/trunk/mpulsweb/templates/annotations/main.mako 2010-11-02 16:50:40 UTC (rev 4095)
@@ -30,7 +30,7 @@
<div id="wrapper_login" >
<div id="header_login">
<div id="logo_login">
- <img src="${h.url_for('/images/logos/logo_ka_75.png')}" alt="Logo Einrichtung" border="0">
+ <img src="${h.url_for('/images/logos/logo_ka_75.png')}" alt="${_('Logo agency')}" border="0">
</div>
</div>
<div id="content_login">
Modified: base/trunk/mpulsweb/templates/auth/login.mako
===================================================================
--- base/trunk/mpulsweb/templates/auth/login.mako 2010-11-02 16:18:13 UTC (rev 4094)
+++ base/trunk/mpulsweb/templates/auth/login.mako 2010-11-02 16:50:40 UTC (rev 4095)
@@ -14,7 +14,7 @@
% endif
<p>
- <strong>Einrichtung: ${h.getKAName()}</strong><br>
+ <strong>${_('Agency')}: ${h.getKAName()}</strong><br>
${_('login_p_insert_pw_and_identifier')}
</p>
@@ -41,7 +41,7 @@
## file.
% if len(h.get_db_selectionlist()) > 0:
<div class="label">
- <label for="dbname">${_('adm_form_label_agency')}:</label>
+ <label for="dbname">${_('Agency')}:</label>
</div>
<div class="input">
<select name='dbname' size=1>
@@ -53,7 +53,7 @@
% endif
<div class="clearer"></div>
<p id="login_btn">
- <input type="submit" value="Anmelden" name="authform">
+ <input type="submit" value="${_('Login')}" name="authform">
</p>
</form>
</div>
Modified: base/trunk/mpulsweb/templates/auth/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/auth/main.mako 2010-11-02 16:18:13 UTC (rev 4094)
+++ base/trunk/mpulsweb/templates/auth/main.mako 2010-11-02 16:50:40 UTC (rev 4095)
@@ -3,7 +3,7 @@
<div id="wrapper_login" >
<div id="header_login">
<div id="logo_login">
- <img src="${h.url_for('/images/logos/logo_ka_75.png')}" alt="Logo Einrichtung" border="0">
+ <img src="${h.url_for('/images/logos/logo_ka_75.png')}" alt="${_('Logo agency')}" border="0">
</div>
</div>
<div id="content_login">
Modified: base/trunk/mpulsweb/templates/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/main.mako 2010-11-02 16:18:13 UTC (rev 4094)
+++ base/trunk/mpulsweb/templates/main.mako 2010-11-02 16:50:40 UTC (rev 4095)
@@ -244,7 +244,7 @@
<a href="${h.url_for(controller='/')}"
onclick="return checkModification();">
<img src="${h.url_for('/images/logos/logo_ka_75.png')}"
- alt="Logo Einrichtung" border="0">
+ alt="${_('Logo agency')}" border="0">
</a>
</div>
<div id="rightheader">
@@ -271,9 +271,8 @@
% if c.status_msg:
<span class="redcolor">${c.status_msg}</span>
% else:
- <strong>Hinweis:</strong>
- Gegen ${h.get_logouttime()} Uhr wird diese Sitzung automatisch
- beendet. Speichern sie bitte vorher Ihre Eingaben!
+ <strong>${_('Notice')}:</strong>
+ ${_('This session will be automatically terminated at %s. Please make sure you have saved you entries!') % h.get_logouttime() }
% endif
</div>
${self.buildContentHeader()}
Modified: base/trunk/mpulsweb/templates/settings/edit.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/edit.mako 2010-11-02 16:18:13 UTC (rev 4094)
+++ base/trunk/mpulsweb/templates/settings/edit.mako 2010-11-02 16:50:40 UTC (rev 4095)
@@ -43,7 +43,7 @@
<div class="waska_form">
<form action="${h.url_for(controller='/settings', action='editAction')}" method="POST">
<fieldset>
- <legend>Angaben zur Einrichtung</legend>
+ <legend>${_('Specification for agency')}</legend>
<div class="waska_form_element w30">
<label for="ka_name">${_('adm_form_settings_kaname')}</label>
% if c.form_errors.get('ka_name'):
@@ -82,7 +82,7 @@
</div>
</fieldset>
<fieldset>
- <legend>Angaben zu den Fallakten</legend>
+ <legend>${_('Specification for cases')}</legend>
<div class="waska_form_element w100">
<label for="max_speicherdauer">
${_('adm_form_settings_max_savetime')}
@@ -100,7 +100,7 @@
maxlength="4">
% endif
<p class="info">
- Automatische Wiedervorlagen dienen zum Auffinden von Fallakten, die länger als der angegebene Wert nicht bearbeitet wurden. Neben diesem Kriterium kann es weitere Bedingungen geben ab wann eine Wiedervorlage erstellt wird. Weitere Bedingungen: ${g.mpuls_config.get('case', 'reminderconditiondesc')}
+ ${_('Automatic reminders are used to identify cases, which has not been edited for longer than the specified value. Additionally there can be further conditions when a reminder is created. Further condition: %s') % g.mpuls_config.get('case', 'reminderconditiondesc')}
</p>
</div>
<div class="waska_form_element w100">
@@ -119,10 +119,7 @@
${_('adm_form_settings_anontransfer')}
</label>
<p>
- Ist die Option aktiviert, werden anonymisierte Fallakten zu
- Auswertungszwecken an eine zentrale Einrichtung
- übermittelt. Anonymisierte Fallakten enthalten keine
- persönlichen Daten wie Namen oder Adressen.
+ ${_('If this option is activated, anonymized cases are transmitted for evaluation purpose to a central agency. Anonymized cases do to not contain any personal data such as name or addresses.')}
</p>
</div>
</fieldset>
More information about the Mpuls-commits
mailing list