[Mpuls-commits] r5054 - in base/trunk: . mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/templates/casemanagement
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Jun 1 13:50:42 CEST 2011
Author: ludwig
Date: 2011-06-01 13:50:37 +0200 (Wed, 01 Jun 2011)
New Revision: 5054
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako
Log:
Issue882: Changed button text, so that the text fits the action.
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2011-06-01 10:49:20 UTC (rev 5053)
+++ base/trunk/ChangeLog 2011-06-01 11:50:37 UTC (rev 5054)
@@ -1,3 +1,10 @@
+2011-06-01 Ludwig Reiter <ludwig.reiter at intevation.de>
+
+ * mpulsweb/i18n/mpulsweb.pot,
+ mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po,
+ mpulsweb/templates/casemanagement/showAppointment.mako:
+ Issue882: Changed button text, so that the text fits the action.
+
2011-06-01 Roland Geider <roland.geider at intevation.de>
* mpulsweb/templates/casemanagement/upload.mako: don't escape the text
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-06-01 10:49:20 UTC (rev 5053)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-06-01 11:50:37 UTC (rev 5054)
@@ -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: 2011-05-30 14:59+0200\n"
+"PO-Revision-Date: 2011-06-01 13:44+0200\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"
@@ -1153,7 +1153,7 @@
msgid "< 1 week"
msgstr "< 1 Woche"
-#: mpulsweb/model/appointment.py:576
+#: mpulsweb/model/appointment.py:590
#, python-format
msgid ""
"Attention! The maximum save duration of %s days is exceeded for %s days "
@@ -1162,7 +1162,7 @@
"Achtung! Die maximale Speicherdauer von %s Tagen ist seit %s Tagen für "
"diese Fallakte überschritten!"
-#: mpulsweb/model/appointment.py:580
+#: mpulsweb/model/appointment.py:594
msgid "Inactive case document? Please check, if the case will still be edited."
msgstr "Inaktive Fallakte? Bitte prüfen Sie, ob der Fall noch bearbeitet wird."
@@ -1619,7 +1619,6 @@
#: mpulsweb/templates/appointments/new.mako:23
#: mpulsweb/templates/appointments/show.mako:20
#: mpulsweb/templates/casemanagement/newAppointment.mako:24
-#: mpulsweb/templates/casemanagement/showAppointment.mako:23
msgid "Back to: User overview"
msgstr "Zurück zu: Benutzeransicht"
@@ -1843,10 +1842,10 @@
#: mpulsweb/templates/home/caseappointmentlist.mako:15
#: mpulsweb/templates/home/globalappointmentlist.mako:5
#: mpulsweb/templates/home/globalappointmentlist.mako:6
-#: mpulsweb/templates/home/remindlist.mako:8
#: mpulsweb/templates/home/remindlist.mako:9
-#: mpulsweb/templates/home/remindlist.mako:15
-#: mpulsweb/templates/home/remindlist.mako:16
+#: mpulsweb/templates/home/remindlist.mako:10
+#: mpulsweb/templates/home/remindlist.mako:18
+#: mpulsweb/templates/home/remindlist.mako:19
msgid "Show"
msgstr "Anzeigen"
@@ -2748,6 +2747,10 @@
msgid "Show extended search"
msgstr "Erweiterte Suche einblenden"
+#: mpulsweb/templates/casemanagement/showAppointment.mako:23
+msgid "Back to: Event overview"
+msgstr "Zurück zu: Terminübersicht"
+
#: mpulsweb/templates/casemanagement/upload.mako:6
#: mpulsweb/templates/casemanagement/dialogs/failed_xml_import.mako:5
#: mpulsweb/templates/casemanagement/dialogs/success_xml_import.mako:5
@@ -3145,10 +3148,8 @@
msgid "Agency-wide appointments"
msgstr "Einrichtungsweite Termine"
-#: mpulsweb/templates/home/remindlist.mako:28
-#: mpulsweb/templates/home/remindlist.mako:29
-#: mpulsweb/templates/home/remindlist.mako:35
-#: mpulsweb/templates/home/remindlist.mako:36
+#: mpulsweb/templates/home/remindlist.mako:31
+#: mpulsweb/templates/home/remindlist.mako:32
msgid "Keep longer activated"
msgstr "Aufbewahrung verlängern"
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-06-01 10:49:20 UTC (rev 5053)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-06-01 11:50:37 UTC (rev 5054)
@@ -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: 2011-05-27 13:54+0200\n"
+"POT-Creation-Date: 2011-06-01 13:44+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"
@@ -957,14 +957,14 @@
msgid "< 1 week"
msgstr ""
-#: mpulsweb/model/appointment.py:576
+#: mpulsweb/model/appointment.py:590
#, python-format
msgid ""
"Attention! The maximum save duration of %s days is exceeded for %s days for "
"this case document!"
msgstr ""
-#: mpulsweb/model/appointment.py:580
+#: mpulsweb/model/appointment.py:594
msgid "Inactive case document? Please check, if the case will still be edited."
msgstr ""
@@ -1394,7 +1394,6 @@
#: mpulsweb/templates/appointments/new.mako:23
#: mpulsweb/templates/appointments/show.mako:20
#: mpulsweb/templates/casemanagement/newAppointment.mako:24
-#: mpulsweb/templates/casemanagement/showAppointment.mako:23
msgid "Back to: User overview"
msgstr ""
@@ -1618,10 +1617,10 @@
#: mpulsweb/templates/home/caseappointmentlist.mako:15
#: mpulsweb/templates/home/globalappointmentlist.mako:5
#: mpulsweb/templates/home/globalappointmentlist.mako:6
-#: mpulsweb/templates/home/remindlist.mako:8
#: mpulsweb/templates/home/remindlist.mako:9
-#: mpulsweb/templates/home/remindlist.mako:15
-#: mpulsweb/templates/home/remindlist.mako:16
+#: mpulsweb/templates/home/remindlist.mako:10
+#: mpulsweb/templates/home/remindlist.mako:18
+#: mpulsweb/templates/home/remindlist.mako:19
msgid "Show"
msgstr ""
@@ -2499,6 +2498,10 @@
msgid "Show extended search"
msgstr ""
+#: mpulsweb/templates/casemanagement/showAppointment.mako:23
+msgid "Back to: Event overview"
+msgstr ""
+
#: mpulsweb/templates/casemanagement/upload.mako:6
#: mpulsweb/templates/casemanagement/dialogs/failed_xml_import.mako:5
#: mpulsweb/templates/casemanagement/dialogs/success_xml_import.mako:5
@@ -2876,10 +2879,8 @@
msgid "Agency-wide appointments"
msgstr ""
-#: mpulsweb/templates/home/remindlist.mako:28
-#: mpulsweb/templates/home/remindlist.mako:29
-#: mpulsweb/templates/home/remindlist.mako:35
-#: mpulsweb/templates/home/remindlist.mako:36
+#: mpulsweb/templates/home/remindlist.mako:31
+#: mpulsweb/templates/home/remindlist.mako:32
msgid "Keep longer activated"
msgstr ""
Modified: base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako 2011-06-01 10:49:20 UTC (rev 5053)
+++ base/trunk/mpulsweb/templates/casemanagement/showAppointment.mako 2011-06-01 11:50:37 UTC (rev 5054)
@@ -20,7 +20,7 @@
</li>
% endif
<li>
- <a href="${h.url_for(controller='/caseappointment', action='index', id=c.appointment.case_id)}">${_('Back to: User overview')}</a>
+ <a href="${h.url_for(controller='/caseappointment', action='index', id=c.appointment.case_id)}">${_('Back to: Event overview')}</a>
</li>
</ul>
</div>
More information about the Mpuls-commits
mailing list