From 36876ea79989c554dac44b7035c761917ab63747 Mon Sep 17 00:00:00 2001
From: Jaka Kranjc <lynxlynxlynx@sourcemage.org>
Date: Sat, 17 Jan 2015 21:45:02 +0100
Subject: [PATCH] Use proper names for Slovenian municipalities

long live unicode!
---
 .../Incremental/sql/4.6.alpha3.mysql.tpl      |  61 +++++++++
 xml/templates/civicrm_state_province.tpl      | 118 +++++++++---------
 2 files changed, 120 insertions(+), 59 deletions(-)

diff --git a/CRM/Upgrade/Incremental/sql/4.6.alpha3.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.6.alpha3.mysql.tpl
index bf00120bfc..e5633c56d0 100644
--- a/CRM/Upgrade/Incremental/sql/4.6.alpha3.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.6.alpha3.mysql.tpl
@@ -1 +1,62 @@
 {* file to handle db changes in 4.6.alpha3 during upgrade *}
+
+-- Use proper names for Slovenian municipalities
+UPDATE `civicrm_state_province` SET `name` = (N'Ajdovščina') WHERE `id` = 4383;
+UPDATE `civicrm_state_province` SET `name` = (N'Braslovče') WHERE `id` = 4392;
+UPDATE `civicrm_state_province` SET `name` = (N'Brežice') WHERE `id` = 4395;
+UPDATE `civicrm_state_province` SET `name` = (N'Črenšovci') WHERE `id` = 4402;
+UPDATE `civicrm_state_province` SET `name` = (N'Črna na Koroškem') WHERE `id` = 4403;
+UPDATE `civicrm_state_province` SET `name` = (N'Črnomelj') WHERE `id` = 4404;
+UPDATE `civicrm_state_province` SET `name` = (N'Divača') WHERE `id` = 4406;
+UPDATE `civicrm_state_province` SET `name` = (N'Domžale') WHERE `id` = 4414;
+UPDATE `civicrm_state_province` SET `name` = (N'Gorišnica') WHERE `id` = 4419;
+UPDATE `civicrm_state_province` SET `name` = (N'Hoče-Slivnica') WHERE `id` = 4426;
+UPDATE `civicrm_state_province` SET `name` = (N'Hodoš') WHERE `id` = 4427;
+UPDATE `civicrm_state_province` SET `name` = (N'Horjul') WHERE `id` = 4428;
+UPDATE `civicrm_state_province` SET `name` = (N'Ilirska Bistrica') WHERE `id` = 4433;
+UPDATE `civicrm_state_province` SET `name` = (N'Ivančna Gorica') WHERE `id` = 4434;
+UPDATE `civicrm_state_province` SET `name` = (N'Juršinci') WHERE `id` = 4438;
+UPDATE `civicrm_state_province` SET `name` = (N'Kidričevo') WHERE `id` = 4441;
+UPDATE `civicrm_state_province` SET `name` = (N'Kočevje') WHERE `id` = 4444;
+UPDATE `civicrm_state_province` SET `name` = (N'Križevci') WHERE `id` = 4452;
+UPDATE `civicrm_state_province` SET `name` = (N'Krško') WHERE `id` = 4453;
+UPDATE `civicrm_state_province` SET `name` = (N'Laško') WHERE `id` = 4456;
+UPDATE `civicrm_state_province` SET `name` = (N'Loška dolina') WHERE `id` = 4464;
+UPDATE `civicrm_state_province` SET `name` = (N'Loški Potok') WHERE `id` = 4465;
+UPDATE `civicrm_state_province` SET `name` = (N'Luče') WHERE `id` = 4467;
+UPDATE `civicrm_state_province` SET `name` = (N'Majšperk') WHERE `id` = 4469;
+UPDATE `civicrm_state_province` SET `name` = (N'Mengeš') WHERE `id` = 4473;
+UPDATE `civicrm_state_province` SET `name` = (N'Mežica') WHERE `id` = 4475;
+UPDATE `civicrm_state_province` SET `name` = (N'Miklavž na Dravskem polju') WHERE `id` = 4476;
+UPDATE `civicrm_state_province` SET `name` = (N'Mirna Peč') WHERE `id` = 4478;
+UPDATE `civicrm_state_province` SET `name` = (N'Moravče') WHERE `id` = 4480;
+UPDATE `civicrm_state_province` SET `name` = (N'Novo mesto') WHERE `id` = 4488;
+UPDATE `civicrm_state_province` SET `name` = (N'Sveti Andraž v Slovenskih goricah') WHERE `id` = 4490;
+UPDATE `civicrm_state_province` SET `name` = (N'Å alovci') WHERE `id` = 4492;
+UPDATE `civicrm_state_province` SET `name` = (N'Å empeter-Vrtojba') WHERE `id` = 4493;
+UPDATE `civicrm_state_province` SET `name` = (N'Šenčur') WHERE `id` = 4494;
+UPDATE `civicrm_state_province` SET `name` = (N'Å entilj') WHERE `id` = 4495;
+UPDATE `civicrm_state_province` SET `name` = (N'Å entjernej') WHERE `id` = 4496;
+UPDATE `civicrm_state_province` SET `name` = (N'Å entjur') WHERE `id` = 4497;
+UPDATE `civicrm_state_province` SET `name` = (N'Å kocjan') WHERE `id` = 4498;
+UPDATE `civicrm_state_province` SET `name` = (N'Å kofja Loka') WHERE `id` = 4499;
+UPDATE `civicrm_state_province` SET `name` = (N'Å kofljica') WHERE `id` = 4500;
+UPDATE `civicrm_state_province` SET `name` = (N'Šmarje pri Jelšah') WHERE `id` = 4501;
+UPDATE `civicrm_state_province` SET `name` = (N'Å martno ob Paki') WHERE `id` = 4502;
+UPDATE `civicrm_state_province` SET `name` = (N'Å martno pri Litiji') WHERE `id` = 4503;
+UPDATE `civicrm_state_province` SET `name` = (N'Šoštanj') WHERE `id` = 4504;
+UPDATE `civicrm_state_province` SET `name` = (N'Å tore') WHERE `id` = 4505;
+UPDATE `civicrm_state_province` SET `name` = (N'Tišina') WHERE `id` = 4507;
+UPDATE `civicrm_state_province` SET `name` = (N'Trbovlje') WHERE `id` = 4509;
+UPDATE `civicrm_state_province` SET `name` = (N'Tržič') WHERE `id` = 4512;
+UPDATE `civicrm_state_province` SET `name` = (N'Turnišče') WHERE `id` = 4514;
+UPDATE `civicrm_state_province` SET `name` = (N'Velike Lašče') WHERE `id` = 4517;
+UPDATE `civicrm_state_province` SET `name` = (N'Veržej') WHERE `id` = 4518;
+UPDATE `civicrm_state_province` SET `name` = (N'Zavrč') WHERE `id` = 4527;
+UPDATE `civicrm_state_province` SET `name` = (N'Zreče') WHERE `id` = 4528;
+UPDATE `civicrm_state_province` SET `name` = (N'Žalec') WHERE `id` = 4529;
+UPDATE `civicrm_state_province` SET `name` = (N'Železniki') WHERE `id` = 4530;
+UPDATE `civicrm_state_province` SET `name` = (N'Žetale') WHERE `id` = 4531;
+UPDATE `civicrm_state_province` SET `name` = (N'Žiri') WHERE `id` = 4532;
+UPDATE `civicrm_state_province` SET `name` = (N'Žirovnica') WHERE `id` = 4533;
+UPDATE `civicrm_state_province` SET `name` = (N'Žužemberk') WHERE `id` = 4534;
diff --git a/xml/templates/civicrm_state_province.tpl b/xml/templates/civicrm_state_province.tpl
index f413bcd796..beaaf25722 100644
--- a/xml/templates/civicrm_state_province.tpl
+++ b/xml/templates/civicrm_state_province.tpl
@@ -2833,7 +2833,7 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (4380, 1180, "SH", "Saint Helena"),
 (4381, 1180, "AC", "Ascension"),
 (4382, 1180, "TA", "Tristan da Cunha"),
