[Mpuls-commits] r3100 - in base/trunk: . mpulsweb/i18n mpulsweb/i18n/de/LC_MESSAGES mpulsweb/lib

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Tue Jun 29 09:40:38 CEST 2010


Author: roland
Date: 2010-06-29 09:40:36 +0200 (Tue, 29 Jun 2010)
New Revision: 3100

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
   base/trunk/mpulsweb/i18n/mpulsweb.pot
   base/trunk/mpulsweb/lib/renderer.py
Log:
use ungettext to show correct translation in RG overview

Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-06-29 07:19:58 UTC (rev 3099)
+++ base/trunk/ChangeLog	2010-06-29 07:40:36 UTC (rev 3100)
@@ -1,3 +1,11 @@
+2010-06-22  Roland Geider <roland.geider at intevation.de>
+	
+	* impulsweb/i18n/mpulsweb.pot,
+	  mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po,
+	  mpulsweb/lib/renderer.py: use ungettext to show the correct plural
+	  form in RG overviews
+
+
 2010-06-28  Bernhard Herzog  <bh at intevation.de>
 
 	* mpulsweb/lib/security.py (getKAName): Refactor into several

Modified: base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po
===================================================================
--- base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po	2010-06-29 07:19:58 UTC (rev 3099)
+++ base/trunk/mpulsweb/i18n/de/LC_MESSAGES/mpulsweb.po	2010-06-29 07:40:36 UTC (rev 3100)
@@ -8,8 +8,8 @@
 "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-06-23 11:44+0100\n"
-"Last-Translator: Torsten Irländer <torsten.irlaender at intevation.de>\n"
+"PO-Revision-Date: 2010-06-29 09:37+0100\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"
 "MIME-Version: 1.0\n"
@@ -197,7 +197,7 @@
 msgid "The appointment was successfully edited"
 msgstr "Der Termin wurde erfolgreich bearbeitet."
 
-#: mpulsweb/controllers/case.py:29
+#: mpulsweb/controllers/case.py:28
 msgid ""
 "Do you really want to anonymise the case and\n"
 "irrecovably lose the associated personal data? After it the case will\n"
@@ -205,7 +205,7 @@
 "the analysis."
 msgstr "Wollen Sie wirklich die Fallakte anonymisieren und die personenbezogenen Daten unwiederbringlich verlieren? Die Fallakte steht danach nicht mehr zur Bearbeitung zur Verfügung. Die anonymisierte Fallakte wird weiterhin in der Auswertung berücksichtigt werden."
 
-#: mpulsweb/controllers/case.py:48
+#: mpulsweb/controllers/case.py:50
 #: mpulsweb/controllers/case_bundle.py:289
 #: mpulsweb/controllers/case_bundle.py:324
 msgid "Delete case?"
@@ -213,7 +213,7 @@
 msgstr[0] "Fallakte löschen?"
 msgstr[1] "Fallakten löschen?"
 
-#: mpulsweb/controllers/case.py:49
+#: mpulsweb/controllers/case.py:51
 msgid ""
 "Warning! On deleting the case all data will be erased\n"
 "irrecoverable!<br>Only delete the case if this case is <b>not needed for\n"
@@ -221,47 +221,47 @@
 "server?"
 msgstr "Achtung, beim Löschen der Fallakte gehen alle Daten unwiederbringlich verloren!<br>Löschen Sie die Akte nur, wenn diese tatsächlich <b>nicht</b> mehr für Auswertungszwecke hinzugezogen werden soll.<br><br>Die Akte jetzt vom Server löschen?"
 
-#: mpulsweb/controllers/case.py:53
+#: mpulsweb/controllers/case.py:55
 msgid ""
 "Do you really want to mark this case for deletion?\n"
 "The case will not be editable afterwards, and submited to the administration\n"
 "for deletion."
 msgstr "Wollen Sie wirklich die Fallakte zum Löschen freigeben? Die Fallakte steht Ihnen danach nicht mehr zur Bearbeitung zur Verfügung und wird der Administration zum Löschen vorgelegt."
 
-#: mpulsweb/controllers/case.py:56
+#: mpulsweb/controllers/case.py:62
 #: mpulsweb/controllers/case_bundle.py:441
 msgid "Restore case?"
 msgid_plural "Restore cases?"
 msgstr[0] "Fallakte wiederherstellen?"
 msgstr[1] "Fallakten wiederherstellen?"
 
