From: Pasi Kallinen <pasi.kallinen@pttk.fi>
Date: Thu, 4 Jul 2013 09:00:48 +0000 (+0300)
Subject: Make Vandelay merge profile names translatable.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=f5057f12c067e5bfbe58db904c29c69879f4f47e;p=contrib%2FConifer.git

Make Vandelay merge profile names translatable.

Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>
Signed-off-by: Bill Erickson <berickxx@gmail.com>
---

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 9d0d748c00..bab18da57a 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -193,7 +193,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 		<fields oils_persist:primary="id" oils_persist:sequence="vandelay.merge_profile_id_seq">
 			<field reporter:label="Field ID" name="id" reporter:selector="name" reporter:datatype="id"/>
 			<field reporter:label="Owner" name="owner" reporter:datatype="link"/>
-			<field reporter:label="Name" name="name" reporter:datatype="text"/>
+			<field reporter:label="Name" name="name" reporter:datatype="text" oils_persist:i18n="true"/>
 			<field reporter:label="Add Specification" name="add_spec" reporter:datatype="text"/>
 			<field reporter:label="Replace Specification" name="replace_spec" reporter:datatype="text"/>
 			<field reporter:label="Remove Specification" name="strip_spec" reporter:datatype="text"/>
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 ba59c4b816..bf47472611 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -12630,11 +12630,11 @@ INSERT INTO action_trigger.environment (
     'owning_lib.billing_address'
 );
 
-INSERT INTO vandelay.merge_profile (owner, name, replace_spec) 
-    VALUES (1, 'Match-Only Merge', '901c');
+INSERT INTO vandelay.merge_profile (id, owner, name, replace_spec) 
+    VALUES (1, 1, oils_i18n_gettext(1, 'Match-Only Merge', 'vmp', 'name'), '901c');
 
-INSERT INTO vandelay.merge_profile (owner, name, preserve_spec) 
-    VALUES (1, 'Full Overlay', '901c');
+INSERT INTO vandelay.merge_profile (id, owner, name, preserve_spec) 
+    VALUES (2, 1, oils_i18n_gettext(2, 'Full Overlay', 'vmp', 'name'), '901c');
 
 -- user activity seed data --