[open-ils-commits] r17350 - in trunk/Open-ILS/src/sql/Pg: . upgrade (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2010-08-26 11:16:19 -0400 (Thu, 26 Aug 2010)
New Revision: 17350

Modified:
   trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
   trunk/Open-ILS/src/sql/Pg/upgrade/0380.data.spine_label.sql
Log:
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.


Modified: trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2010-08-26 14:56:13 UTC (rev 17349)
+++ trunk/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2010-08-26 15:16:19 UTC (rev 17350)
@@ -6667,18 +6667,18 @@
 -- 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'
         )

Modified: trunk/Open-ILS/src/sql/Pg/upgrade/0380.data.spine_label.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0380.data.spine_label.sql	2010-08-26 14:56:13 UTC (rev 17349)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0380.data.spine_label.sql	2010-08-26 15:16:19 UTC (rev 17350)
@@ -4,18 +4,18 @@
 
 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'
         )