Avoid mouse-grabbing weirdness by calling script with python explicitly.

Correct escaped quotes in POT msgids.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@8135 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/build/i18n/Makefile b/build/i18n/Makefile
index 3f918de..12a9771 100644 (file)
--- a/build/i18n/Makefile
+++ b/build/i18n/Makefile
@@ -54,7 +54,7 @@ po2props:
        @po2moz $(PROGRESS) -o locale/$(LOCALE) -t $(PROPSDIR)/en-US/ -i $(POINDIR)/$(LOCALE) 2>&1
 
 sql2pot:
        @po2moz $(PROGRESS) -o locale/$(LOCALE) -t $(PROPSDIR)/en-US/ -i $(POINDIR)/$(LOCALE) 2>&1
 
 sql2pot:

-       @scripts/db-seed-i18n.py
+       @python scripts/db-seed-i18n.py

 
 update_moz_dtds:
        @po2moz $(PROGRESS) -o locale/$(LOCALE) -t $(DTDDIR)/en-US/ -i $(POINDIR)/$(LOCALE) 2>&1
 
 update_moz_dtds:
        @po2moz $(PROGRESS) -o locale/$(LOCALE) -t $(DTDDIR)/en-US/ -i $(POINDIR)/$(LOCALE) 2>&1

diff --git a/build/i18n/po/db.seed.pot b/build/i18n/po/db.seed.pot
index 09ac3bd..9cecdbd 100644 (file)
--- a/build/i18n/po/db.seed.pot
+++ b/build/i18n/po/db.seed.pot
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Evergreen 1.4"
 "Report-Msgid-Bugs-To: open-ils-dev@list.georgialibraries.org"
 msgstr ""
 "Project-Id-Version: Evergreen 1.4"
 "Report-Msgid-Bugs-To: open-ils-dev@list.georgialibraries.org"

-"POT-Creation-Date: 2007-12-04 02:50:56 -0400"
+"POT-Creation-Date: 2007-12-04 05:05:05 -0400"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>"
 "Language-Team: LANGUAGE <LL@li.org>"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>"
 "Language-Team: LANGUAGE <LL@li.org>"


@@ -972,7 +972,7 @@ msgid "Gujarati"
 msgstr ""
 
 #: config.language_map:290
 msgstr ""
 
 #: config.language_map:290

-msgid "Gwich\'in"
+msgid "Gwich'in"

 msgstr ""
 
 #: config.language_map:291
 msgstr ""
 
 #: config.language_map:291


@@ -2396,11 +2396,11 @@ msgid "User is allowed to place a hold on a specific copy"
 msgstr ""
 
 #: permission.perm_list:676
 msgstr ""
 
 #: permission.perm_list:676

-msgid "Allows a user to view another user\'s holds"
+msgid "Allows a user to view another user's holds"

 msgstr ""
 
 #: permission.perm_list:678
 msgstr ""
 
 #: permission.perm_list:678

-msgid "Allows a user to update another user\'s hold"
+msgid "Allows a user to update another user's hold"

 msgstr ""
 
 #: permission.perm_list:683
 msgstr ""
 
 #: permission.perm_list:683


@@ -2416,7 +2416,7 @@ msgid "Allows a user to create a new bill on a transaction"
 msgstr ""
 
 #: permission.perm_list:705
 msgstr ""
 
 #: permission.perm_list:705

-msgid "Allows a user to view another user"
+msgid "Allows a user to view another user's containers (buckets)"

 msgstr ""
 
 #: permission.perm_list:706
 msgstr ""
 
 #: permission.perm_list:706


@@ -2436,7 +2436,7 @@ msgid "Allows a user to see what another use has checked out"
 msgstr ""
 
 #: permission.perm_list:710
 msgstr ""
 
 #: permission.perm_list:710

-msgid "User may view another user"
+msgid "User may view another user's transactions"

 msgstr ""
 
 #: permission.perm_list:711
 msgstr ""
 
 #: permission.perm_list:711


@@ -2456,7 +2456,7 @@ msgid "User can remove other users from permission groups"
 msgstr ""
 
 #: permission.perm_list:715
 msgstr ""
 
 #: permission.perm_list:715

-msgid "Allow user to view others"
+msgid "Allow user to view others' permission groups"

 msgstr ""
 
 #: permission.perm_list:716
 msgstr ""
 
 #: permission.perm_list:716


@@ -2832,7 +2832,7 @@ msgid "Allows a user to checkout an item that is marked as non-circ"
 msgstr ""
 
 #: permission.perm_list:812
 msgstr ""
 
 #: permission.perm_list:812

-msgid "Allows a user to delete an item out of another user\'s container"
+msgid "Allows a user to delete an item out of another user's container"

 msgstr ""
 
 #: permission.perm_list:813
 msgstr ""
 
 #: permission.perm_list:813

diff --git a/build/i18n/scripts/db-seed-i18n.py b/build/i18n/scripts/db-seed-i18n.py
index 89abbc8..e42c830 100755 (executable)
--- a/build/i18n/scripts/db-seed-i18n.py
+++ b/build/i18n/scripts/db-seed-i18n.py
@@ -78,7 +78,7 @@ class EvergreenSQL:
             if fi18n is not None:
                 for i18n in fi18n.groups():
                     # Unescape escaped SQL single-quotes for translators' sanity
             if fi18n is not None:
                 for i18n in fi18n.groups():
                     # Unescape escaped SQL single-quotes for translators' sanity

-                    i18n = re.compile(r'\'\'').sub(r'\'', i18n)
+                    i18n = re.compile(r'\'\'').sub("'", i18n)

                     poe = polib.POEntry()
                     poe.occurences = [(table, n)]
                     poe.msgid = i18n
                     poe = polib.POEntry()
                     poe.occurences = [(table, n)]
                     poe.msgid = i18n