-(4383, 1193, "001", "Ajdovscina"),
+(4383, 1193, "001", "Ajdovščina"),
 (4384, 1193, "002", "Beltinci"),
 (4385, 1193, "148", "Benedikt"),
 (4386, 1193, "149", "Bistrica ob Sotli"),
@@ -2842,21 +2842,21 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (4389, 1193, "004", "Bohinj"),
 (4390, 1193, "005", "Borovnica"),
 (4391, 1193, "006", "Bovec"),
-(4392, 1193, "151", "Braslovce"),
+(4392, 1193, "151", "Braslovče"),
 (4393, 1193, "007", "Brda"),
 (4394, 1193, "008", "Brezovica"),
-(4395, 1193, "009", "Brezica"),
+(4395, 1193, "009", "Brežice"),
 (4396, 1193, "152", "Cankova"),
 (4397, 1193, "011", "Celje"),
 (4398, 1193, "012", "Cerklje na Gorenjskem"),
 (4399, 1193, "013", "Cerknica"),
 (4400, 1193, "014", "Cerkno"),
 (4401, 1193, "153", "Cerkvenjak"),
-(4402, 1193, "015", "Crensovci"),
-(4403, 1193, "016", "Crna na Koroskem"),
-(4404, 1193, "017", "Crnomelj"),
+(4402, 1193, "015", "Črenšovci"),
+(4403, 1193, "016", "Črna na Koroškem"),
+(4404, 1193, "017", "Črnomelj"),
 (4405, 1193, "018", "Destrnik"),