-#: mpulsweb/controllers/case.py:57
+#: mpulsweb/controllers/case.py:63
 msgid ""
 "Do you really want to restore the case? The case\n"
 "will be editable afterwards again for the users."
 msgstr "Wollen Sie wirklich die Fallakte wiederherstellen? Die Fallakte ist danach wieder für die Nutzer bearbeitbar."
 
-#: mpulsweb/controllers/case.py:81
+#: mpulsweb/controllers/case.py:66
 msgid "Case copied!"
 msgstr "Fallakte kopiert"
 
-#: mpulsweb/controllers/case.py:82
+#: mpulsweb/controllers/case.py:67
 msgid "The case was succussfully copied and is now available in the case overview. Click on \"OK\" to open the case overview."
 msgstr "Die Fallakte wurde erfolgreich kopiert, und steht in der Fallaktenübersicht zur Verfügung. Klicken Sie auf \"OK\", um die Fallaktenübersicht zu öffnen."
 
-#: mpulsweb/controllers/case.py:83
+#: mpulsweb/controllers/case.py:68
 msgid "Copy case?"
 msgstr "Fallakte kopieren?"
 
-#: mpulsweb/controllers/case.py:84
+#: mpulsweb/controllers/case.py:69
 msgid "Do you really want to copy this case? All data will be copied in the new case."
 msgstr "Wollen Sie wirklich die Fallakten kopieren? Sämtliche Daten der Fallakte werden dann in einer neuen Fallakte übernommen."
 
-#: mpulsweb/controllers/case.py:486
+#: mpulsweb/controllers/case.py:471
 msgid "Case storage extended"
 msgstr "Aufbewahrung verlängert"
 
-#: mpulsweb/controllers/case.py:487
+#: mpulsweb/controllers/case.py:472
 msgid "Please click on \"OK\" to continue"
 msgstr "Die maximale Aufbewahrungsdauer wurde erfolgreich verlängert. Bitte klicken Sie auf \"OK\", um fortzufahren."
 
@@ -762,23 +762,26 @@
 msgid "delete"
 msgstr "löschen"
 
-#: mpulsweb/lib/renderer.py:982
-msgid "Items found"
-msgstr "Einträge gefunden"
+#: mpulsweb/lib/renderer.py:986
+#| msgid "Items found"
+msgid "Item found"
+msgid_plural "Items found"
+msgstr[0] "Eintrag gefunden"
+msgstr[1] "Einträge gefunden"
 
-#: mpulsweb/lib/renderer.py:990
+#: mpulsweb/lib/renderer.py:997
 msgid "Create new item"
 msgstr "Erstelle neuen Eintrag"
 
-#: mpulsweb/lib/renderer.py:1006
+#: mpulsweb/lib/renderer.py:1013
 msgid "Formular errors"
 msgstr "Fehlerhafte Formulareingabe"
 
-#: mpulsweb/lib/renderer.py:1008
+#: mpulsweb/lib/renderer.py:1015
 msgid "Formular warnings"
 msgstr "Formular Warnungen"
 
-#: mpulsweb/lib/renderer.py:1038
+#: mpulsweb/lib/renderer.py:1045
 msgid "Restore last valid value"
 msgstr "Stelle letzten gültigen Wert wieder her"
 

Modified: base/trunk/mpulsweb/i18n/mpulsweb.pot
===================================================================
--- base/trunk/mpulsweb/i18n/mpulsweb.pot	2010-06-29 07:19:58 UTC (rev 3099)
+++ base/trunk/mpulsweb/i18n/mpulsweb.pot	2010-06-29 07:40:36 UTC (rev 3100)
@@ -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-06-23 11:07+0200\n"
+"POT-Creation-Date: 2010-06-29 09:36+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"
@@ -200,7 +200,7 @@
 msgid "The appointment was successfully edited"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:29
+#: mpulsweb/controllers/case.py:28
 msgid ""
 "Do you really want to anonymise the case and\n"
 "irrecovably lose the associated personal data? After it the case will\n"
