[open-ils-commits] [GIT] Evergreen ILS branch rel_2_4 updated. 4e09a7425f1669536df521993556e8ce1e84adfb

[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, rel_2_4 has been updated
       via  4e09a7425f1669536df521993556e8ce1e84adfb (commit)
       via  a7019ca3718dd82562f94898e05130dddf258e51 (commit)
       via  93162356f4feea4fc361c1caaab3ca0eee5f7f6d (commit)
       via  fc9345ac6f896a73c6fc70e62c09ebcb5d95233c (commit)
      from  d52d73fa235a5a1825d146ae9ba68a55b0b0eba2 (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 4e09a7425f1669536df521993556e8ce1e84adfb
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Wed Jul 10 11:39:08 2013 -0400

    Add missing oils_i18n call #2 to upgrade script
    
    Simple thinko fix for missing translation function call.
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>

diff --git a/Open-ILS/src/sql/Pg/upgrade/0804.data.gwichin-typo-fix.sql b/Open-ILS/src/sql/Pg/upgrade/0804.data.gwichin-typo-fix.sql
index 27bfb51..05b0fa5 100644
--- a/Open-ILS/src/sql/Pg/upgrade/0804.data.gwichin-typo-fix.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0804.data.gwichin-typo-fix.sql
@@ -3,7 +3,7 @@ BEGIN;
 SELECT evergreen.upgrade_deps_block_check('0804', :eg_version);
 
 UPDATE config.coded_value_map
-SET value = 'Gwich''in'
+SET value = oils_i18n_gettext('169', 'Gwich''in', 'ccvm', 'value')
 WHERE ctype = 'item_lang' AND code = 'gwi';
 
 COMMIT;

commit a7019ca3718dd82562f94898e05130dddf258e51
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Wed Jul 10 11:26:07 2013 -0400

    Stamping upgrade for Gwich'in language typo
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 30a5307..85d523a 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,7 @@ CREATE TRIGGER no_overlapping_deps
     BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0803', :eg_version); -- paxed/remingtron/dbwells
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0804', :eg_version); -- paxed/remingtron/bshum/dbwells
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.gwichin-typo-fix.sql b/Open-ILS/src/sql/Pg/upgrade/0804.data.gwichin-typo-fix.sql
similarity index 64%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.data.gwichin-typo-fix.sql
rename to Open-ILS/src/sql/Pg/upgrade/0804.data.gwichin-typo-fix.sql
index 4b61142..27bfb51 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.gwichin-typo-fix.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0804.data.gwichin-typo-fix.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('0804', :eg_version);
 
 UPDATE config.coded_value_map
 SET value = 'Gwich''in'

commit 93162356f4feea4fc361c1caaab3ca0eee5f7f6d
Author: Ben Shum <bshum at biblio.org>
Date:   Tue Jul 9 20:47:20 2013 -0400

    LP1158206 - include upgrade script to fix Gwich'in typo
    
    Signed-off-by: Ben Shum <bshum at biblio.org>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.gwichin-typo-fix.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.gwichin-typo-fix.sql
new file mode 100644
index 0000000..4b61142
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.gwichin-typo-fix.sql
@@ -0,0 +1,9 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+UPDATE config.coded_value_map
+SET value = 'Gwich''in'
+WHERE ctype = 'item_lang' AND code = 'gwi';
+
+COMMIT;

commit fc9345ac6f896a73c6fc70e62c09ebcb5d95233c
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date:   Thu Jun 13 09:06:26 2013 +0300

    Fix LP1158206 - The language is Gwich'in.
    
    Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
    Signed-off-by: Ben Shum <bshum at biblio.org>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

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 8b6a290..29dfef4 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -6008,7 +6008,7 @@ INSERT INTO config.coded_value_map (id, ctype, code, value) VALUES
     (166, 'item_lang', 'grn', oils_i18n_gettext('166', 'Guarani', 'ccvm', 'value')),
     (167, 'item_lang', '-gua', oils_i18n_gettext('167', 'Guarani', 'ccvm', 'value')),
     (168, 'item_lang', 'guj', oils_i18n_gettext('168', 'Gujarati', 'ccvm', 'value')),
-    (169, 'item_lang', 'gwi', oils_i18n_gettext('169', 'Gwich', 'ccvm', 'value''in')),
+    (169, 'item_lang', 'gwi', oils_i18n_gettext('169', 'Gwich''in', 'ccvm', 'value')),
     (170, 'item_lang', 'hai', oils_i18n_gettext('170', 'Haida', 'ccvm', 'value')),
     (171, 'item_lang', 'hat', oils_i18n_gettext('171', 'Haitian French Creole', 'ccvm', 'value')),
     (172, 'item_lang', 'hau', oils_i18n_gettext('172', 'Hausa', 'ccvm', 'value')),

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

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql       |    2 +-
 .../sql/Pg/upgrade/0804.data.gwichin-typo-fix.sql  |    9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/0804.data.gwichin-typo-fix.sql


hooks/post-receive
-- 
Evergreen ILS