[Mpuls-commits] r2470 - in wasko/branches/2.0: . mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/public/images/logos mpulsweb/templates/casemanagement

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Thu Apr 22 10:45:27 CEST 2010 

Author: roland
Date: 2010-04-22 10:45:25 +0200 (Thu, 22 Apr 2010)
New Revision: 2470

Added:
   wasko/branches/2.0/mpulsweb/public/images/logos/valid-html401.png
Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
   wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot
   wasko/branches/2.0/mpulsweb/templates/casemanagement/caselist.mako
Log:
Wald issue #1423: inconsistent tooltips in admin area

Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-04-22 07:58:09 UTC (rev 2469)
+++ wasko/branches/2.0/ChangeLog	2010-04-22 08:45:25 UTC (rev 2470)
@@ -12,7 +12,14 @@
 	* mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po:
 	* mpulsweb/controllers/privacy.py: Wald issue #1431: typo in language
         variable removed
+	* mpulsweb/i18n/mpulsweb.pot:
+	* mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po:
+	* mpulsweb/templates/casemanagement/caselist.mako: Wald issue #1423: inconsistent
+        tooltips in admin area
+	* mpulsweb/public/images/logos/valid-html401.png: added valid HTML icon from the
+        W3 consortium
 
+
 2010-04-21  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* mpulsweb/templates/base.mako: Removed "TEST"-String from title

Modified: wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po	2010-04-22 07:58:09 UTC (rev 2469)
+++ wasko/branches/2.0/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po	2010-04-22 08:45:25 UTC (rev 2470)
@@ -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-04-22 09:54+0200\n"
+"PO-Revision-Date: 2010-04-22 10:35+0200\n"
 "Last-Translator: Roland Geider <roland.geider at intevation.de>\n"
 "Language-Team: de <LL at li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
@@ -243,7 +243,7 @@
 msgid "Set declaration of consent?"
 msgstr "Einverständniserklärung setzen?"
 
-#: mpulsweb/controllers/privacy.py:23
+#: mpulsweb/controllers/privacy.py:21
 msgid ""
 "You have stated that there is a declaration of consent from\n"
 "the young adult to the acquisition, handling and storage of personal "
@@ -875,8 +875,6 @@
 #: mpulsweb/templates/appointments/appointmentlist.mako:5
 #: mpulsweb/templates/casemanagement/appointmentlist.mako:13
 #: mpulsweb/templates/casemanagement/appointmentlist.mako:14
-#: mpulsweb/templates/casemanagement/caselist.mako:132
-#: mpulsweb/templates/casemanagement/caselist.mako:133
 #: mpulsweb/templates/casemanagement/caselist.mako:154
 #: mpulsweb/templates/casemanagement/caselist.mako:155
 #: mpulsweb/templates/casemanagement/reminderlist.mako:7
@@ -1479,8 +1477,8 @@
 
 #: mpulsweb/templates/casemanagement/caselist.mako:108
 #: mpulsweb/templates/casemanagement/caselist.mako:109
-msgid "case_state_label_delete"
-msgstr "Gelöscht"
+msgid "case_state_label_markdelete"
+msgstr "Schwebend gelöscht"
 
 #: mpulsweb/templates/casemanagement/caselist.mako:112
 #: mpulsweb/templates/casemanagement/caselist.mako:113
@@ -1492,6 +1490,11 @@
 msgid "case_state_label_anonym"
 msgstr "Anonymisiert"
 
+#: mpulsweb/templates/casemanagement/caselist.mako:132
+#: mpulsweb/templates/casemanagement/caselist.mako:133
+msgid "Delete case"
+msgstr "Fallakte löschen"
+
 #: mpulsweb/templates/casemanagement/caselist.mako:138
 #: mpulsweb/templates/casemanagement/caselist.mako:139
 #: mpulsweb/templates/casemanagement/caselist.mako:150

