Bug 14707: Update existing installations and correct wrong values

See http://hea.koha-community.org/, the countries are filled is wrong
values.
If we decide to update the free text with a dropdown list, we need to
handle these wrong data.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/installer/data/mysql/atomicupdate/bug_14707.sql b/installer/data/mysql/atomicupdate/bug_14707.sql
new file mode 100644 (file)
index 0000000..101a87b
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/bug_14707.sql
@@ -0,0 +1,15 @@
+UPDATE systempreferences SET type="Choice" where variable="UsageStatsLibraryType";
+
+UPDATE systempreferences SET value="Canada"          WHERE variable="UsageStatsCountry" AND value="CANADA";
+UPDATE systempreferences SET value="Czech Republic"  WHERE variable="UsageStatsCountry" AND value="CZ";
+UPDATE systempreferences SET value="United Kingdom"  WHERE variable="UsageStatsCountry" AND (value="England" OR value="UK");
+UPDATE systempreferences SET value="Spain"           WHERE variable="UsageStatsCountry" AND value="España";
+UPDATE systempreferences SET value="Greece"          WHERE variable="UsageStatsCountry" AND value="GR";
+UPDATE systempreferences SET value="Ireland"         WHERE variable="UsageStatsCountry" AND value="Irelanbd";
+UPDATE systempreferences SET value="Mexico"          WHERE variable="UsageStatsCountry" AND value="México";
+UPDATE systempreferences SET value="Peru"            WHERE variable="UsageStatsCountry" AND value="Perú";
+UPDATE systempreferences SET value="Dominican Rep."  WHERE variable="UsageStatsCountry" AND value="República Dominicana";
+UPDATE systempreferences SET value="Trinidad & Tob." WHERE variable="UsageStatsCountry" AND value="Trinidad";
+UPDATE systempreferences SET value="Turkey"          WHERE variable="UsageStatsCountry" AND value="Türkiye";
+UPDATE systempreferences SET value="USA"             WHERE variable="UsageStatsCountry" AND (value="United States" OR value="United States of America" OR value="US");
+UPDATE systempreferences SET value="Zimbabwe"        WHERE variable="UsageStatsCountry" AND value="Zimbabbwe";

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
index 8a8aee5..4f3fb14 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref
@@ -402,7 +402,7 @@ Administration:
                   academic    : "academic"
                   research    : "research"
                   private     : "private"
-                  societyAssoc: "society or association"
+                  societyAssociation: "society or association"
                   corporate   : "corporate"
                   government  : "government"
                   religiousOrg: "religious organization"