From 9c224c1420ab21f8587175da36820a9f68af51f2 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Thu, 23 May 2019 11:17:44 -0400
Subject: [PATCH] LP#1817332: (follow-up) tweak description

Per a suggestion from Jane Sandberg, the description now includes
an example of a time zone name with an underscore. Also, the database
update will no longer overwrite any custom description that the
Evergreen admin may have put in.

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 Open-ILS/src/sql/Pg/950.data.seed-values.sql                 | 2 +-
 .../Pg/upgrade/XXXX.data.update_timezone_OUS_description.sql | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

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 ea97a5b54e..c887e9a5bd 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -17495,7 +17495,7 @@ INSERT into config.org_unit_setting_type
         'coust', 'label'),
     oils_i18n_gettext('lib.timezone',
         'Define the time zone in which a library physically resides. Examples: America/Toronto, ' ||
-        'America/Chicago, America/Denver, America/Vancouver, Europe/Prague. See Wikipedia for a ' ||
+        'America/Chicago, America/Los_Angeles, America/Vancouver, Europe/Prague. See Wikipedia for a ' ||
         '<a href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones" target="_blank">complete list</a> ' ||
         '(Note: Only use "canonical" timezones).',
         'coust', 'description'),
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_timezone_OUS_description.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_timezone_OUS_description.sql
index a5e46a3efb..60f7931a88 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_timezone_OUS_description.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.update_timezone_OUS_description.sql
@@ -5,10 +5,11 @@ BEGIN;
 UPDATE config.org_unit_setting_type
     SET description =
 'Define the time zone in which a library physically resides. Examples: America/Toronto, ' ||
-'America/Chicago, America/Denver, America/Vancouver, Europe/Prague. See Wikipedia for a ' ||
+'America/Chicago, America/Los_Angeles, America/Vancouver, Europe/Prague. See Wikipedia for a ' ||
 '<a href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones" target="_blank">complete list</a> ' ||
 '(Note: Only use "canonical" timezones).'
-    WHERE name = 'lib.timezone';
+WHERE name = 'lib.timezone'
+AND description = 'Define the time zone in which a library physically resides';
 
 COMMIT;
 
-- 
2.43.2