[open-ils-commits] [GIT] Evergreen ILS branch master updated. efdf2b16c664924ee66fa2e48a8da343aa16a43d

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  efdf2b16c664924ee66fa2e48a8da343aa16a43d (commit)
      from  df25d34fb5cad303a21b0f9df64b3c8e299b8222 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit efdf2b16c664924ee66fa2e48a8da343aa16a43d
Author: Dan Scott <dan at coffeecode.net>
Date:   Fri Jul 29 16:09:58 2011 -0400

    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 at laurentian.ca>
    Signed-off-by: Mike Rylander <mrylander at 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
--- 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
--- 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():

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/sql/Pg/950.data.seed-values.sql |    2 +-
 build/i18n/scripts/dojo_resource.py          |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS