[open-ils-commits] r14559 - branches/rel_1_6_0/build/i18n/scripts (miker)

[svn at svn.open-ils.org]

Author: miker
Date: 2009-10-22 11:02:36 -0400 (Thu, 22 Oct 2009)
New Revision: 14559

Modified:
   branches/rel_1_6_0/build/i18n/scripts/db-seed-i18n.py
   branches/rel_1_6_0/build/i18n/scripts/fieldmapper.py
   branches/rel_1_6_0/build/i18n/scripts/ils_events.py
Log:
forward-porting r14558: remove the call to unicode() -- breaks things on python 2.5+

Modified: branches/rel_1_6_0/build/i18n/scripts/db-seed-i18n.py
===================================================================
--- branches/rel_1_6_0/build/i18n/scripts/db-seed-i18n.py	2009-10-22 15:00:46 UTC (rev 14558)
+++ branches/rel_1_6_0/build/i18n/scripts/db-seed-i18n.py	2009-10-22 15:02:36 UTC (rev 14559)
@@ -119,7 +119,7 @@
                 if msgstr == '':
                     # Don't generate a stmt for an untranslated string
                     break
-                self.sql.append(unicode(insert % (identifier.group('class'), occurid, locale, msgstr), 'utf_8'))
+                self.sql.append(insert % (identifier.group('class'), occurid, locale, msgstr))
 
 def main():
     """

Modified: branches/rel_1_6_0/build/i18n/scripts/fieldmapper.py
===================================================================
--- branches/rel_1_6_0/build/i18n/scripts/fieldmapper.py	2009-10-22 15:00:46 UTC (rev 14558)
+++ branches/rel_1_6_0/build/i18n/scripts/fieldmapper.py	2009-10-22 15:02:36 UTC (rev 14559)
@@ -69,9 +69,9 @@
             for name in entry.occurrences:
                 if entry.msgstr == '':
                     # No translation available; use the en-US definition
-                    self.definitions.append(unicode(entity % (name[0], entry.msgid), 'utf_8'))
+                    self.definitions.append(entity % (name[0], entry.msgid))
                 else:
-                    self.definitions.append(unicode(entity % (name[0], entry.msgstr), 'utf_8'))
+                    self.definitions.append(entity % (name[0], entry.msgstr))
 
 class IDLHandler(xml.sax.handler.ContentHandler):
     """

Modified: branches/rel_1_6_0/build/i18n/scripts/ils_events.py
===================================================================
--- branches/rel_1_6_0/build/i18n/scripts/ils_events.py	2009-10-22 15:00:46 UTC (rev 14558)
+++ branches/rel_1_6_0/build/i18n/scripts/ils_events.py	2009-10-22 15:02:36 UTC (rev 14559)
@@ -98,9 +98,9 @@
 
                 if entry.msgstr == '':
                     # No translation available; use the en-US definition
-                    self.definitions.append(unicode(event % (int(numcode), textcode, self.locale, entry.msgid), 'utf_8'))
+                    self.definitions.append(event % (int(numcode), textcode, self.locale, entry.msgid))
                 else:
-                    self.definitions.append(unicode(event % (int(numcode), textcode, self.locale, entry.msgstr), 'utf_8'))
+                    self.definitions.append(event % (int(numcode), textcode, self.locale, entry.msgstr))
 
 class ILSEventHandler(xml.sax.handler.ContentHandler):
     """