CRM-18014-Missspelled county names in Sweden

diff --git a/CRM/Upgrade/Incremental/sql/4.7.2.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.2.mysql.tpl
index 8a258e453a681b6547d4a75f4907bf1efde28308..2e87e38e6570c54d2445ffb558aa0e262daba608 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.7.2.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.2.mysql.tpl
@@ -1 +1,29 @@
 {* file to handle db changes in 4.7.2 during upgrade *}
+# CRM-18014 - Missspeled county names in Sweden
+
+#Sweden
+
+SET @SwedenCountryId = (SELECT id FROM civicrm_country cc WHERE cc.name = 'Sweden');
+
+UPDATE civicrm_state_province SET name = 'Blekinge län' where name='Blekinge lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Dalarnas län' where name='Dalarnas lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Gävleborgs län' where name='Gavleborge lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Gotlands län' where name='Gotlands lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Hallands län' where name='Hallands lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Jämtlands län' where name='Jamtlande lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Jönköpings län' where name='Jonkopings lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Kalmar län' where name='Kalmar lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Kronobergs län' where name='Kronoberge lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Norrbottens län' where name='Norrbottena lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Örebro län' where name='Orebro lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Östergötlands län' where name='Ostergotlands lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Skåne län' where name='Skane lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Södermanlands län' where name='Sodermanlands lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Stockholms län' where name='Stockholms lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Uppsala län' where name='Uppsala lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Värmlands län' where name='Varmlanda lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Västerbottens län' where name='Vasterbottens lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Västernorrlands län' where name='Vasternorrlands lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Västmanlands län' where name='Vastmanlanda lan' AND country_id = @SwedenCountryId;
+UPDATE civicrm_state_province SET name = 'Västra Götalands län' where name='Vastra Gotalands lan' AND country_id = @SwedenCountryId;
+

diff --git a/xml/templates/civicrm_state_province.tpl b/xml/templates/civicrm_state_province.tpl
index f70829e25e6588157b54a4029841b5354cf9ca02..9ccd9f3ccbab056f39fb292519964f9a34b76350 100644 (file)
--- a/xml/templates/civicrm_state_province.tpl
+++ b/xml/templates/civicrm_state_province.tpl
@@ -2809,27 +2809,27 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (4356, 1200, "19", "Sharq al Istiwa\'iyah"),
 (4357, 1200, "25", "Sinnar"),
 (4358, 1200, "21", "Warab"),
-(4359, 1204, "K", "Blekinge lan"),
-(4360, 1204, "W", "Dalarnas lan"),
-(4361, 1204, "I", "Gotlands lan"),
-(4362, 1204, "X", "Gavleborge lan"),
-(4363, 1204, "N", "Hallands lan"),
-(4364, 1204, "Z", "Jamtlande lan"),
-(4365, 1204, "F", "Jonkopings lan"),
-(4366, 1204, "H", "Kalmar lan"),
-(4367, 1204, "G", "Kronoberge lan"),
-(4368, 1204, "BD", "Norrbottena lan"),
-(4369, 1204, "M", "Skane lan"),
-(4370, 1204, "AB", "Stockholms lan"),
-(4371, 1204, "D", "Sodermanlands lan"),
-(4372, 1204, "C", "Uppsala lan"),
-(4373, 1204, "S", "Varmlanda lan"),
-(4374, 1204, "AC", "Vasterbottens lan"),
-(4375, 1204, "Y", "Vasternorrlands lan"),
-(4376, 1204, "U", "Vastmanlanda lan"),
-(4377, 1204, "Q", "Vastra Gotalands lan"),
-(4378, 1204, "T", "Orebro lan"),
-(4379, 1204, "E", "Ostergotlands lan"),
+(4359, 1204, "K", "Blekinge län"),
+(4360, 1204, "W", "Dalarnas län"),
+(4361, 1204, "I", "Gotlands län"),
+(4362, 1204, "X", "Gävleborgs län"),
+(4363, 1204, "N", "Hallands län"),
+(4364, 1204, "Z", "Jämtlands län"),
+(4365, 1204, "F", "Jönkopings län"),
+(4366, 1204, "H", "Kalmar län"),
+(4367, 1204, "G", "Kronobergs län"),
+(4368, 1204, "BD", "Norrbottens län"),
+(4369, 1204, "M", "Skåne län"),
+(4370, 1204, "AB", "Stockholms län"),
+(4371, 1204, "D", "Södermanlands län"),
+(4372, 1204, "C", "Uppsala län"),
+(4373, 1204, "S", "Värmlands län"),
+(4374, 1204, "AC", "Västerbottens län"),
+(4375, 1204, "Y", "Västernorrlands län"),
+(4376, 1204, "U", "Västmanlands län"),
+(4377, 1204, "Q", "Västra Götalands län"),
+(4378, 1204, "T", "Örebro län"),
+(4379, 1204, "E", "Östergötlands län"),
 (4380, 1180, "SH", "Saint Helena"),
 (4381, 1180, "AC", "Ascension"),
 (4382, 1180, "TA", "Tristan da Cunha"),