CRM-21337 ISO compliance for Romanian counties

diff --git a/CRM/Upgrade/Incremental/sql/4.7.28.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.28.mysql.tpl
index 20f613a99ef557f685bb7697a6ac1552345cef8b..432a1628be473ec664512e2be5338f62edaea99f 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.7.28.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.28.mysql.tpl
@@ -25,3 +25,27 @@
   (NULL, 1018, "09", "Saint Peter"),
   (NULL, 1018, "10", "Saint Philip"),
   (NULL, 1018, "11", "Saint Thomas");
+
+-- CRM-21337 ISO compliance for Romanian and Bulgarian counties
+UPDATE `civicrm_state_province` SET `name` = 'Argeș' WHERE `name` = 'Arges' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Bacău' WHERE `name` = 'Bacau' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Bistrița-Năsăud' WHERE `name` = 'Bistrita-Nasaud' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Botoșani' WHERE `name` = 'Boto\'ani' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Brașov' WHERE `name` = 'Bra\'ov' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Brăila' WHERE `name` = 'Braila' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Buzău' WHERE `name` = 'Buzau' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Caraș-Severin' WHERE `name` = 'Caras-Severin' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Călărași' WHERE `name` = 'Ca la ras\'i' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Constanța' WHERE `name` = 'Constant\'a' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Dâmbovița' WHERE `name` = 'Dambovit\'a' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Galați' WHERE `name` = 'Galat\'i' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Ialomița' WHERE `name` = 'Ialomit\'a' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Iași' WHERE `name` = 'Ias\'i' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Maramureș' WHERE `name` = 'Maramures' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Mehedinți' WHERE `name` = 'Mehedint\'i' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Mureș' WHERE `name` = 'Mures' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Neamț' WHERE `name` = 'Neamt' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Sălaj' WHERE `name` = 'Sa laj' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Timiș' WHERE `name` = 'Timis' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Vâlcea' WHERE `name` = 'Valcea' AND `country_id` = 1176;
+UPDATE `civicrm_state_province` SET `name` = 'Pazardzhik' WHERE `name` = 'Pazardzik' AND `country_id` = 1033;

diff --git a/xml/templates/civicrm_state_province.tpl b/xml/templates/civicrm_state_province.tpl
index f334372e03d0e520da6bae3054d67d245d1a8728..16c6e23734a01200cac9361b747df451035c82b3 100644 (file)
--- a/xml/templates/civicrm_state_province.tpl
+++ b/xml/templates/civicrm_state_province.tpl
@@ -501,7 +501,7 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (1847, 1033, "10", "Kyustendil"),
 (1848, 1033, "11", "Lovech"),
 (1849, 1033, "12", "Montana"),
-(1850, 1033, "13", "Pazardzik"),
+(1850, 1033, "13", "Pazardzhik"),
 (1851, 1033, "14", "Pernik"),
 (1852, 1033, "15", "Pleven"),
 (1853, 1033, "16", "Plovdiv"),
@@ -2628,44 +2628,44 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (4172, 1176, "B", "Bucuresti"),
 (4173, 1176, "AB", "Alba"),
 (4174, 1176, "AR", "Arad"),
-(4175, 1176, "AG", "Arges"),
-(4176, 1176, "BC", "Bacau"),
+(4175, 1176, "AG", "Argeș"),
+(4176, 1176, "BC", "Bacău"),
 (4177, 1176, "BH", "Bihor"),
-(4178, 1176, "BN", "Bistrita-Nasaud"),
-(4179, 1176, "BT", "Boto\'ani"),
-(4180, 1176, "BV", "Bra\'ov"),
-(4181, 1176, "BR", "Braila"),
-(4182, 1176, "BZ", "Buzau"),
-(4183, 1176, "CS", "Caras-Severin"),
-(4184, 1176, "CL", "Ca la ras\'i"),
+(4178, 1176, "BN", "Bistrița-Năsăud"),
+(4179, 1176, "BT", "Botoșani"),
+(4180, 1176, "BV", "Brașov"),
+(4181, 1176, "BR", "Brăila"),
+(4182, 1176, "BZ", "Buzău"),
+(4183, 1176, "CS", "Caraș-Severin"),
+(4184, 1176, "CL", "Călărași"),
 (4185, 1176, "CJ", "Cluj"),
-(4186, 1176, "CT", "Constant\'a"),
+(4186, 1176, "CT", "Constanța"),
 (4187, 1176, "CV", "Covasna"),
-(4188, 1176, "DB", "Dambovit\'a"),
+(4188, 1176, "DB", "Dâmbovița"),
 (4189, 1176, "DJ", "Dolj"),
-(4190, 1176, "GL", "Galat\'i"),
+(4190, 1176, "GL", "Galați"),
 (4191, 1176, "GR", "Giurgiu"),
 (4192, 1176, "GJ", "Gorj"),
 (4193, 1176, "HR", "Harghita"),
 (4194, 1176, "HD", "Hunedoara"),
-(4195, 1176, "IL", "Ialomit\'a"),
-(4196, 1176, "IS", "Ias\'i"),
+(4195, 1176, "IL", "Ialomița"),
+(4196, 1176, "IS", "Iași"),
 (4197, 1176, "IF", "Ilfov"),
-(4198, 1176, "MM", "Maramures"),
-(4199, 1176, "MH", "Mehedint\'i"),
-(4200, 1176, "MS", "Mures"),
-(4201, 1176, "NT", "Neamt"),
+(4198, 1176, "MM", "Maramureș"),
+(4199, 1176, "MH", "Mehedinți"),
+(4200, 1176, "MS", "Mureș"),
+(4201, 1176, "NT", "Neamț"),
 (4202, 1176, "OT", "Olt"),
 (4203, 1176, "PH", "Prahova"),
 (4204, 1176, "SM", "Satu Mare"),
-(4205, 1176, "SJ", "Sa laj"),
+(4205, 1176, "SJ", "Sălaj"),
 (4206, 1176, "SB", "Sibiu"),
 (4207, 1176, "SV", "Suceava"),
 (4208, 1176, "TR", "Teleorman"),
-(4209, 1176, "TM", "Timis"),
+(4209, 1176, "TM", "Timiș"),
 (4210, 1176, "TL", "Tulcea"),
 (4211, 1176, "VS", "Vaslui"),
-(4212, 1176, "VL", "Valcea"),
+(4212, 1176, "VL", "Vâlcea"),
 (4213, 1176, "VN", "Vrancea"),
 (4214, 1177, "AD", "Adygeya, Respublika"),
 (4215, 1177, "AL", "Altay, Respublika"),