[Mpuls-commits] r26 - in trunk: . waskaweb/controllers waskaweb/i18n waskaweb/i18n/de/LC_MESSAGES waskaweb/templates/dialogs
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Aug 13 15:07:07 CEST 2008
Author: thomas
Date: 2008-08-13 15:07:06 +0200 (Wed, 13 Aug 2008)
New Revision: 26
Modified:
trunk/ChangeLog.txt
trunk/waskaweb/controllers/administration.py
trunk/waskaweb/controllers/document.py
trunk/waskaweb/controllers/usersettings.py
trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
trunk/waskaweb/i18n/waskaweb.pot
trunk/waskaweb/templates/dialogs/alert.mako
trunk/waskaweb/templates/dialogs/confirm.mako
trunk/waskaweb/templates/dialogs/failed.mako
trunk/waskaweb/templates/dialogs/notification.mako
trunk/waskaweb/templates/dialogs/success.mako
Log:
Load 6240b50abd3d into trunk.
Modified: trunk/ChangeLog.txt
===================================================================
--- trunk/ChangeLog.txt 2008-08-13 13:06:45 UTC (rev 25)
+++ trunk/ChangeLog.txt 2008-08-13 13:07:06 UTC (rev 26)
@@ -1,3 +1,21 @@
+2008-01-25 Benjamin Kirschner <benni.kirschner at intevation.de>
+ * waskaweb/controllers/administration.py
+ waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
+ waskaweb/i18n/waskaweb.pot:
+ Fixed Dialog "Delete User and give his cases to another cm"
+ Added msg strings to the controller and the po file.
+
+ * waskaweb/controllers/document.py
+ waskaweb/controllers/usersettings.py:
+ Damaged msg strings (used wrong encoding) fixed
+
+ * waskaweb/templates/dialogs/alert.mako
+ waskaweb/templates/dialogs/confirm.mako
+ waskaweb/templates/dialogs/failed.mako
+ waskaweb/templates/dialogs/notification.mako
+ waskaweb/templates/dialogs/success.mako:
+ Added escaping (F.NA, h) to the dialogs.
+
2008-01-24 Torsten Irlaender <torsten.irlaender at intevation.de>
* waskaweb/controllers/statement.py, waskaweb/model/case.py: Cases are
Modified: trunk/waskaweb/controllers/administration.py
===================================================================
--- trunk/waskaweb/controllers/administration.py 2008-08-13 13:06:45 UTC (rev 25)
+++ trunk/waskaweb/controllers/administration.py 2008-08-13 13:07:06 UTC (rev 26)
@@ -35,8 +35,8 @@
DELETE_USER_CONFIRM_QUESTION = _('adm_delete_user_confirm_text')
DIALOG_CONFIRM_SETEDITOR = _('adm_set_editor_header')
-SETEDITOR_NOTIFICATION_SUCCSESS = _('adm_set_editor_success_text')
-SETEDITOR_NOTIFICATION_SUCCSESS_REST = _('adm_set_editor_success_text_rest')
+SETEDITOR_NOTIFICATION_SUCCESS = _('adm_set_editor_success_text')
+SETEDITOR_NOTIFICATION_SUCCESS_REST = _('adm_set_editor_success_text_rest')
class AdministrationController(BaseController):
@@ -198,14 +198,14 @@
case_bundle = CaseBundle(form_result.get('case_id', []))
new_editor = UserObject(form_result.get('editor'))
del_user = UserObject(form_result.get('user_id'))
- all_cases.search('bearbeiter:%s' % del_user.id)
+ all_cases.search('editor:%s;state:1;state:2;state:3;state:4;state:5' % del_user.id)
num = case_bundle.setEditor(form_result.get('editor'))
rest = all_cases.numDatasets() - case_bundle.numDatasets()
- c.url_ok = "/administration/deleteUser/%s/1" % form_result.get('user_id')
+ c.url_ok = "/administration/deleteUser/%s/1" % form_result.get('user_id')
if rest > 0:
- c.notification_text = SETEDITOR_NOTIFICATION_SUCCSESS_REST % (str(num), new_editor.first_name, new_editor.last_name, del_user.first_name, del_user.last_name, str(rest))
+ c.notification_text = SETEDITOR_NOTIFICATION_SUCCESS_REST % (new_editor.first_name, new_editor.last_name, del_user.first_name, del_user.last_name)
else:
- c.notification_text = SETEDITOR_NOTIFICATION_SUCCSESS % (str(num), new_editor.first_name, new_editor.last_name, del_user.first_name, del_user.last_name)
+ c.notification_text = SETEDITOR_NOTIFICATION_SUCCESS % (new_editor.first_name, new_editor.last_name, del_user.first_name, del_user.last_name)
return render('/administration/dialogs/notificate_delete_user_helper.mako')
except formencode.Invalid, error:
return self.deleteUser(form_result.get('user_id'), '1')
Modified: trunk/waskaweb/controllers/document.py
===================================================================
--- trunk/waskaweb/controllers/document.py 2008-08-13 13:06:45 UTC (rev 25)
+++ trunk/waskaweb/controllers/document.py 2008-08-13 13:07:06 UTC (rev 26)
@@ -28,7 +28,7 @@
SET_DOCUMENT_FAILED_HEADER = u"""Kein Dokument hinzugefügt!"""
SET_DOCUMENT_FAILED_TEXT = u"""Klicken Sie auf OK um fortzufahren"""
SET_ATTACHMENT_SUCCESS_HEADER = u"""Anlage hinzugefügt!"""
-SET_ATTACHMENT_SUCCESS_TEXT = u"""Klicken Sie auf OK um fortzufahre."""
+SET_ATTACHMENT_SUCCESS_TEXT = u"""Klicken Sie auf OK um fortzufahren."""
SET_ATTACHMENT_FAILED_HEADER = u"""Keine Anlage hinzugefügt!"""
SET_ATTACHMENT_FAILED_TEXT = u"""Klicken Sie auf "OK" um fortzufahren."""
Modified: trunk/waskaweb/controllers/usersettings.py
===================================================================
--- trunk/waskaweb/controllers/usersettings.py 2008-08-13 13:06:45 UTC (rev 25)
+++ trunk/waskaweb/controllers/usersettings.py 2008-08-13 13:07:06 UTC (rev 26)
@@ -16,8 +16,8 @@
log = logging.getLogger(__name__)
-SET_PASSWORD_NOTIFICATION_HEADER = u"""Ändern des Benutzerpasswort"""
-SET_PASSWORD_NOTIFICATION_TEXT = u"""Ihr Passwort wurde erfolgreich geändert. Bitte klicken Sie auf "OK", um zu den Benutzereinstellungen zu gelangen."""
+SET_PASSWORD_NOTIFICATION_HEADER = u"""Änderung des Benutzerpasswortes"""
+SET_PASSWORD_NOTIFICATION_TEXT = u"""Ihr Passwort wurde erfolgreich geändert. Bitte klicken Sie auf "OK", um zu den Benutzereinstellungen zu gelangen."""
class UsersettingsController(BaseController):
Modified: trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-08-13 13:06:45 UTC (rev 25)
+++ trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po 2008-08-13 13:07:06 UTC (rev 26)
@@ -63,12 +63,12 @@
#: waskaweb/controllers/administration.py:38
msgid "adm_set_editor_success_text"
-msgstr "Fallakte(n) wurden an ?bertragen. Klicken Sie OK um zu löschen."
+msgstr "Fallakte(n) wurden an %s, %s übertragen. Klicken Sie OK um %s, %s zu löschen."
#: waskaweb/controllers/administration.py:39
msgid "adm_set_editor_success_text_rest"
msgstr ""
-"Fallakten wurden an übertragen. verfügt weiterhin über Fallakten. Klicken Si "
+"Fallakten wurden an %s, %s übertragen. %s, %s verfügt weiterhin über Fallakten. Klicken Sie "
"auf OK, um fortzufahren."
#: waskaweb/lib/renderer.py:208
Modified: trunk/waskaweb/i18n/waskaweb.pot
===================================================================
--- trunk/waskaweb/i18n/waskaweb.pot 2008-08-13 13:06:45 UTC (rev 25)
+++ trunk/waskaweb/i18n/waskaweb.pot 2008-08-13 13:07:06 UTC (rev 26)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: waskaweb 0.0.0\n"
"Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2008-01-25 10:39+0100\n"
+"POT-Creation-Date: 2008-01-25 12:48+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"
Modified: trunk/waskaweb/templates/dialogs/alert.mako
===================================================================
--- trunk/waskaweb/templates/dialogs/alert.mako 2008-08-13 13:06:45 UTC (rev 25)
+++ trunk/waskaweb/templates/dialogs/alert.mako 2008-08-13 13:07:06 UTC (rev 26)
@@ -1,7 +1,8 @@
+<%! import waskaweb.lib.filters as F %>
<div class="dialog">
<h1><img src="/images/alert.png" alt="achtung"/>${_('dialog_header_alert')}</h1>
-<h2>${c.alert_for}</h2>
-<p>${c.question}</p>
+<h2>${c.alert_for | F.NA, h}</h2>
+<p>${c.question | F.NA, h}</p>
<a class="button" href="${c.url_ok}">${_('dialog_header_confirm_option_ok')}</a>
<a class="button" href="${c.url_cancel}">${_('dialog_header_confirm_option_cancel')}</a>
</div>
Modified: trunk/waskaweb/templates/dialogs/confirm.mako
===================================================================
--- trunk/waskaweb/templates/dialogs/confirm.mako 2008-08-13 13:06:45 UTC (rev 25)
+++ trunk/waskaweb/templates/dialogs/confirm.mako 2008-08-13 13:07:06 UTC (rev 26)
@@ -1,7 +1,8 @@
## -*- coding: utf-8 -*-
+<%! import waskaweb.lib.filters as F %>
<div class="dialog" />
-<h1><img src="/images/question.png" alt="achtung"/>${c.confirm_for}</h1>
-<p>${c.question}</p>
+<h1><img src="/images/question.png" alt="achtung"/>${c.confirm_for | F.NA, h}</h1>
+<p>${c.question | F.NA, h}</p>
<a class="button" href="${c.url_yes}">${_('dialog_header_confirm_option_yes')}</a>
<a class="button" href="${c.url_no}">${_('dialog_header_confirm_option_no')}</a>
</div>
Modified: trunk/waskaweb/templates/dialogs/failed.mako
===================================================================
--- trunk/waskaweb/templates/dialogs/failed.mako 2008-08-13 13:06:45 UTC (rev 25)
+++ trunk/waskaweb/templates/dialogs/failed.mako 2008-08-13 13:07:06 UTC (rev 26)
@@ -1,6 +1,7 @@
## -*- coding: utf-8 -*-
+<%! import waskaweb.lib.filters as F %>
<div class="dialog" />
-<h1><img src="/images/failure.png" alt="Erledigt"/>${c.failed_for}</h1>
-<p>${c.failed_text}</p>
+<h1><img src="/images/failure.png" alt="Erledigt"/>${c.failed_for | F.NA, h}</h1>
+<p>${c.failed_text | F.NA, h}</p>
<a class="button" href="${c.url_ok}">${_('dialog_header_confirm_option_ok')}</a>
</div>
Modified: trunk/waskaweb/templates/dialogs/notification.mako
===================================================================
--- trunk/waskaweb/templates/dialogs/notification.mako 2008-08-13 13:06:45 UTC (rev 25)
+++ trunk/waskaweb/templates/dialogs/notification.mako 2008-08-13 13:07:06 UTC (rev 26)
@@ -1,6 +1,7 @@
## -*- coding: utf-8 -*-
+<%! import waskaweb.lib.filters as F %>
<div class="dialog" />
-<h1><img src="/images/alert.png" alt="Achtung"/>${c.notification_for}</h1>
-<p>${c.notification_text}</p>
+<h1><img src="/images/alert.png" alt="Achtung"/>${c.notification_for | F.NA, h}</h1>
+<p>${c.notification_text | F.NA, h}</p>
<a class="button" href="${c.url_ok}">${_('dialog_header_notification_option_ok')}</a>
</div>
Modified: trunk/waskaweb/templates/dialogs/success.mako
===================================================================
--- trunk/waskaweb/templates/dialogs/success.mako 2008-08-13 13:06:45 UTC (rev 25)
+++ trunk/waskaweb/templates/dialogs/success.mako 2008-08-13 13:07:06 UTC (rev 26)
@@ -1,6 +1,7 @@
## -*- coding: utf-8 -*-
+<%! import waskaweb.lib.filters as F %>
<div class="dialog" />
-<h1><img src="/images/confirmation.png" alt="Erledigt"/>${c.success_for}</h1>
-<p>${c.success_text}</p>
+<h1><img src="/images/confirmation.png" alt="Erledigt"/>${c.success_for | F.NA, h}</h1>
+<p>${c.success_text | F.NA, h}</p>
<a class="button" href="${c.url_ok}">${_('dialog_header_confirm_option_ok')}</a>
</div>
More information about the Mpuls-commits
mailing list