Fix mismatches between cat.spine.font.* and cat.label.font.* that phasefx caught

The font settings apply to both spine and pocket labels, and I committed
the original upgrade and SQL scripts half-way through adjusting for that
realization.

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

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 a75177e..9c0abaf 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -6667,18 +6667,18 @@ INSERT INTO config.org_unit_setting_type ( name, label, description, datatype, f
 -- 0380.data.spine_label.sql Add spine label preferences
 INSERT INTO config.org_unit_setting_type (name, label, description, datatype)
     VALUES
-        ('cat.spine.font.size',
-            oils_i18n_gettext('cat.spine.font.size',
-                'Cataloging: Spine label font size', 'coust', 'label'),
-            oils_i18n_gettext('cat.spine.font.size',
-                'Set the default font size for spine labels', 'coust', 'description'),
+        ('cat.label.font.size',
+            oils_i18n_gettext('cat.label.font.size',
+                'Cataloging: Spine and pocket label font size', 'coust', 'label'),
+            oils_i18n_gettext('cat.label.font.size',
+                'Set the default font size for spine and pocket labels', 'coust', 'description'),
             'integer'
         )
-        ,('cat.spine.font.family',
-            oils_i18n_gettext('cat.spine.font.family',
-                'Cataloging: Spine label font family', 'coust', 'label'),
-            oils_i18n_gettext('cat.spine.font.family',
-                'Set the preferred font family for spine labels. You can specify a list of fonts, separated by commas, in order of preference; the system will use the first font it finds with a matching name. For example, "Arial, Helvetica, serif".',
+        ,('cat.label.font.family',
+            oils_i18n_gettext('cat.label.font.family',
+                'Cataloging: Spine and pocket label font family', 'coust', 'label'),
+            oils_i18n_gettext('cat.label.font.family',
+                'Set the preferred font family for spine and pocket labels. You can specify a list of fonts, separated by commas, in order of preference; the system will use the first font it finds with a matching name. For example, "Arial, Helvetica, serif".',
                 'coust', 'description'),
             'string'
         )

diff --git a/Open-ILS/src/sql/Pg/upgrade/0380.data.spine_label.sql b/Open-ILS/src/sql/Pg/upgrade/0380.data.spine_label.sql
index 76ef2d0..ae414d1 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/0380.data.spine_label.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0380.data.spine_label.sql
@@ -4,18 +4,18 @@ INSERT INTO config.upgrade_log (version) VALUES ('0380'); -- dbs
 
 INSERT INTO config.org_unit_setting_type (name, label, description, datatype)
     VALUES
-        ('cat.spine.font.size',
-            oils_i18n_gettext('cat.spine.font.size',
-                'Cataloging: Spine label font size', 'coust', 'label'),
-            oils_i18n_gettext('cat.spine.font.size',
-                'Set the default font size for spine labels', 'coust', 'description'),
+        ('cat.label.font.size',
+            oils_i18n_gettext('cat.label.font.size',
+                'Cataloging: Spine and pocket label font size', 'coust', 'label'),
+            oils_i18n_gettext('cat.label.font.size',
+                'Set the default font size for spine and pocket labels', 'coust', 'description'),
             'integer'
         )
-        ,('cat.spine.font.family',
-            oils_i18n_gettext('cat.spine.font.family',
-                'Cataloging: Spine label font family', 'coust', 'label'),
-            oils_i18n_gettext('cat.spine.font.family',
-                'Set the preferred font family for spine labels. You can specify a list of fonts, separated by commas, in order of preference; the system will use the first font it finds with a matching name. For example, "Arial, Helvetica, serif".',
+        ,('cat.label.font.family',
+            oils_i18n_gettext('cat.label.font.family',
+                'Cataloging: Spine and pocket label font family', 'coust', 'label'),
+            oils_i18n_gettext('cat.label.font.family',
+                'Set the preferred font family for spine and pocket labels. You can specify a list of fonts, separated by commas, in order of preference; the system will use the first font it finds with a matching name. For example, "Arial, Helvetica, serif".',
                 'coust', 'description'),
             'string'
         )