-(4406, 1193, "019", "Divaca"),
+(4406, 1193, "019", "Divača"),
 (4407, 1193, "154", "Dobje"),
 (4408, 1193, "020", "Dobrepolje"),
 (4409, 1193, "155", "Dobrna"),
@@ -2864,37 +2864,37 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (4411, 1193, "156", "Dobrovnik"),
 (4412, 1193, "022", "Dol pri Ljubljani"),
 (4413, 1193, "157", "Dolenjske Toplice"),
-(4414, 1193, "023", "Domzale"),
+(4414, 1193, "023", "Domžale"),
 (4415, 1193, "024", "Dornava"),
 (4416, 1193, "025", "Dravograd"),
 (4417, 1193, "026", "Duplek"),
 (4418, 1193, "027", "Gorenja vas-Poljane"),
-(4419, 1193, "028", "Gorsnica"),
+(4419, 1193, "028", "Gorišnica"),
 (4420, 1193, "029", "Gornja Radgona"),
 (4421, 1193, "030", "Gornji Grad"),
 (4422, 1193, "031", "Gornji Petrovci"),
 (4423, 1193, "158", "Grad"),
 (4424, 1193, "032", "Grosuplje"),
 (4425, 1193, "159", "Hajdina"),
-(4426, 1193, "160", "Hoce-Slivnica"),
-(4427, 1193, "161", "Hodos"),
-(4428, 1193, "162", "Jorjul"),
+(4426, 1193, "160", "Hoče-Slivnica"),
+(4427, 1193, "161", "Hodoš"),
+(4428, 1193, "162", "Horjul"),
 (4429, 1193, "034", "Hrastnik"),
 (4430, 1193, "035", "Hrpelje-Kozina"),
 (4431, 1193, "036", "Idrija"),
 (4432, 1193, "037", "Ig"),
-(4433, 1193, "038", "IIrska Bistrica"),
-(4434, 1193, "039", "Ivancna Gorica"),
+(4433, 1193, "038", "Ilirska Bistrica"),
+(4434, 1193, "039", "Ivančna Gorica"),
 (4435, 1193, "040", "Izola"),
 (4436, 1193, "041", "Jesenice"),
 (4437, 1193, "163", "Jezersko"),
