CRM-17852 - Misspeled state names in Estonia/Lithuania

diff --git a/CRM/Upgrade/Incremental/sql/4.7.1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.1.mysql.tpl
index 65ea99d5a178d91a14af83556bd0f5b2af8a9c80..c322e022966ddc3e7a2713985ef02a6ad555178e 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.7.1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.1.mysql.tpl
@@ -1 +1,26 @@
 {* file to handle db changes in 4.7.1 during upgrade *}
+# CRM-17852 - Misspeled state names in Estonia/Lithuania
+
+#Estonia
+UPDATE civicrm_state_province SET name = 'Harjumaa' where id = 2376;
+UPDATE civicrm_state_province SET name = 'Hiiumaa' where id = 2377;
+UPDATE civicrm_state_province SET name = 'Ida-Virumaa' where id = 2378;
+UPDATE civicrm_state_province SET name = 'Jõgevamaa' where id = 2379;
+UPDATE civicrm_state_province SET name = 'Järvamaa' where id = 2380;
+UPDATE civicrm_state_province SET name = 'Läänemaa' where id = 2381;
+UPDATE civicrm_state_province SET name = 'Lääne-Virumaa' where id = 2382;
+UPDATE civicrm_state_province SET name = 'Põlvamaa' where id = 2383;
+UPDATE civicrm_state_province SET name = 'Pärnumaa' where id = 2384;
+UPDATE civicrm_state_province SET name = 'Raplamaa' where id = 2385;
+UPDATE civicrm_state_province SET name = 'Saaremaa' where id = 2386;
+UPDATE civicrm_state_province SET name = 'Tartumaa' where id = 2387;
+UPDATE civicrm_state_province SET name = 'Viljandimaa' where id = 2389;
+UPDATE civicrm_state_province SET name = 'Võrumaa' where id = 2390;
+
+#Lithuania
+UPDATE civicrm_state_province SET name = 'Klaipėdos Apskritis' where id = 3514;
+UPDATE civicrm_state_province SET name = 'Marijampolės Apskritis' where id = 3515;
+UPDATE civicrm_state_province SET name = 'Panevėžio Apskritis' where id = 3516;
+UPDATE civicrm_state_province SET name = 'Šiaulių Apskritis' where id = 3517;
+UPDATE civicrm_state_province SET name = 'Tauragės Apskritis' where id = 3518;
+UPDATE civicrm_state_province SET name = 'Telšių Apskritis' where id = 3519;

diff --git a/xml/templates/civicrm_state_province.tpl b/xml/templates/civicrm_state_province.tpl
index d08e1ce185ee08384e9c6fd7d3272e2b0e809762..f70829e25e6588157b54a4029841b5354cf9ca02 100644 (file)
--- a/xml/templates/civicrm_state_province.tpl
+++ b/xml/templates/civicrm_state_province.tpl
@@ -1009,21 +1009,21 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (2373, 1064, "U", "Sucumbios"),
 (2374, 1064, "T", "Tungurahua"),
 (2375, 1064, "Z", "Zamora-Chinchipe"),
-(2376, 1069, "37", "Harjumsa"),
-(2377, 1069, "39", "Hitumea"),
-(2378, 1069, "44", "Ida-Virumsa"),
-(2379, 1069, "49", "Jogevamsa"),
-(2380, 1069, "51", "Jarvamsa"),
-(2381, 1069, "57", "Lasnemsa"),
-(2382, 1069, "59", "Laane-Virumaa"),
-(2383, 1069, "65", "Polvamea"),
-(2384, 1069, "67", "Parnumsa"),
-(2385, 1069, "70", "Raplamsa"),
-(2386, 1069, "74", "Saaremsa"),
-(2387, 1069, "7B", "Tartumsa"),
+(2376, 1069, "37", "Harjumaa"),
+(2377, 1069, "39", "Hiiumaa"),
+(2378, 1069, "44", "Ida-Virumaa"),
+(2379, 1069, "49", "Jõgevamaa"),
+(2380, 1069, "51", "Järvamaa"),
+(2381, 1069, "57", "Läänemaa"),
+(2382, 1069, "59", "Lääne-Virumaa"),
+(2383, 1069, "65", "Põlvamaa"),
+(2384, 1069, "67", "Pärnumaa"),
+(2385, 1069, "70", "Raplamaa"),
+(2386, 1069, "74", "Saaremaa"),
+(2387, 1069, "7B", "Tartumaa"),
 (2388, 1069, "82", "Valgamaa"),
-(2389, 1069, "84", "Viljandimsa"),
-(2390, 1069, "86", "Vorumaa"),
+(2389, 1069, "84", "Viljandimaa"),
+(2390, 1069, "86", "Võrumaa"),
 (2391, 1065, "DK", "Ad Daqahllyah"),
 (2392, 1065, "BA", "Al Bahr al Ahmar"),
 (2393, 1065, "BH", "Al Buhayrah"),
@@ -1996,12 +1996,12 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (3511, 1121, "K", "Thaba-Tseka"),
 (3512, 1125, "AL", "Alytaus Apskritis"),
 (3513, 1125, "KU", "Kauno Apskritis"),
-(3514, 1125, "KL", "Klaipedos Apskritis"),
-(3515, 1125, "MR", "Marijampoles Apskritis"),
-(3516, 1125, "PN", "Panevezio Apskritis"),
-(3517, 1125, "SA", "Sisuliu Apskritis"),
-(3518, 1125, "TA", "Taurages Apskritis"),
-(3519, 1125, "TE", "Telsiu Apskritis"),
+(3514, 1125, "KL", "Klaipėdos Apskritis"),
+(3515, 1125, "MR", "Marijampolės Apskritis"),
+(3516, 1125, "PN", "Panevėžio Apskritis"),
+(3517, 1125, "SA", "Šiaulių Apskritis"),
+(3518, 1125, "TA", "Tauragės Apskritis"),
+(3519, 1125, "TE", "Telšių Apskritis"),
 (3520, 1125, "UT", "Utenos Apskritis"),
 (3521, 1125, "VL", "Vilniaus Apskritis"),
 (3522, 1126, "D", "Diekirch"),