Don't use oils_i18n_gettext() for csp.label

Fixes a regression in a recent merge.  Nothing else uses i18n for csp,
and it actually causes the building of a fresh database to fail, per
Thomas Berezansky.  The database upgrade script was harmless the way it
was, I think, but I've changed it too for consistency's sake.

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index db5fa70..bd485fa 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -149,48 +149,28 @@ INSERT INTO config.standing_penalty (id, name, label, staff_alert, org_depth) VA
     (
         31,
         'INVALID_PATRON_EMAIL_ADDRESS',
-        oils_i18n_gettext(
-            31,
-            'Patron had an invalid email address',
-            'csp',
-            'label'
-        ),
+        'Patron had an invalid email address',
         TRUE,
         0
     ),
     (
         32,
         'INVALID_PATRON_DAY_PHONE',
-        oils_i18n_gettext(
-            32,
-            'Patron had an invalid daytime phone number',
-            'csp',
-            'label'
-        ),
+        'Patron had an invalid daytime phone number',
         TRUE,
         0
     ),
     (
         33,
         'INVALID_PATRON_EVENING_PHONE',
-        oils_i18n_gettext(
-            33,
-            'Patron had an invalid evening phone number',
-            'csp',
-            'label'
-        ),
+        'Patron had an invalid evening phone number',
         TRUE,
         0
     ),
     (
         34,
         'INVALID_PATRON_OTHER_PHONE',
-        oils_i18n_gettext(
-            34,
-            'Patron had an invalid other phone number',
-            'csp',
-            'label'
-        ),
+        'Patron had an invalid other phone number',
         TRUE,
         0
     );

diff --git a/Open-ILS/src/sql/Pg/upgrade/0670.data.mark-email-and-phone-invalid.sql b/Open-ILS/src/sql/Pg/upgrade/0670.data.mark-email-and-phone-invalid.sql
index bbc6810..b45524a 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/0670.data.mark-email-and-phone-invalid.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0670.data.mark-email-and-phone-invalid.sql
@@ -13,48 +13,28 @@ INSERT INTO config.standing_penalty (id, name, label, staff_alert, org_depth) VA
     (
         31,
         'INVALID_PATRON_EMAIL_ADDRESS',
-        oils_i18n_gettext(
-            31,
-            'Patron had an invalid email address',
-            'csp',
-            'label'
-        ),
+        'Patron had an invalid email address',
         TRUE,
         0
     ),
     (
         32,
         'INVALID_PATRON_DAY_PHONE',
-        oils_i18n_gettext(
-            32,
-            'Patron had an invalid daytime phone number',
-            'csp',
-            'label'
-        ),
+        'Patron had an invalid daytime phone number',
         TRUE,
         0
     ),
     (
         33,
         'INVALID_PATRON_EVENING_PHONE',
-        oils_i18n_gettext(
-            33,
-            'Patron had an invalid evening phone number',
-            'csp',
-            'label'
-        ),
+        'Patron had an invalid evening phone number',
         TRUE,
         0
     ),
     (
         34,
         'INVALID_PATRON_OTHER_PHONE',
-        oils_i18n_gettext(
-            34,
-            'Patron had an invalid other phone number',
-            'csp',
-            'label'
-        ),
+        'Patron had an invalid other phone number',
         TRUE,
         0
     );