[Mpuls-commits] r3331 - in base/trunk: . mpulsweb/model

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-08-04 17:02:00 +0200 (Wed, 04 Aug 2010)
New Revision: 3331

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/model/case.py
Log:
* mpulsweb/model/case.py (MPulsXMLImporter.import_allowed):
internationalize exception messages


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-08-04 14:36:17 UTC (rev 3330)
+++ base/trunk/ChangeLog	2010-08-04 15:02:00 UTC (rev 3331)
@@ -1,5 +1,10 @@
 2010-08-04  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/model/case.py (MPulsXMLImporter.import_allowed):
+	internationalize exception messages
+
+2010-08-04  Bernhard Herzog  <bh at intevation.de>
+
 	Update the message catalogs but do not add or change any of the
 	translations.  For some reason this update changes the formatting
 	of mpulsweb.po considerably and any actual translation changes

Modified: base/trunk/mpulsweb/model/case.py
===================================================================
--- base/trunk/mpulsweb/model/case.py	2010-08-04 14:36:17 UTC (rev 3330)
+++ base/trunk/mpulsweb/model/case.py	2010-08-04 15:02:00 UTC (rev 3331)
@@ -1322,12 +1322,12 @@
 
     def import_allowed(self, cursor, uuid):
         if self.uuid_anonymized(cursor, uuid):
-            raise XMLImportException(u"Die Akte mit UUID '%s' ist bereits"
-                                     u" anonymisiert." % uuid)
+            raise XMLImportException(_(u"The case with UUID '%s' was anonymized"
+                                       u" already.") % uuid)
         if not self.state_allows_import(cursor, uuid):
-            raise XMLImportException (u"Die Akte mit UUID '%s' ist schwebend"
-                                      u" anonymisiert oder schwebend gelöscht"
-                                      % uuid)
+            raise XMLImportException (_(u"The case with UUID '%s' is either"
+                                        u" marked for anonymization or marked"
+                                        u" for deletion.") % uuid)
         return True
 
     def uuid_anonymized(self, cursor, uuid):