[Mpuls-commits] r5056 - in base/trunk: . mpulsweb/controllers mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Jun 1 15:37:26 CEST 2011
Author: ludwig
Date: 2011-06-01 15:37:24 +0200 (Wed, 01 Jun 2011)
New Revision: 5056
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/controllers/caseappointment.py
base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
base/trunk/mpulsweb/i18n/mpulsweb.pot
Log:
Issue1005: Removed some imports of messages and moves these messages inline.
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2011-06-01 12:48:59 UTC (rev 5055)
+++ base/trunk/ChangeLog 2011-06-01 13:37:24 UTC (rev 5056)
@@ -2,6 +2,18 @@
* mpulsweb/i18n/mpulsweb.pot,
mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po,
+ mpulsweb/controllers/caseappointment.py:
+ Issue1005: Removed import of DELETE_APPOINT_NOTIFICATION_SUCCESS,
+ DELETE_APPOINT_NOTIFICATION_TEXT_SUCCESS, DELETE_APPOINT_CONFIRM,
+ DELETE_APPOINT_CONFIRM_TEXT, CREATE_APPOINT_NOTIFICATION_SUCCESS,
+ CREATE_APPOINT_NOTIFICATION_TEXT_SUCCESS,EDIT_APPOINT_NOTIFICATION_SUCCESS,
+ EDIT_APPOINT_NOTIFICATION_TEXT_SUCCESS.
+ These messages are now inline.
+
+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.
Modified: base/trunk/mpulsweb/controllers/caseappointment.py
===================================================================
--- base/trunk/mpulsweb/controllers/caseappointment.py 2011-06-01 12:48:59 UTC (rev 5055)
+++ base/trunk/mpulsweb/controllers/caseappointment.py 2011-06-01 13:37:24 UTC (rev 5056)
@@ -7,6 +7,8 @@
from pylons import request, tmpl_context as c
+from mpulsweb.lib.translation import _, ungettext
+
from mpulsweb.lib.base import BaseController, render
from mpulsweb.lib.security import checkRole
from mpulsweb.lib.helpers import url_for, dd_mm_YYYY, HH_MM
@@ -14,17 +16,7 @@
from mpulsweb.lib.validators import CreateAppointmentForm
from mpulsweb.model.appointment import CaseAppointmentOverview, \
CaseAppointmentFactory, CaseReminderOverview
-from mpulsweb.controllers.appointment import \
- DELETE_APPOINT_NOTIFICATION_SUCCESS, \
- DELETE_APPOINT_NOTIFICATION_TEXT_SUCCESS, \
- DELETE_APPOINT_CONFIRM, \
- DELETE_APPOINT_CONFIRM_TEXT, \
- CREATE_APPOINT_NOTIFICATION_SUCCESS, \
- CREATE_APPOINT_NOTIFICATION_TEXT_SUCCESS, \
- EDIT_APPOINT_NOTIFICATION_SUCCESS, \
- EDIT_APPOINT_NOTIFICATION_TEXT_SUCCESS
-
log = logging.getLogger(__name__)
@@ -83,8 +75,10 @@
appointment = factory.createNew(form_result.get('case_id'))
appointment.setData(form_result)
appointment.store()
- c.success_for = CREATE_APPOINT_NOTIFICATION_SUCCESS
- c.success_text = CREATE_APPOINT_NOTIFICATION_TEXT_SUCCESS
+ c.success_for = _(u"Appointment created")
+ c.success_text = _(u"The appointment was successfully created.") \
+ + " " \
+ + _("Please click OK to continue to the appointment overview")
c.url_ok = url_for(controller='/caseappointment',
action='index', id=appointment.case_id)
return render('/casemanagement/dialogs/'
@@ -154,8 +148,10 @@
appointment = factory.loadById(form_result.get('id'))
appointment.setData(form_result)
appointment.store()
- c.success_for = EDIT_APPOINT_NOTIFICATION_SUCCESS
- c.success_text = EDIT_APPOINT_NOTIFICATION_TEXT_SUCCESS
+ c.success_for = _(u"Appointment edited")
+ c.success_text = _(u"The appointment was successfully edited") \
+ + " " \
+ + _("Please click OK to continue to the appointment overview")
c.url_ok = url_for(controller='/caseappointment',
action='index',
id=appointment.case_id)
@@ -180,16 +176,19 @@
appointment = factory.loadById(id)
if confirmed == 1:
appointment.delete()
- c.success_for = DELETE_APPOINT_NOTIFICATION_SUCCESS
- c.success_text = DELETE_APPOINT_NOTIFICATION_TEXT_SUCCESS
+ c.success_for = _(u'Appointment deleted')
+ c.success_text = _(u"The appointment was successfully deleted.") \
+ + " " \
+ + _("Please click OK to continue to the appointment overview")
c.url_ok = url_for(controller='/caseappointment', action='index',
id=appointment.case_id)
return render('/casemanagement/dialogs/'
'success_delete_appointment.mako')
else:
c.context = "../main.mako"
- c.confirm_for = DELETE_APPOINT_CONFIRM
- c.question = DELETE_APPOINT_CONFIRM_TEXT
+ c.confirm_for = _(u'Delete appointment?')
+ c.question = _(u"Do you really want to delete the appointment\n"
+ u"and irrevocably lose all the data?")
c.url_yes = url_for(controller='/caseappointment', action='delete',
id=id, confirmed=1)
c.url_no = url_for(controller='/caseappointment', action='index',
Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-06-01 12:48:59 UTC (rev 5055)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po 2011-06-01 13:37:24 UTC (rev 5056)
@@ -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-06-01 13:44+0200\n"
+"PO-Revision-Date: 2011-06-01 15:29+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"
@@ -227,10 +227,12 @@
msgstr "Auswertungsrelevantes Feld"
#: mpulsweb/controllers/appointment.py:48
+#: mpulsweb/controllers/caseappointment.py:189
msgid "Delete appointment?"
msgstr "Termin Löschen?"
#: mpulsweb/controllers/appointment.py:49
+#: mpulsweb/controllers/caseappointment.py:190
msgid ""
"Do you really want to delete the appointment\n"
"and irrevocably lose all the data?"
@@ -239,30 +241,39 @@
"verlieren?"
#: mpulsweb/controllers/appointment.py:52
+#: mpulsweb/controllers/caseappointment.py:81
+#: mpulsweb/controllers/caseappointment.py:154
+#: mpulsweb/controllers/caseappointment.py:182
msgid "Please click OK to continue to the appointment overview"
msgstr "Klicken Sie auf 'OK', um zur Terminübersicht zu gelangen."
#: mpulsweb/controllers/appointment.py:54
+#: mpulsweb/controllers/caseappointment.py:179
msgid "Appointment deleted"
msgstr "Termin gelöscht"
#: mpulsweb/controllers/appointment.py:55
+#: mpulsweb/controllers/caseappointment.py:180
msgid "The appointment was successfully deleted."
msgstr "Der Termin wurde erfolgreich gelöscht."
#: mpulsweb/controllers/appointment.py:57
+#: mpulsweb/controllers/caseappointment.py:78
msgid "Appointment created"
msgstr "Termin erstellt"
#: mpulsweb/controllers/appointment.py:58
+#: mpulsweb/controllers/caseappointment.py:79
msgid "The appointment was successfully created."
msgstr "Der Termin wurde erfolgreich erstellt."
#: mpulsweb/controllers/appointment.py:60
+#: mpulsweb/controllers/caseappointment.py:151
msgid "Appointment edited"
msgstr "Termin bearbeitet"
#: mpulsweb/controllers/appointment.py:61
+#: mpulsweb/controllers/caseappointment.py:152
msgid "The appointment was successfully edited"
msgstr "Der Termin wurde erfolgreich bearbeitet."
@@ -815,7 +826,7 @@
"Wollen Sie wirklich das Dokument löschen und die Daten unwiederbringlich "
"verlieren?"
-#: mpulsweb/controllers/evaluate.py:279
+#: mpulsweb/controllers/evaluate.py:280
msgid "Error: Evaluation failed"
msgstr "Fehler: Auswertung fehlgeschlagen"
Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-06-01 12:48:59 UTC (rev 5055)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot 2011-06-01 13:37:24 UTC (rev 5056)
@@ -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-06-01 13:44+0200\n"
+"POT-Creation-Date: 2011-06-01 15:29+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"
@@ -187,40 +187,51 @@
msgstr ""
#: mpulsweb/controllers/appointment.py:48
+#: mpulsweb/controllers/caseappointment.py:189
msgid "Delete appointment?"
msgstr ""
#: mpulsweb/controllers/appointment.py:49
+#: mpulsweb/controllers/caseappointment.py:190
msgid ""
"Do you really want to delete the appointment\n"
"and irrevocably lose all the data?"
msgstr ""
#: mpulsweb/controllers/appointment.py:52
+#: mpulsweb/controllers/caseappointment.py:81
+#: mpulsweb/controllers/caseappointment.py:154
+#: mpulsweb/controllers/caseappointment.py:182
msgid "Please click OK to continue to the appointment overview"
msgstr ""
#: mpulsweb/controllers/appointment.py:54
+#: mpulsweb/controllers/caseappointment.py:179
msgid "Appointment deleted"
msgstr ""
#: mpulsweb/controllers/appointment.py:55
+#: mpulsweb/controllers/caseappointment.py:180
msgid "The appointment was successfully deleted."
msgstr ""
#: mpulsweb/controllers/appointment.py:57
+#: mpulsweb/controllers/caseappointment.py:78
msgid "Appointment created"
msgstr ""
#: mpulsweb/controllers/appointment.py:58
+#: mpulsweb/controllers/caseappointment.py:79
msgid "The appointment was successfully created."
msgstr ""
#: mpulsweb/controllers/appointment.py:60
+#: mpulsweb/controllers/caseappointment.py:151
msgid "Appointment edited"
msgstr ""
#: mpulsweb/controllers/appointment.py:61
+#: mpulsweb/controllers/caseappointment.py:152
msgid "The appointment was successfully edited"
msgstr ""
@@ -671,7 +682,7 @@
msgid "Do you want to delete the document and irrevocably lose the data?"
msgstr ""
-#: mpulsweb/controllers/evaluate.py:279
+#: mpulsweb/controllers/evaluate.py:280
msgid "Error: Evaluation failed"
msgstr ""
More information about the Mpuls-commits
mailing list