-(4438, 1193, "042", "Jursinci"),
+(4438, 1193, "042", "Juršinci"),
 (4439, 1193, "043", "Kamnik"),
 (4440, 1193, "044", "Kanal"),
-(4441, 1193, "045", "Kidricevo"),
+(4441, 1193, "045", "Kidričevo"),
 (4442, 1193, "046", "Kobarid"),
 (4443, 1193, "047", "Kobilje"),
-(4444, 1193, "048", "Jovevje"),
+(4444, 1193, "048", "Kočevje"),
 (4445, 1193, "049", "Komen"),
 (4446, 1193, "164", "Komenda"),
 (4447, 1193, "050", "Koper"),
@@ -2902,11 +2902,11 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (4449, 1193, "051", "Kozje"),
 (4450, 1193, "052", "Kranj"),
 (4451, 1193, "053", "Kranjska Gora"),
-(4452, 1193, "166", "Krizevci"),
-(4453, 1193, "054", "Krsko"),
+(4452, 1193, "166", "Križevci"),
+(4453, 1193, "054", "Krško"),
 (4454, 1193, "055", "Kungota"),
 (4455, 1193, "056", "Kuzma"),
-(4456, 1193, "057", "Lasko"),
+(4456, 1193, "057", "Laško"),
 (4457, 1193, "058", "Lenart"),
 (4458, 1193, "059", "Lendava"),
 (4459, 1193, "060", "Litija"),
@@ -2914,23 +2914,23 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (4461, 1193, "062", "Ljubno"),
 (4462, 1193, "063", "Ljutomer"),
 (4463, 1193, "064", "Logatec"),
-(4464, 1193, "065", "Loska dolina"),
-(4465, 1193, "066", "Loski Potok"),
+(4464, 1193, "065", "Loška dolina"),
+(4465, 1193, "066", "Loški Potok"),
 (4466, 1193, "167", "Lovrenc na Pohorju"),
-(4467, 1193, "067", "Luce"),
+(4467, 1193, "067", "Luče"),
 (4468, 1193, "068", "Lukovica"),
-(4469, 1193, "069", "Majsperk"),
+(4469, 1193, "069", "Majšperk"),
 (4470, 1193, "070", "Maribor"),
 (4471, 1193, "168", "Markovci"),
 (4472, 1193, "071", "Medvode"),
-(4473, 1193, "072", "Menges"),
+(4473, 1193, "072", "Mengeš"),
 (4474, 1193, "073", "Metlika"),
-(4475, 1193, "074", "Mezica"),
-(4476, 1193, "169", "Miklavz na Dravskern polju"),
+(4475, 1193, "074", "Mežica"),
+(4476, 1193, "169", "Miklavž na Dravskem polju"),
 (4477, 1193, "075", "Miren-Kostanjevica"),
-(4478, 1193, "170", "Mirna Pec"),
+(4478, 1193, "170", "Mirna Peč"),
 (4479, 1193, "076", "Mislinja"),
-(4480, 1193, "077", "Moravce"),
+(4480, 1193, "077", "Moravče"),
 (4481, 1193, "078", "Moravske Toplice"),
 (4482, 1193, "079", "Mozirje"),
 (4483, 1193, "080", "Murska Sobota"),
@@ -2938,37 +2938,37 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (4485, 1193, "082", "Naklo"),
 (4486, 1193, "083", "Nazarje"),
 (4487, 1193, "084", "Nova Gorica"),
-(4488, 1193, "085", "Nova mesto"),
+(4488, 1193, "085", "Novo mesto"),
 (4489, 1193, "181", "Sveta Ana"),
-(4490, 1193, "182", "Sveti Andraz v Slovenskih goricah"),
+(4490, 1193, "182", "Sveti Andraž v Slovenskih goricah"),
 (4491, 1193, "116", "Sveti Jurij"),
