From 5033b1c51dca4b0947835738d0f2a8af252a74c9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Sch=C3=BCttler?= Date: Wed, 8 Nov 2017 14:21:14 +0100 Subject: [PATCH] Fix ISO compliance for German counties --- CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl | 5 +++++ xml/templates/civicrm_state_province.tpl | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl index 444a0ba0e1..cd41c1f055 100644 --- a/CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.7.29.mysql.tpl @@ -1 +1,6 @@ {* file to handle db changes in 4.7.29 during upgrade *} + +-- CRM-21407 ISO compliance for German counties +UPDATE `civicrm_state_province` SET `name` = 'Baden-Württemberg' WHERE `name` = 'Baden-Wuerttemberg' AND `country_id` = 1082; +UPDATE `civicrm_state_province` SET `abbreviation` = 'BE' WHERE `name` = 'Berlin' AND `abbreviation` = 'BR' AND `country_id` = 1082; +UPDATE `civicrm_state_province` SET `name` = 'Thüringen' WHERE `name` = 'Thueringen' AND `country_id` = 1082; \ No newline at end of file diff --git a/xml/templates/civicrm_state_province.tpl b/xml/templates/civicrm_state_province.tpl index 16c6e23734..ff93c97eb7 100644 --- a/xml/templates/civicrm_state_province.tpl +++ b/xml/templates/civicrm_state_province.tpl @@ -872,7 +872,7 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES (2237, 1058, "US", "Ústecký kraj"), (2238, 1058, "VY", "Vysočina"), (2239, 1058, "ZL", "Zlínský kraj"), -(2240, 1082, "BW", "Baden-Wuerttemberg"), +(2240, 1082, "BW", "Baden-Württemberg"), (2241, 1082, "BY", "Bayern"), (2242, 1082, "HB", "Bremen"), (2243, 1082, "HH", "Hamburg"), @@ -882,12 +882,12 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES (2247, 1082, "RP", "Rheinland-Pfalz"), (2248, 1082, "SL", "Saarland"), (2249, 1082, "SH", "Schleswig-Holstein"), -(2250, 1082, "BR", "Berlin"), +(2250, 1082, "BE", "Berlin"), (2251, 1082, "BB", "Brandenburg"), (2252, 1082, "MV", "Mecklenburg-Vorpommern"), (2253, 1082, "SN", "Sachsen"), (2254, 1082, "ST", "Sachsen-Anhalt"), -(2255, 1082, "TH", "Thueringen"), +(2255, 1082, "TH", "Thüringen"), (2256, 1060, "AS", "Ali Sabiah"), (2257, 1060, "DI", "Dikhil"), (2258, 1060, "DJ", "Djibouti"), -- 2.25.1