Fix i18n build

Two problems thrown at the i18n build:

  * $$ quoting is not understood by db-seed-i18n.py; simple approach is
    to use standard single-quote escaping of the single-quote in
    950.data.seed-values.sql (warning: this might lead to other problems
    with the regular expression in db-seed-i18n.py)
  * authority.js includes Unicode values (shock!) and so we must treat
    the incoming strings as unicode() instead of plain old str()

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Mike Rylander <mrylander@gmail.com>

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index e4e7607..65fe867 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -9584,7 +9584,7 @@ INSERT INTO authority.control_set_bib_field (tag, authority_field)
 
 INSERT INTO authority.thesaurus (code, name, control_set) VALUES
     ('a', oils_i18n_gettext('a','Library of Congress Subject Headings','at','name'), 1),
-    ('b', oils_i18n_gettext('b',$$LC subject headings for children's literature$$,'at','name'), 1), -- silly vim '
+    ('b', oils_i18n_gettext('b','LC subject headings for children''s literature','at','name'), 1), 
     ('c', oils_i18n_gettext('c','Medical Subject Headings','at','name'), 1),
     ('d', oils_i18n_gettext('d','National Agricultural Library subject authority file','at','name'), 1),
     ('k', oils_i18n_gettext('k','Canadian Subject Headings','at','name'), 1),

diff --git a/build/i18n/scripts/dojo_resource.py b/build/i18n/scripts/dojo_resource.py
index 90f7183..4956091 100755 (executable)
--- a/build/i18n/scripts/dojo_resource.py
+++ b/build/i18n/scripts/dojo_resource.py
@@ -67,12 +67,12 @@ class DojoResource (basel10n.BaseL10N):
 
         for key, value in bundle.iteritems():
             if value in msgids:
-                msgids[str(value)].occurrences.append((os.path.basename(source), str(key)))
+                msgids[unicode(value)].occurrences.append((os.path.basename(source), str(key)))
             else:
                 poe = polib.POEntry()
                 poe.occurrences = [(os.path.basename(source), str(key))]
-                poe.msgid = str(value)
-                msgids[str(value)] = poe
+                poe.msgid = unicode(value)
+                msgids[unicode(value)] = poe
 
         # Now add the POEntries to our POFile
         for poe in msgids.values():