-(4492, 1193, "033", "Salovci"),
-(4493, 1193, "183", "Sempeter-Vrtojba"),
-(4494, 1193, "117", "Sencur"),
-(4495, 1193, "118", "Sentilj"),
-(4496, 1193, "119", "Sentjernej"),
-(4497, 1193, "120", "Sentjur pri Celju"),
-(4498, 1193, "121", "Skocjan"),
-(4499, 1193, "122", "Skofja Loka"),
-(4500, 1193, "123", "Skoftjica"),
-(4501, 1193, "124", "Smarje pri Jelsah"),
-(4502, 1193, "125", "Smartno ob Paki"),
-(4503, 1193, "194", "Smartno pri Litiji"),
-(4504, 1193, "126", "Sostanj"),
-(4505, 1193, "127", "Store"),
+(4492, 1193, "033", "Å alovci"),
+(4493, 1193, "183", "Å empeter-Vrtojba"),
+(4494, 1193, "117", "Šenčur"),
+(4495, 1193, "118", "Å entilj"),
+(4496, 1193, "119", "Å entjernej"),
+(4497, 1193, "120", "Å entjur"),
+(4498, 1193, "121", "Å kocjan"),
+(4499, 1193, "122", "Å kofja Loka"),
+(4500, 1193, "123", "Å kofljica"),
+(4501, 1193, "124", "Šmarje pri Jelšah"),
+(4502, 1193, "125", "Å martno ob Paki"),
+(4503, 1193, "194", "Å martno pri Litiji"),
+(4504, 1193, "126", "Šoštanj"),
+(4505, 1193, "127", "Å tore"),
 (4506, 1193, "184", "Tabor"),
-(4507, 1193, "010", "Tisina"),
+(4507, 1193, "010", "Tišina"),
 (4508, 1193, "128", "Tolmin"),
-(4509, 1193, "129", "Trbovje"),
+(4509, 1193, "129", "Trbovlje"),
 (4510, 1193, "130", "Trebnje"),
 (4511, 1193, "185", "Trnovska vas"),
-(4512, 1193, "131", "Trzic"),
+(4512, 1193, "131", "Tržič"),
 (4513, 1193, "186", "Trzin"),
-(4514, 1193, "132", "Turnisce"),
+(4514, 1193, "132", "Turnišče"),
 (4515, 1193, "133", "Velenje"),
 (4516, 1193, "187", "Velika Polana"),
-(4517, 1193, "134", "Velika Lasce"),
-(4518, 1193, "188", "Verzej"),
+(4517, 1193, "134", "Velike Lašče"),
+(4518, 1193, "188", "Veržej"),
 (4519, 1193, "135", "Videm"),
 (4520, 1193, "136", "Vipava"),
 (4521, 1193, "137", "Vitanje"),
@@ -2977,14 +2977,14 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (4524, 1193, "140", "Vrhnika"),
 (4525, 1193, "141", "Vuzenica"),
 (4526, 1193, "142", "Zagorje ob Savi"),
-(4527, 1193, "143", "Zavrc"),
-(4528, 1193, "144", "Zrece"),
-(4529, 1193, "190", "Zalec"),
-(4530, 1193, "146", "Zelezniki"),
-(4531, 1193, "191", "Zetale"),
-(4532, 1193, "147", "Ziri"),
-(4533, 1193, "192", "Zirovnica"),
-(4534, 1193, "193", "Zuzemberk"),
+(4527, 1193, "143", "Zavrč"),
+(4528, 1193, "144", "Zreče"),
+(4529, 1193, "190", "Žalec"),
+(4530, 1193, "146", "Železniki"),
+(4531, 1193, "191", "Žetale"),
+(4532, 1193, "147", "Žiri"),
+(4533, 1193, "192", "Žirovnica"),
+(4534, 1193, "193", "Žužemberk"),
 (4535, 1192, "BC", "Banskobystrický kraj"),
 (4536, 1192, "BL", "Bratislavský kraj"),
 (4537, 1192, "KI", "Košický kraj"),
-- 
2.25.1