[open-ils-commits] [GIT] Evergreen ILS branch rel_2_3 updated. 36c60bd42b0cf8be9eaedd1ff99de6dd63c7ef7f

[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_3 has been updated
       via  36c60bd42b0cf8be9eaedd1ff99de6dd63c7ef7f (commit)
      from  d79c74e39217d2cafa32d954bb05825afa47c07e (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 36c60bd42b0cf8be9eaedd1ff99de6dd63c7ef7f
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date:   Tue Jul 2 09:13:40 2013 +0300

    Move action.hold_request_cancel_cause inserts to 950.data.seed-values.sql
    so they're picked up for translation.
    
    Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/src/sql/Pg/090.schema.action.sql b/Open-ILS/src/sql/Pg/090.schema.action.sql
index 833d7bc..74c0dda 100644
--- a/Open-ILS/src/sql/Pg/090.schema.action.sql
+++ b/Open-ILS/src/sql/Pg/090.schema.action.sql
@@ -360,13 +360,6 @@ CREATE TABLE action.hold_request_cancel_cause (
     id      SERIAL  PRIMARY KEY,
     label   TEXT    UNIQUE
 );
-INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (1,'Untargeted expiration');
-INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (2,'Hold Shelf expiration');
-INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (3,'Patron via phone');
-INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (4,'Patron in person');
-INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (5,'Staff forced');
-INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (6,'Patron via OPAC');
-SELECT SETVAL('action.hold_request_cancel_cause_id_seq', 100);
 
 CREATE TABLE action.hold_request (
 	id			SERIAL				PRIMARY KEY,
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 dbb7a3b..816a07a 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -2424,6 +2424,16 @@ INSERT INTO asset.call_number_suffix (id, owning_lib, label) VALUES (-1, 1, '');
 INSERT INTO asset.call_number_prefix (id, owning_lib, label) VALUES (-1, 1, '');
 INSERT INTO asset.call_number VALUES (-1,1,NOW(),1,NOW(),-1,1,'UNCATALOGED');
 
+--090.schema.action.sql
+INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (1, oils_i18n_gettext(1, 'Untargeted expiration', 'ahrcc', 'label'));
+INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (2, oils_i18n_gettext(2, 'Hold Shelf expiration', 'ahrcc', 'label'));
+INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (3, oils_i18n_gettext(3, 'Patron via phone', 'ahrcc', 'label'));
+INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (4, oils_i18n_gettext(4, 'Patron in person', 'ahrcc', 'label'));
+INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (5, oils_i18n_gettext(5, 'Staff forced', 'ahrcc', 'label'));
+INSERT INTO action.hold_request_cancel_cause (id,label) VALUES (6, oils_i18n_gettext(6, 'Patron via OPAC', 'ahrcc', 'label'));
+SELECT SETVAL('action.hold_request_cancel_cause_id_seq', 100);
+
+
 -- circ matrix
 INSERT INTO config.circ_matrix_matchpoint (org_unit,grp,circulate,duration_rule,recurring_fine_rule,max_fine_rule) VALUES (1,1,true,11,1,1);
 

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

Summary of changes:
 Open-ILS/src/sql/Pg/090.schema.action.sql    |    7 -------
 Open-ILS/src/sql/Pg/950.data.seed-values.sql |   10 ++++++++++
 2 files changed, 10 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Evergreen ILS