@@ -208,14 +208,14 @@
 "the analysis."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:48 mpulsweb/controllers/case_bundle.py:289
+#: mpulsweb/controllers/case.py:50 mpulsweb/controllers/case_bundle.py:289
 #: mpulsweb/controllers/case_bundle.py:324
 msgid "Delete case?"
 msgid_plural "Delete cases?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case.py:49
+#: mpulsweb/controllers/case.py:51
 msgid ""
 "Warning! On deleting the case all data will be erased\n"
 "irrecoverable!<br>Only delete the case if this case is <b>not needed for\n"
@@ -223,48 +223,48 @@
 "server?"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:53
+#: mpulsweb/controllers/case.py:55
 msgid ""
 "Do you really want to mark this case for deletion?\n"
 "The case will not be editable afterwards, and submited to the administration\n"
 "for deletion."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:56 mpulsweb/controllers/case_bundle.py:441
+#: mpulsweb/controllers/case.py:62 mpulsweb/controllers/case_bundle.py:441
 msgid "Restore case?"
 msgid_plural "Restore cases?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mpulsweb/controllers/case.py:57
+#: mpulsweb/controllers/case.py:63
 msgid ""
 "Do you really want to restore the case? The case\n"
 "will be editable afterwards again for the users."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:81
+#: mpulsweb/controllers/case.py:66
 msgid "Case copied!"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:82
+#: mpulsweb/controllers/case.py:67
 msgid ""
 "The case was succussfully copied and is now available in the case overview. "
 "Click on \"OK\" to open the case overview."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:83
+#: mpulsweb/controllers/case.py:68
 msgid "Copy case?"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:84
+#: mpulsweb/controllers/case.py:69
 msgid "Do you really want to copy this case? All data will be copied in the new case."
 msgstr ""
 
-#: mpulsweb/controllers/case.py:486
+#: mpulsweb/controllers/case.py:471
 msgid "Case storage extended"
 msgstr ""
 
-#: mpulsweb/controllers/case.py:487
+#: mpulsweb/controllers/case.py:472
 msgid "Please click on \"OK\" to continue"
 msgstr ""
 
@@ -764,23 +764,25 @@
 msgid "delete"
 msgstr ""
 
-#: mpulsweb/lib/renderer.py:982
-msgid "Items found"
-msgstr ""
+#: mpulsweb/lib/renderer.py:986
+msgid "Item found"
+msgid_plural "Items found"
+msgstr[0] ""
+msgstr[1] ""
 
-#: mpulsweb/lib/renderer.py:990
+#: mpulsweb/lib/renderer.py:997
 msgid "Create new item"
 msgstr ""
 
-#: mpulsweb/lib/renderer.py:1006
+#: mpulsweb/lib/renderer.py:1013
 msgid "Formular errors"
 msgstr ""
 
-#: mpulsweb/lib/renderer.py:1008
+#: mpulsweb/lib/renderer.py:1015
 msgid "Formular warnings"
 msgstr ""
 
-#: mpulsweb/lib/renderer.py:1038
+#: mpulsweb/lib/renderer.py:1045
 msgid "Restore last valid value"
 msgstr ""
 

Modified: base/trunk/mpulsweb/lib/renderer.py
===================================================================
--- base/trunk/mpulsweb/lib/renderer.py	2010-06-29 07:19:58 UTC (rev 3099)
+++ base/trunk/mpulsweb/lib/renderer.py	2010-06-29 07:40:36 UTC (rev 3100)
@@ -32,7 +32,7 @@
 from cgi import escape
 import logging
 
-from mpulsweb.lib.translation import _
+from mpulsweb.lib.translation import _, ungettext
 
 import formed.meta.data as data
 from formed.meta.nodecomponents import Node, NodeComponent as MetaNodeComponent
@@ -979,7 +979,13 @@
         out.append('</table>')
         out.append('</div>')
         out.append('<div>%s %s</div>'
-                   % (len(self.page.getChildren()), escape(_('Items found'))))
+                   % (len(self.page.getChildren()), escape(
+                            ungettext('Item found',
+                                    'Items found',
+                                    len(self.page.getChildren())))
+                        )
+                    )
+                   
         if not self.ro_mode:
             out.append('<div>')
             out.append('<br>')



More information about the Mpuls-commits mailing list