[Mpuls-commits] r4305 - in base/trunk: . mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/templates/casemanagement
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu Dec 2 10:32:28 CET 2010
Author: torsten
Date: 2010-12-02 10:32:24 +0100 (Thu, 02 Dec 2010)
New Revision: 4305
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
base/trunk/mpulsweb/templates/casemanagement/search.mako
Log:
Issue1424: Added translation on search page.
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2010-12-02 09:00:47 UTC (rev 4304)
+++ base/trunk/ChangeLog 2010-12-02 09:32:24 UTC (rev 4305)
@@ -1,3 +1,10 @@
+2010-12-02 Torsten Irlaender <torsten at intevation.de>
+
+ * mpulsweb/i18n/mpulsweb.pot,
+ mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po,
+ mpulsweb/templates/casemanagement/search.mako: Issue1424: Added translation on
+ search page.
+
2010-12-02 Roland Geider <roland.geider at intevation.de>
* mpulsweb/public/styles/screen.css: issue1210: do a slight clean up
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2010-12-02 09:00:47 UTC (rev 4304)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2010-12-02 09:32:24 UTC (rev 4305)
@@ -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-30 17:05+0100\n"
+"PO-Revision-Date: 2010-12-02 10:29+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"
@@ -677,11 +677,11 @@
msgid "Error: Evaluation failed"
msgstr "Fehler: Auswertung fehlgeschlagen"
-#: mpulsweb/controllers/formularpage.py:239
+#: mpulsweb/controllers/formularpage.py:251
msgid "Phase automatically changed"
msgstr "Phase automatisch gewechselt"
-#: mpulsweb/controllers/formularpage.py:240
+#: mpulsweb/controllers/formularpage.py:252
#, python-format
msgid ""
"The phase of the case was changed automatically after "
@@ -693,11 +693,11 @@
"Bitte klicken Sie auf 'Ok', um mit der Bearbeitung der Fallakte "
"fortzufahren."
-#: mpulsweb/controllers/formularpage.py:243
+#: mpulsweb/controllers/formularpage.py:255
msgid "Change phase?"
msgstr "Phase wechseln?"
-#: mpulsweb/controllers/formularpage.py:244
+#: mpulsweb/controllers/formularpage.py:256
#, python-format
msgid ""
"After checking the filled out required fields, it seems that "
@@ -2239,7 +2239,8 @@
msgstr "Fallart"
#: mpulsweb/templates/casemanagement/digest.mako:119
-#: mpulsweb/templates/casemanagement/search.mako:85
+#: mpulsweb/templates/casemanagement/search.mako:90
+#: mpulsweb/templates/evaluation/evaluate.mako:34
#: mpulsweb/templates/phase/phase.mako:156
msgid "Phase"
msgstr "Phase"
@@ -2253,12 +2254,12 @@
msgstr "Start- und Enddatum"
#: mpulsweb/templates/casemanagement/digest.mako:148
-#: mpulsweb/templates/casemanagement/search.mako:96
+#: mpulsweb/templates/casemanagement/search.mako:103
msgid "Start date"
msgstr "Startdatum"
#: mpulsweb/templates/casemanagement/digest.mako:149
-#: mpulsweb/templates/casemanagement/search.mako:105
+#: mpulsweb/templates/casemanagement/search.mako:112
msgid "End date"
msgstr "Enddatum"
@@ -2462,42 +2463,98 @@
msgstr "Suche"
#: mpulsweb/templates/casemanagement/search.mako:15
-#: mpulsweb/templates/casemanagement/search.mako:35
+#: mpulsweb/templates/casemanagement/search.mako:37
msgid "Responsibility"
msgstr "Verantwortlichkeit"
-#: mpulsweb/templates/casemanagement/search.mako:26
+#: mpulsweb/templates/casemanagement/search.mako:18
+msgid "All users"
+msgstr "Alle Benutzer"
+
+#: mpulsweb/templates/casemanagement/search.mako:28
msgid "Branch"
msgstr "Filiale"
-#: mpulsweb/templates/casemanagement/search.mako:62
+#: mpulsweb/templates/casemanagement/search.mako:41
+msgid "Own cases"
+msgstr "Eigene Fallakten"
+
+#: mpulsweb/templates/casemanagement/search.mako:42
+msgid "Editor"
+msgstr "Bearbeiter"
+
+#: mpulsweb/templates/casemanagement/search.mako:45
+msgid "Own"
+msgstr "Eigene"
+
+#: mpulsweb/templates/casemanagement/search.mako:49
+msgid "Standin cases"
+msgstr "Vertretungsfälle"
+
+#: mpulsweb/templates/casemanagement/search.mako:53
+msgid "Standin"
+msgstr "Vertretung"
+
+#: mpulsweb/templates/casemanagement/search.mako:65
msgid "Status"
msgstr "Status"
-#: mpulsweb/templates/casemanagement/search.mako:115
+#: mpulsweb/templates/casemanagement/search.mako:69
+msgid "Editable cases"
+msgstr "Bearbeitbare Fallakten"
+
+#: mpulsweb/templates/casemanagement/search.mako:69
+msgid "Editable"
+msgstr "Bearbeitbare"
+
+#: mpulsweb/templates/casemanagement/search.mako:72
+msgid "Almost deleted"
+msgstr "Schwebend gelöscht"
+
+#: mpulsweb/templates/casemanagement/search.mako:77
+msgid "Almost anonymized"
+msgstr "Schwebend anonymisiert"
+
+#: mpulsweb/templates/casemanagement/search.mako:81
+msgid "Anonymized"
+msgstr "Anonymisiert"
+
+#: mpulsweb/templates/casemanagement/search.mako:123
msgid "Gender"
msgstr "Geschlecht"
-#: mpulsweb/templates/casemanagement/search.mako:118
+#: mpulsweb/templates/casemanagement/search.mako:126
msgid "All"
msgstr "Alle"
-#: mpulsweb/templates/casemanagement/search.mako:119
+#: mpulsweb/templates/casemanagement/search.mako:127
msgid "Female"
msgstr "Weiblich"
-#: mpulsweb/templates/casemanagement/search.mako:120
+#: mpulsweb/templates/casemanagement/search.mako:128
msgid "Male"
msgstr "Männlich"
-#: mpulsweb/templates/casemanagement/search.mako:121
+#: mpulsweb/templates/casemanagement/search.mako:129
msgid "Unspecified"
msgstr "Keine Angabe"
-#: mpulsweb/templates/casemanagement/search.mako:138
+#: mpulsweb/templates/casemanagement/search.mako:146
msgid "cm_form_overview_search_submit"
msgstr "Suchen"
+#: mpulsweb/templates/casemanagement/search.mako:149
+msgid "Hide extended search"
+msgstr "Erweiterte Suche ausblenden"
+
+#: mpulsweb/templates/casemanagement/search.mako:152
+msgid "Show extended search"
+msgstr "Erweiterte Suche einblenden"
+
+#: mpulsweb/templates/casemanagement/search.mako:156
+msgid "Reset search"
+msgstr "Suche zurücksetzen"
+
#: mpulsweb/templates/casemanagement/showAppointment.mako:18
msgid "sm_menu_link_edit_appointment"
msgstr "In Bearbeitung nehmen"
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2010-12-02 09:00:47 UTC (rev 4304)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2010-12-02 09:32:24 UTC (rev 4305)
@@ -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-30 17:05+0100\n"
+"POT-Creation-Date: 2010-12-02 10:25+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"
@@ -555,11 +555,11 @@
msgid "Error: Evaluation failed"
msgstr ""
-#: mpulsweb/controllers/formularpage.py:239
+#: mpulsweb/controllers/formularpage.py:251
msgid "Phase automatically changed"
msgstr ""
-#: mpulsweb/controllers/formularpage.py:240
+#: mpulsweb/controllers/formularpage.py:252
#, python-format
msgid ""
"The phase of the case was changed automatically after checking "
@@ -567,11 +567,11 @@
" Please click on 'Ok', to proceed editing the case."
msgstr ""
-#: mpulsweb/controllers/formularpage.py:243
+#: mpulsweb/controllers/formularpage.py:255
msgid "Change phase?"
msgstr ""
-#: mpulsweb/controllers/formularpage.py:244
+#: mpulsweb/controllers/formularpage.py:256
#, python-format
msgid ""
"After checking the filled out required fields, it seems that a "
@@ -2057,7 +2057,8 @@
msgstr ""
#: mpulsweb/templates/casemanagement/digest.mako:119
-#: mpulsweb/templates/casemanagement/search.mako:85
+#: mpulsweb/templates/casemanagement/search.mako:90
+#: mpulsweb/templates/evaluation/evaluate.mako:34
#: mpulsweb/templates/phase/phase.mako:156
msgid "Phase"
msgstr ""
@@ -2071,12 +2072,12 @@
msgstr ""
#: mpulsweb/templates/casemanagement/digest.mako:148
-#: mpulsweb/templates/casemanagement/search.mako:96
+#: mpulsweb/templates/casemanagement/search.mako:103
msgid "Start date"
msgstr ""
#: mpulsweb/templates/casemanagement/digest.mako:149
-#: mpulsweb/templates/casemanagement/search.mako:105
+#: mpulsweb/templates/casemanagement/search.mako:112
msgid "End date"
msgstr ""
@@ -2269,42 +2270,98 @@
msgstr ""
#: mpulsweb/templates/casemanagement/search.mako:15
-#: mpulsweb/templates/casemanagement/search.mako:35
+#: mpulsweb/templates/casemanagement/search.mako:37
msgid "Responsibility"
msgstr ""
-#: mpulsweb/templates/casemanagement/search.mako:26
+#: mpulsweb/templates/casemanagement/search.mako:18
+msgid "All users"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/search.mako:28
msgid "Branch"
msgstr ""
-#: mpulsweb/templates/casemanagement/search.mako:62
+#: mpulsweb/templates/casemanagement/search.mako:41
+msgid "Own cases"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/search.mako:42
+msgid "Editor"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/search.mako:45
+msgid "Own"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/search.mako:49
+msgid "Standin cases"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/search.mako:53
+msgid "Standin"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/search.mako:65
msgid "Status"
msgstr ""
-#: mpulsweb/templates/casemanagement/search.mako:115
+#: mpulsweb/templates/casemanagement/search.mako:69
+msgid "Editable cases"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/search.mako:69
+msgid "Editable"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/search.mako:72
+msgid "Almost deleted"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/search.mako:77
+msgid "Almost anonymized"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/search.mako:81
+msgid "Anonymized"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/search.mako:123
msgid "Gender"
msgstr ""
-#: mpulsweb/templates/casemanagement/search.mako:118
+#: mpulsweb/templates/casemanagement/search.mako:126
msgid "All"
msgstr ""
-#: mpulsweb/templates/casemanagement/search.mako:119
+#: mpulsweb/templates/casemanagement/search.mako:127
msgid "Female"
msgstr ""
-#: mpulsweb/templates/casemanagement/search.mako:120
+#: mpulsweb/templates/casemanagement/search.mako:128
msgid "Male"
msgstr ""
-#: mpulsweb/templates/casemanagement/search.mako:121
+#: mpulsweb/templates/casemanagement/search.mako:129
msgid "Unspecified"
msgstr ""
-#: mpulsweb/templates/casemanagement/search.mako:138
+#: mpulsweb/templates/casemanagement/search.mako:146
msgid "cm_form_overview_search_submit"
msgstr ""
+#: mpulsweb/templates/casemanagement/search.mako:149
+msgid "Hide extended search"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/search.mako:152
+msgid "Show extended search"
+msgstr ""
+
+#: mpulsweb/templates/casemanagement/search.mako:156
+msgid "Reset search"
+msgstr ""
+
#: mpulsweb/templates/casemanagement/showAppointment.mako:18
msgid "sm_menu_link_edit_appointment"
msgstr ""
Modified: base/trunk/mpulsweb/templates/casemanagement/search.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/search.mako 2010-12-02 09:00:47 UTC (rev 4304)
+++ base/trunk/mpulsweb/templates/casemanagement/search.mako 2010-12-02 09:32:24 UTC (rev 4305)
@@ -15,7 +15,7 @@
<td class="label">${_('Responsibility')}</td>
<td>
<select name="editor" id="editor">
- <option value="-1">Alle Benutzer</option>
+ <option value="-1">${_('All users')}</option>
% for user in c.userlist:
<option value="${user.id}">${user.last_name}, ${user.first_name}</option>
% endfor
@@ -38,19 +38,19 @@
<td>
<input type="checkbox" name="own" id="show_own" value="1" checked="checked">
<label for="show_own">
- <img title="Eigene Fallakten"
- alt="Bearbeiter/in"
+ <img title="${_('Own cases')}"
+ alt="${_('Editor')}"
src="${h.url_for('/images/icons/edit_editor.png')}"
width="22"
- height="22">Eigene (${c.count_own})
+ height="22">${_('Own')} (${c.count_own})
</label><br>
<input type="checkbox" name="standin" id="show_other" value="1" checked="checked">
<label for="show_other">
- <img title="Vertreter Fallakten"
+ <img title="${_('Standin cases')}"
alt="Vertreter"
src="${h.url_for('/images/icons/edit_editors_22.png')}"
width="22"
- height="22">Vertretung (${c.count_standin})
+ height="22">${_('Standin')} (${c.count_standin})
</label>
</td>
<td></td>
@@ -66,19 +66,19 @@
<td>
<input type="checkbox" name="state" id="show_open" value="1">
<label for="show_open">
- <img title="Bearbeitbare Fallakten" alt="Bearbeitbare" src="${h.url_for('/images/icons/edit_22.png')}" height="22" width="22">Bearbeitbare Fallakten</label><br>
+ <img title="${_('Editable cases')}" alt="${_('Editable')}" src="${h.url_for('/images/icons/edit_22.png')}" height="22" width="22">${_('Editable cases')}</label><br>
<input type="checkbox" name="state" id="show_markdelete" value="3" checked="checked">
<label for="show_markdelete">
- <img title="Zu löschende Fallakten" alt="Schwebend Gelöscht" src="${h.url_for('/images/icons/delete_inactive_22.png')}" height="22" width="22">Schwebend gelöscht (${c.count_del})
+ <img title="${_('Almost deleted')}" alt="${_('Almost deleted')}" src="${h.url_for('/images/icons/delete_inactive_22.png')}" height="22" width="22">${_('Almost deleted')} (${c.count_del})
</label><br>
% if g.mpuls_config.is_enabled('case-module', 'anonymize'):
<input type="checkbox" name="state" id="show_markanonymize" value="4" checked="checked">
<label for="show_markanonymize">
- <img title="Schwebend anonymisierte Fallakten" alt="Schwebend anonymisiert" src="${h.url_for('/images/icons/anonymise_inactive_22.png')}" height="22" width="22">Schwebend anonymisiert (${c.count_markanon})
+ <img title="${_('Almost anonymized')}" alt="${_('Almost anonymized')}" src="${h.url_for('/images/icons/anonymise_inactive_22.png')}" height="22" width="22">${_('Almost anonymized')} (${c.count_markanon})
</label><br>
<input type="checkbox" name="state" id="show_anonymized" value="5" checked="checked">
<label for="show_anonymized">
- <img title="Anonymisierte Fallakten" alt="Anonymisiert" src="${h.url_for('/images/icons/anonymise_inactive_22.png')}" height="22" width="22">Anonymisiert (${c.count_anon})
+ <img title="${_('Anonymized')}" alt="${_('Anonymized')}" src="${h.url_for('/images/icons/anonymise_inactive_22.png')}" height="22" width="22">${_('Anonymized')} (${c.count_anon})
</label>
% endif
</td>
@@ -146,14 +146,14 @@
<input type="submit" value="${_('cm_form_overview_search_submit')}">
% if c.extended_search:
<a href="${h.url_for(controller='case_overview',
- action='overview_extended')}">Erweiterte Suche ausblenden</a>
+ action='overview_extended')}">${_('Hide extended search')}</a>
% else:
<a href="${h.url_for(controller='case_overview',
- action='overview_extended')}">Erweiterte Suche einblenden</a>
+ action='overview_extended')}">${_('Show extended search')}</a>
% endif
${h.getHelp('extended_search')}
<a href="${h.url_for(controller='case_overview', action='overview',
- reset=1)}">Suche zurücksetzen</a>
+ reset=1)}">${_('Reset search')}</a>
</td>
</tr>
</table>
More information about the Mpuls-commits
mailing list