Modified: wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot	2010-04-22 07:58:09 UTC (rev 2469)
+++ wasko/branches/2.0/mpulsweb/i18n/mpulsweb.pot	2010-04-22 08:45:25 UTC (rev 2470)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: mpulsweb 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
-"POT-Creation-Date: 2010-04-22 09:54+0200\n"
+"POT-Creation-Date: 2010-04-22 10:34+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"
@@ -197,7 +197,7 @@
 msgid "Set declaration of consent?"
 msgstr ""
 
-#: mpulsweb/controllers/privacy.py:23
+#: mpulsweb/controllers/privacy.py:21
 msgid ""
 "You have stated that there is a declaration of consent from\n"
 "the young adult to the acquisition, handling and storage of personal data.\n"
@@ -816,8 +816,6 @@
 #: mpulsweb/templates/appointments/appointmentlist.mako:5
 #: mpulsweb/templates/casemanagement/appointmentlist.mako:13
 #: mpulsweb/templates/casemanagement/appointmentlist.mako:14
-#: mpulsweb/templates/casemanagement/caselist.mako:132
-#: mpulsweb/templates/casemanagement/caselist.mako:133
 #: mpulsweb/templates/casemanagement/caselist.mako:154
 #: mpulsweb/templates/casemanagement/caselist.mako:155
 #: mpulsweb/templates/casemanagement/reminderlist.mako:7
@@ -1415,7 +1413,7 @@
 
 #: mpulsweb/templates/casemanagement/caselist.mako:108
 #: mpulsweb/templates/casemanagement/caselist.mako:109
-msgid "case_state_label_delete"
+msgid "case_state_label_markdelete"
 msgstr ""
 
 #: mpulsweb/templates/casemanagement/caselist.mako:112
@@ -1428,6 +1426,11 @@
 msgid "case_state_label_anonym"
 msgstr ""
 
+#: mpulsweb/templates/casemanagement/caselist.mako:132
+#: mpulsweb/templates/casemanagement/caselist.mako:133
+msgid "Delete case"
+msgstr ""
+
 #: mpulsweb/templates/casemanagement/caselist.mako:138
 #: mpulsweb/templates/casemanagement/caselist.mako:139
 #: mpulsweb/templates/casemanagement/caselist.mako:150

Added: wasko/branches/2.0/mpulsweb/public/images/logos/valid-html401.png
===================================================================
(Binary files differ)


Property changes on: wasko/branches/2.0/mpulsweb/public/images/logos/valid-html401.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: wasko/branches/2.0/mpulsweb/templates/casemanagement/caselist.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/casemanagement/caselist.mako	2010-04-22 07:58:09 UTC (rev 2469)
+++ wasko/branches/2.0/mpulsweb/templates/casemanagement/caselist.mako	2010-04-22 08:45:25 UTC (rev 2470)
@@ -105,8 +105,8 @@
          title="${_('case_state_label_open')}">
   % elif case.getState().getState() == 3:
     <img src="/images/icons/delete_inactive_22.png" border="0"
-         alt="${_('case_state_label_delete')}" 
-         title="${_('case_state_label_delete')}">
+         alt="${_('case_state_label_markdelete')}" 
+         title="${_('case_state_label_markdelete')}">
   % elif case.getState().getState() == 4:
     <img src="/images/icons/anonymise_inactive_22.png" border="0"
          alt="${_('case_state_label_markanonym')}" 
@@ -129,8 +129,8 @@
     % if case.getState().getState() in (3, 5):
       <a href="/case/delete/${case.id}/0/">
         <img src="/images/icons/delete_active_22.png" border="0"
-             alt="${_('cm_overview_a_delete')}" 
-             title="${_('cm_overview_a_delete')}"></a>
+             alt="${_('Delete case')}" 
+             title="${_('Delete case')}"></a>
     % endif
     % if case.getState().getState() == 4:
       <a href="/case/anonymize/${case.id}/0/">

More information about the Mpuls-commits mailing list