From 35391fd08dc9d7104e451d4daf751d0aa7861132 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Sun, 1 Dec 2019 08:15:58 +1100 Subject: [PATCH] Update the name of Macedonia, Republic of to North Macedonia following ISO 3166-1 update --- CRM/Upgrade/Incremental/sql/5.21.alpha1.mysql.tpl | 3 +++ sql/civicrm_generated.mysql | 2 +- xml/templates/civicrm_country.tpl | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CRM/Upgrade/Incremental/sql/5.21.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.21.alpha1.mysql.tpl index 074caab42d48..36fc00d302eb 100644 --- a/CRM/Upgrade/Incremental/sql/5.21.alpha1.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/5.21.alpha1.mysql.tpl @@ -1 +1,4 @@ {* file to handle db changes in 5.21.alpha1 during upgrade *} + +-- dev/core#1166 Update Republic of Macedonia name following ISO 3166-1 change +UPDATE civicrm_country SET name = 'North Macedonia' WHERE name = 'Macedonia, Republic of'; diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql index e2271d833a40..14210d653e8f 100644 --- a/sql/civicrm_generated.mysql +++ b/sql/civicrm_generated.mysql @@ -285,7 +285,7 @@ UNLOCK TABLES; LOCK TABLES `civicrm_country` WRITE; /*!40000 ALTER TABLE `civicrm_country` DISABLE KEYS */; -INSERT INTO `civicrm_country` (`id`, `name`, `iso_code`, `country_code`, `address_format_id`, `idd_prefix`, `ndd_prefix`, `region_id`, `is_province_abbreviated`) VALUES (1001,'Afghanistan','AF',NULL,NULL,NULL,NULL,4,0),(1002,'Albania','AL',NULL,NULL,NULL,NULL,1,0),(1003,'Algeria','DZ',NULL,NULL,NULL,NULL,3,0),(1004,'American Samoa','AS',NULL,NULL,NULL,NULL,2,0),(1005,'Andorra','AD',NULL,NULL,NULL,NULL,1,0),(1006,'Angola','AO',NULL,NULL,NULL,NULL,5,0),(1007,'Anguilla','AI',NULL,NULL,NULL,NULL,2,0),(1008,'Antarctica','AQ',NULL,NULL,NULL,NULL,1,0),(1009,'Antigua and Barbuda','AG',NULL,NULL,NULL,NULL,2,0),(1010,'Argentina','AR',NULL,NULL,NULL,NULL,2,0),(1011,'Armenia','AM',NULL,NULL,NULL,NULL,1,0),(1012,'Aruba','AW',NULL,NULL,NULL,NULL,2,0),(1013,'Australia','AU',NULL,NULL,NULL,NULL,4,0),(1014,'Austria','AT',NULL,NULL,NULL,NULL,1,0),(1015,'Azerbaijan','AZ',NULL,NULL,NULL,NULL,1,0),(1016,'Bahrain','BH',NULL,NULL,NULL,NULL,3,0),(1017,'Bangladesh','BD',NULL,NULL,NULL,NULL,4,0),(1018,'Barbados','BB',NULL,NULL,NULL,NULL,4,0),(1019,'Belarus','BY',NULL,NULL,NULL,NULL,1,0),(1020,'Belgium','BE',NULL,NULL,NULL,NULL,1,0),(1021,'Belize','BZ',NULL,NULL,NULL,NULL,2,0),(1022,'Benin','BJ',NULL,NULL,NULL,NULL,5,0),(1023,'Bermuda','BM',NULL,NULL,NULL,NULL,2,0),(1024,'Bhutan','BT',NULL,NULL,NULL,NULL,4,0),(1025,'Bolivia','BO',NULL,NULL,NULL,NULL,2,0),(1026,'Bosnia and Herzegovina','BA',NULL,NULL,NULL,NULL,1,0),(1027,'Botswana','BW',NULL,NULL,NULL,NULL,5,0),(1028,'Bouvet Island','BV',NULL,NULL,NULL,NULL,1,0),(1029,'Brazil','BR',NULL,NULL,NULL,NULL,2,0),(1030,'British Indian Ocean Territory','IO',NULL,NULL,NULL,NULL,4,0),(1031,'Virgin Islands, British','VG',NULL,NULL,NULL,NULL,2,0),(1032,'Brunei Darussalam','BN',NULL,NULL,NULL,NULL,4,0),(1033,'Bulgaria','BG',NULL,NULL,NULL,NULL,1,0),(1034,'Burkina Faso','BF',NULL,NULL,NULL,NULL,5,0),(1035,'Myanmar','MM',NULL,NULL,NULL,NULL,4,0),(1036,'Burundi','BI',NULL,NULL,NULL,NULL,5,0),(1037,'Cambodia','KH',NULL,NULL,NULL,NULL,4,0),(1038,'Cameroon','CM',NULL,NULL,NULL,NULL,5,0),(1039,'Canada','CA',NULL,NULL,NULL,NULL,2,1),(1040,'Cape Verde','CV',NULL,NULL,NULL,NULL,5,0),(1041,'Cayman Islands','KY',NULL,NULL,NULL,NULL,5,0),(1042,'Central African Republic','CF',NULL,NULL,NULL,NULL,5,0),(1043,'Chad','TD',NULL,NULL,NULL,NULL,5,0),(1044,'Chile','CL',NULL,NULL,NULL,NULL,2,0),(1045,'China','CN',NULL,NULL,NULL,NULL,4,0),(1046,'Christmas Island','CX',NULL,NULL,NULL,NULL,4,0),(1047,'Cocos (Keeling) Islands','CC',NULL,NULL,NULL,NULL,4,0),(1048,'Colombia','CO',NULL,NULL,NULL,NULL,2,0),(1049,'Comoros','KM',NULL,NULL,NULL,NULL,5,0),(1050,'Congo, The Democratic Republic of the','CD',NULL,NULL,NULL,NULL,5,0),(1051,'Congo, Republic of the','CG',NULL,NULL,NULL,NULL,5,0),(1052,'Cook Islands','CK',NULL,NULL,NULL,NULL,4,0),(1053,'Costa Rica','CR',NULL,NULL,NULL,NULL,2,0),(1054,'Côte d’Ivoire','CI',NULL,NULL,NULL,NULL,5,0),(1055,'Croatia','HR',NULL,NULL,NULL,NULL,1,0),(1056,'Cuba','CU',NULL,NULL,NULL,NULL,2,0),(1057,'Cyprus','CY',NULL,NULL,NULL,NULL,1,0),(1058,'Czech Republic','CZ',NULL,NULL,NULL,NULL,1,0),(1059,'Denmark','DK',NULL,NULL,NULL,NULL,1,0),(1060,'Djibouti','DJ',NULL,NULL,NULL,NULL,5,0),(1061,'Dominica','DM',NULL,NULL,NULL,NULL,2,0),(1062,'Dominican Republic','DO',NULL,NULL,NULL,NULL,2,0),(1063,'Timor-Leste','TL',NULL,NULL,NULL,NULL,4,0),(1064,'Ecuador','EC',NULL,NULL,NULL,NULL,2,0),(1065,'Egypt','EG',NULL,NULL,NULL,NULL,3,0),(1066,'El Salvador','SV',NULL,NULL,NULL,NULL,2,0),(1067,'Equatorial Guinea','GQ',NULL,NULL,NULL,NULL,5,0),(1068,'Eritrea','ER',NULL,NULL,NULL,NULL,5,0),(1069,'Estonia','EE',NULL,NULL,NULL,NULL,1,0),(1070,'Ethiopia','ET',NULL,NULL,NULL,NULL,5,0),(1072,'Falkland Islands (Malvinas)','FK',NULL,NULL,NULL,NULL,2,0),(1073,'Faroe Islands','FO',NULL,NULL,NULL,NULL,1,0),(1074,'Fiji','FJ',NULL,NULL,NULL,NULL,4,0),(1075,'Finland','FI',NULL,NULL,NULL,NULL,1,0),(1076,'France','FR',NULL,NULL,NULL,NULL,1,0),(1077,'French Guiana','GF',NULL,NULL,NULL,NULL,2,0),(1078,'French Polynesia','PF',NULL,NULL,NULL,NULL,4,0),(1079,'French Southern Territories','TF',NULL,NULL,NULL,NULL,1,0),(1080,'Gabon','GA',NULL,NULL,NULL,NULL,5,0),(1081,'Georgia','GE',NULL,NULL,NULL,NULL,3,0),(1082,'Germany','DE',NULL,NULL,NULL,NULL,1,0),(1083,'Ghana','GH',NULL,NULL,NULL,NULL,5,0),(1084,'Gibraltar','GI',NULL,NULL,NULL,NULL,1,0),(1085,'Greece','GR',NULL,NULL,NULL,NULL,1,0),(1086,'Greenland','GL',NULL,NULL,NULL,NULL,2,0),(1087,'Grenada','GD',NULL,NULL,NULL,NULL,2,0),(1088,'Guadeloupe','GP',NULL,NULL,NULL,NULL,2,0),(1089,'Guam','GU',NULL,NULL,NULL,NULL,4,0),(1090,'Guatemala','GT',NULL,NULL,NULL,NULL,2,0),(1091,'Guinea','GN',NULL,NULL,NULL,NULL,5,0),(1092,'Guinea-Bissau','GW',NULL,NULL,NULL,NULL,5,0),(1093,'Guyana','GY',NULL,NULL,NULL,NULL,2,0),(1094,'Haiti','HT',NULL,NULL,NULL,NULL,2,0),(1095,'Heard Island and McDonald Islands','HM',NULL,NULL,NULL,NULL,4,0),(1096,'Holy See (Vatican City State)','VA',NULL,NULL,NULL,NULL,1,0),(1097,'Honduras','HN',NULL,NULL,NULL,NULL,2,0),(1098,'Hong Kong','HK',NULL,NULL,NULL,NULL,4,0),(1099,'Hungary','HU',NULL,NULL,NULL,NULL,1,0),(1100,'Iceland','IS',NULL,NULL,NULL,NULL,1,0),(1101,'India','IN',NULL,NULL,NULL,NULL,4,0),(1102,'Indonesia','ID',NULL,NULL,NULL,NULL,4,0),(1103,'Iran, Islamic Republic of','IR',NULL,NULL,NULL,NULL,3,0),(1104,'Iraq','IQ',NULL,NULL,NULL,NULL,3,0),(1105,'Ireland','IE',NULL,NULL,NULL,NULL,1,0),(1106,'Israel','IL',NULL,NULL,NULL,NULL,3,0),(1107,'Italy','IT',NULL,NULL,NULL,NULL,1,0),(1108,'Jamaica','JM',NULL,NULL,NULL,NULL,2,0),(1109,'Japan','JP',NULL,NULL,NULL,NULL,4,0),(1110,'Jordan','JO',NULL,NULL,NULL,NULL,3,0),(1111,'Kazakhstan','KZ',NULL,NULL,NULL,NULL,1,0),(1112,'Kenya','KE',NULL,NULL,NULL,NULL,5,0),(1113,'Kiribati','KI',NULL,NULL,NULL,NULL,4,0),(1114,'Korea, Democratic People\'s Republic of','KP',NULL,NULL,NULL,NULL,4,0),(1115,'Korea, Republic of','KR',NULL,NULL,NULL,NULL,4,0),(1116,'Kuwait','KW',NULL,NULL,NULL,NULL,3,0),(1117,'Kyrgyzstan','KG',NULL,NULL,NULL,NULL,1,0),(1118,'Lao People\'s Democratic Republic','LA',NULL,NULL,NULL,NULL,4,0),(1119,'Latvia','LV',NULL,NULL,NULL,NULL,1,0),(1120,'Lebanon','LB',NULL,NULL,NULL,NULL,3,0),(1121,'Lesotho','LS',NULL,NULL,NULL,NULL,5,0),(1122,'Liberia','LR',NULL,NULL,NULL,NULL,5,0),(1123,'Libya','LY',NULL,NULL,NULL,NULL,3,0),(1124,'Liechtenstein','LI',NULL,NULL,NULL,NULL,1,0),(1125,'Lithuania','LT',NULL,NULL,NULL,NULL,1,0),(1126,'Luxembourg','LU',NULL,NULL,NULL,NULL,1,0),(1127,'Macao','MO',NULL,NULL,NULL,NULL,4,0),(1128,'Macedonia, Republic of','MK',NULL,NULL,NULL,NULL,1,0),(1129,'Madagascar','MG',NULL,NULL,NULL,NULL,5,0),(1130,'Malawi','MW',NULL,NULL,NULL,NULL,5,0),(1131,'Malaysia','MY',NULL,NULL,NULL,NULL,4,0),(1132,'Maldives','MV',NULL,NULL,NULL,NULL,4,0),(1133,'Mali','ML',NULL,NULL,NULL,NULL,5,0),(1134,'Malta','MT',NULL,NULL,NULL,NULL,1,0),(1135,'Marshall Islands','MH',NULL,NULL,NULL,NULL,4,0),(1136,'Martinique','MQ',NULL,NULL,NULL,NULL,2,0),(1137,'Mauritania','MR',NULL,NULL,NULL,NULL,5,0),(1138,'Mauritius','MU',NULL,NULL,NULL,NULL,5,0),(1139,'Mayotte','YT',NULL,NULL,NULL,NULL,5,0),(1140,'Mexico','MX',NULL,NULL,NULL,NULL,2,0),(1141,'Micronesia, Federated States of','FM',NULL,NULL,NULL,NULL,4,0),(1142,'Moldova','MD',NULL,NULL,NULL,NULL,1,0),(1143,'Monaco','MC',NULL,NULL,NULL,NULL,1,0),(1144,'Mongolia','MN',NULL,NULL,NULL,NULL,4,0),(1145,'Montserrat','MS',NULL,NULL,NULL,NULL,2,0),(1146,'Morocco','MA',NULL,NULL,NULL,NULL,3,0),(1147,'Mozambique','MZ',NULL,NULL,NULL,NULL,5,0),(1148,'Namibia','NA',NULL,NULL,NULL,NULL,5,0),(1149,'Nauru','NR',NULL,NULL,NULL,NULL,4,0),(1150,'Nepal','NP',NULL,NULL,NULL,NULL,4,0),(1152,'Netherlands','NL',NULL,NULL,NULL,NULL,1,0),(1153,'New Caledonia','NC',NULL,NULL,NULL,NULL,4,0),(1154,'New Zealand','NZ',NULL,NULL,NULL,NULL,4,0),(1155,'Nicaragua','NI',NULL,NULL,NULL,NULL,2,0),(1156,'Niger','NE',NULL,NULL,NULL,NULL,5,0),(1157,'Nigeria','NG',NULL,NULL,NULL,NULL,5,0),(1158,'Niue','NU',NULL,NULL,NULL,NULL,4,0),(1159,'Norfolk Island','NF',NULL,NULL,NULL,NULL,4,0),(1160,'Northern Mariana Islands','MP',NULL,NULL,NULL,NULL,2,0),(1161,'Norway','NO',NULL,NULL,NULL,NULL,1,0),(1162,'Oman','OM',NULL,NULL,NULL,NULL,3,0),(1163,'Pakistan','PK',NULL,NULL,NULL,NULL,4,0),(1164,'Palau','PW',NULL,NULL,NULL,NULL,4,0),(1165,'Palestine, State of','PS',NULL,NULL,NULL,NULL,3,0),(1166,'Panama','PA',NULL,NULL,NULL,NULL,2,0),(1167,'Papua New Guinea','PG',NULL,NULL,NULL,NULL,4,0),(1168,'Paraguay','PY',NULL,NULL,NULL,NULL,2,0),(1169,'Peru','PE',NULL,NULL,NULL,NULL,2,0),(1170,'Philippines','PH',NULL,NULL,NULL,NULL,4,0),(1171,'Pitcairn','PN',NULL,NULL,NULL,NULL,4,0),(1172,'Poland','PL',NULL,NULL,NULL,NULL,1,0),(1173,'Portugal','PT',NULL,NULL,NULL,NULL,1,0),(1174,'Puerto Rico','PR',NULL,NULL,NULL,NULL,2,0),(1175,'Qatar','QA',NULL,NULL,NULL,NULL,3,0),(1176,'Romania','RO',NULL,NULL,NULL,NULL,1,0),(1177,'Russian Federation','RU',NULL,NULL,NULL,NULL,1,0),(1178,'Rwanda','RW',NULL,NULL,NULL,NULL,5,0),(1179,'Reunion','RE',NULL,NULL,NULL,NULL,5,0),(1180,'Saint Helena','SH',NULL,NULL,NULL,NULL,5,0),(1181,'Saint Kitts and Nevis','KN',NULL,NULL,NULL,NULL,2,0),(1182,'Saint Lucia','LC',NULL,NULL,NULL,NULL,2,0),(1183,'Saint Pierre and Miquelon','PM',NULL,NULL,NULL,NULL,2,0),(1184,'Saint Vincent and the Grenadines','VC',NULL,NULL,NULL,NULL,2,0),(1185,'Samoa','WS',NULL,NULL,NULL,NULL,4,0),(1186,'San Marino','SM',NULL,NULL,NULL,NULL,1,0),(1187,'Saudi Arabia','SA',NULL,NULL,NULL,NULL,3,0),(1188,'Senegal','SN',NULL,NULL,NULL,NULL,5,0),(1189,'Seychelles','SC',NULL,NULL,NULL,NULL,5,0),(1190,'Sierra Leone','SL',NULL,NULL,NULL,NULL,5,0),(1191,'Singapore','SG',NULL,NULL,NULL,NULL,4,0),(1192,'Slovakia','SK',NULL,NULL,NULL,NULL,1,0),(1193,'Slovenia','SI',NULL,NULL,NULL,NULL,1,0),(1194,'Solomon Islands','SB',NULL,NULL,NULL,NULL,4,0),(1195,'Somalia','SO',NULL,NULL,NULL,NULL,5,0),(1196,'South Africa','ZA',NULL,NULL,NULL,NULL,5,0),(1197,'South Georgia and the South Sandwich Islands','GS',NULL,NULL,NULL,NULL,2,0),(1198,'Spain','ES',NULL,NULL,NULL,NULL,1,0),(1199,'Sri Lanka','LK',NULL,NULL,NULL,NULL,4,0),(1200,'Sudan','SD',NULL,NULL,NULL,NULL,3,0),(1201,'Suriname','SR',NULL,NULL,NULL,NULL,2,0),(1202,'Svalbard and Jan Mayen','SJ',NULL,NULL,NULL,NULL,1,0),(1203,'Eswatini','SZ',NULL,NULL,NULL,NULL,5,0),(1204,'Sweden','SE',NULL,NULL,NULL,NULL,1,0),(1205,'Switzerland','CH',NULL,NULL,NULL,NULL,1,0),(1206,'Syrian Arab Republic','SY',NULL,NULL,NULL,NULL,3,0),(1207,'Sao Tome and Principe','ST',NULL,NULL,NULL,NULL,5,0),(1208,'Taiwan','TW',NULL,NULL,NULL,NULL,4,0),(1209,'Tajikistan','TJ',NULL,NULL,NULL,NULL,3,0),(1210,'Tanzania, United Republic of','TZ',NULL,NULL,NULL,NULL,5,0),(1211,'Thailand','TH',NULL,NULL,NULL,NULL,4,0),(1212,'Bahamas','BS',NULL,NULL,NULL,NULL,2,0),(1213,'Gambia','GM',NULL,NULL,NULL,NULL,5,0),(1214,'Togo','TG',NULL,NULL,NULL,NULL,5,0),(1215,'Tokelau','TK',NULL,NULL,NULL,NULL,4,0),(1216,'Tonga','TO',NULL,NULL,NULL,NULL,4,0),(1217,'Trinidad and Tobago','TT',NULL,NULL,NULL,NULL,2,0),(1218,'Tunisia','TN',NULL,NULL,NULL,NULL,3,0),(1219,'Turkey','TR',NULL,NULL,NULL,NULL,1,0),(1220,'Turkmenistan','TM',NULL,NULL,NULL,NULL,1,0),(1221,'Turks and Caicos Islands','TC',NULL,NULL,NULL,NULL,2,0),(1222,'Tuvalu','TV',NULL,NULL,NULL,NULL,4,0),(1223,'Uganda','UG',NULL,NULL,NULL,NULL,5,0),(1224,'Ukraine','UA',NULL,NULL,NULL,NULL,1,0),(1225,'United Arab Emirates','AE',NULL,NULL,NULL,NULL,3,0),(1226,'United Kingdom','GB',NULL,NULL,NULL,NULL,1,0),(1227,'United States Minor Outlying Islands','UM',NULL,NULL,NULL,NULL,2,0),(1228,'United States','US',NULL,NULL,NULL,NULL,2,1),(1229,'Uruguay','UY',NULL,NULL,NULL,NULL,2,0),(1230,'Uzbekistan','UZ',NULL,NULL,NULL,NULL,1,0),(1231,'Vanuatu','VU',NULL,NULL,NULL,NULL,4,0),(1232,'Venezuela','VE',NULL,NULL,NULL,NULL,2,0),(1233,'Viet Nam','VN',NULL,NULL,NULL,NULL,4,0),(1234,'Virgin Islands, U.S.','VI',NULL,NULL,NULL,NULL,2,0),(1235,'Wallis and Futuna','WF',NULL,NULL,NULL,NULL,4,0),(1236,'Western Sahara','EH',NULL,NULL,NULL,NULL,3,0),(1237,'Yemen','YE',NULL,NULL,NULL,NULL,3,0),(1238,'Serbia and Montenegro','CS',NULL,NULL,NULL,NULL,1,0),(1239,'Zambia','ZM',NULL,NULL,NULL,NULL,5,0),(1240,'Zimbabwe','ZW',NULL,NULL,NULL,NULL,5,0),(1241,'Åland Islands','AX',NULL,NULL,NULL,NULL,1,0),(1242,'Serbia','RS',NULL,NULL,NULL,NULL,1,0),(1243,'Montenegro','ME',NULL,NULL,NULL,NULL,1,0),(1244,'Jersey','JE',NULL,NULL,NULL,NULL,99,0),(1245,'Guernsey','GG',NULL,NULL,NULL,NULL,99,0),(1246,'Isle of Man','IM',NULL,NULL,NULL,NULL,99,0),(1247,'South Sudan','SS',NULL,NULL,NULL,NULL,5,0),(1248,'Curaçao','CW',NULL,NULL,NULL,NULL,2,0),(1249,'Sint Maarten (Dutch Part)','SX',NULL,NULL,NULL,NULL,2,0),(1250,'Bonaire, Saint Eustatius and Saba','BQ',NULL,NULL,NULL,NULL,2,0),(1251,'Kosovo','XK',NULL,NULL,NULL,NULL,1,0),(1252,'Saint Barthélemy','BL',NULL,NULL,NULL,NULL,2,0),(1253,'Saint Martin (French part)','MF',NULL,NULL,NULL,NULL,2,0); +INSERT INTO `civicrm_country` (`id`, `name`, `iso_code`, `country_code`, `address_format_id`, `idd_prefix`, `ndd_prefix`, `region_id`, `is_province_abbreviated`) VALUES (1001,'Afghanistan','AF',NULL,NULL,NULL,NULL,4,0),(1002,'Albania','AL',NULL,NULL,NULL,NULL,1,0),(1003,'Algeria','DZ',NULL,NULL,NULL,NULL,3,0),(1004,'American Samoa','AS',NULL,NULL,NULL,NULL,2,0),(1005,'Andorra','AD',NULL,NULL,NULL,NULL,1,0),(1006,'Angola','AO',NULL,NULL,NULL,NULL,5,0),(1007,'Anguilla','AI',NULL,NULL,NULL,NULL,2,0),(1008,'Antarctica','AQ',NULL,NULL,NULL,NULL,1,0),(1009,'Antigua and Barbuda','AG',NULL,NULL,NULL,NULL,2,0),(1010,'Argentina','AR',NULL,NULL,NULL,NULL,2,0),(1011,'Armenia','AM',NULL,NULL,NULL,NULL,1,0),(1012,'Aruba','AW',NULL,NULL,NULL,NULL,2,0),(1013,'Australia','AU',NULL,NULL,NULL,NULL,4,0),(1014,'Austria','AT',NULL,NULL,NULL,NULL,1,0),(1015,'Azerbaijan','AZ',NULL,NULL,NULL,NULL,1,0),(1016,'Bahrain','BH',NULL,NULL,NULL,NULL,3,0),(1017,'Bangladesh','BD',NULL,NULL,NULL,NULL,4,0),(1018,'Barbados','BB',NULL,NULL,NULL,NULL,4,0),(1019,'Belarus','BY',NULL,NULL,NULL,NULL,1,0),(1020,'Belgium','BE',NULL,NULL,NULL,NULL,1,0),(1021,'Belize','BZ',NULL,NULL,NULL,NULL,2,0),(1022,'Benin','BJ',NULL,NULL,NULL,NULL,5,0),(1023,'Bermuda','BM',NULL,NULL,NULL,NULL,2,0),(1024,'Bhutan','BT',NULL,NULL,NULL,NULL,4,0),(1025,'Bolivia','BO',NULL,NULL,NULL,NULL,2,0),(1026,'Bosnia and Herzegovina','BA',NULL,NULL,NULL,NULL,1,0),(1027,'Botswana','BW',NULL,NULL,NULL,NULL,5,0),(1028,'Bouvet Island','BV',NULL,NULL,NULL,NULL,1,0),(1029,'Brazil','BR',NULL,NULL,NULL,NULL,2,0),(1030,'British Indian Ocean Territory','IO',NULL,NULL,NULL,NULL,4,0),(1031,'Virgin Islands, British','VG',NULL,NULL,NULL,NULL,2,0),(1032,'Brunei Darussalam','BN',NULL,NULL,NULL,NULL,4,0),(1033,'Bulgaria','BG',NULL,NULL,NULL,NULL,1,0),(1034,'Burkina Faso','BF',NULL,NULL,NULL,NULL,5,0),(1035,'Myanmar','MM',NULL,NULL,NULL,NULL,4,0),(1036,'Burundi','BI',NULL,NULL,NULL,NULL,5,0),(1037,'Cambodia','KH',NULL,NULL,NULL,NULL,4,0),(1038,'Cameroon','CM',NULL,NULL,NULL,NULL,5,0),(1039,'Canada','CA',NULL,NULL,NULL,NULL,2,1),(1040,'Cape Verde','CV',NULL,NULL,NULL,NULL,5,0),(1041,'Cayman Islands','KY',NULL,NULL,NULL,NULL,5,0),(1042,'Central African Republic','CF',NULL,NULL,NULL,NULL,5,0),(1043,'Chad','TD',NULL,NULL,NULL,NULL,5,0),(1044,'Chile','CL',NULL,NULL,NULL,NULL,2,0),(1045,'China','CN',NULL,NULL,NULL,NULL,4,0),(1046,'Christmas Island','CX',NULL,NULL,NULL,NULL,4,0),(1047,'Cocos (Keeling) Islands','CC',NULL,NULL,NULL,NULL,4,0),(1048,'Colombia','CO',NULL,NULL,NULL,NULL,2,0),(1049,'Comoros','KM',NULL,NULL,NULL,NULL,5,0),(1050,'Congo, The Democratic Republic of the','CD',NULL,NULL,NULL,NULL,5,0),(1051,'Congo, Republic of the','CG',NULL,NULL,NULL,NULL,5,0),(1052,'Cook Islands','CK',NULL,NULL,NULL,NULL,4,0),(1053,'Costa Rica','CR',NULL,NULL,NULL,NULL,2,0),(1054,'Côte d’Ivoire','CI',NULL,NULL,NULL,NULL,5,0),(1055,'Croatia','HR',NULL,NULL,NULL,NULL,1,0),(1056,'Cuba','CU',NULL,NULL,NULL,NULL,2,0),(1057,'Cyprus','CY',NULL,NULL,NULL,NULL,1,0),(1058,'Czech Republic','CZ',NULL,NULL,NULL,NULL,1,0),(1059,'Denmark','DK',NULL,NULL,NULL,NULL,1,0),(1060,'Djibouti','DJ',NULL,NULL,NULL,NULL,5,0),(1061,'Dominica','DM',NULL,NULL,NULL,NULL,2,0),(1062,'Dominican Republic','DO',NULL,NULL,NULL,NULL,2,0),(1063,'Timor-Leste','TL',NULL,NULL,NULL,NULL,4,0),(1064,'Ecuador','EC',NULL,NULL,NULL,NULL,2,0),(1065,'Egypt','EG',NULL,NULL,NULL,NULL,3,0),(1066,'El Salvador','SV',NULL,NULL,NULL,NULL,2,0),(1067,'Equatorial Guinea','GQ',NULL,NULL,NULL,NULL,5,0),(1068,'Eritrea','ER',NULL,NULL,NULL,NULL,5,0),(1069,'Estonia','EE',NULL,NULL,NULL,NULL,1,0),(1070,'Ethiopia','ET',NULL,NULL,NULL,NULL,5,0),(1072,'Falkland Islands (Malvinas)','FK',NULL,NULL,NULL,NULL,2,0),(1073,'Faroe Islands','FO',NULL,NULL,NULL,NULL,1,0),(1074,'Fiji','FJ',NULL,NULL,NULL,NULL,4,0),(1075,'Finland','FI',NULL,NULL,NULL,NULL,1,0),(1076,'France','FR',NULL,NULL,NULL,NULL,1,0),(1077,'French Guiana','GF',NULL,NULL,NULL,NULL,2,0),(1078,'French Polynesia','PF',NULL,NULL,NULL,NULL,4,0),(1079,'French Southern Territories','TF',NULL,NULL,NULL,NULL,1,0),(1080,'Gabon','GA',NULL,NULL,NULL,NULL,5,0),(1081,'Georgia','GE',NULL,NULL,NULL,NULL,3,0),(1082,'Germany','DE',NULL,NULL,NULL,NULL,1,0),(1083,'Ghana','GH',NULL,NULL,NULL,NULL,5,0),(1084,'Gibraltar','GI',NULL,NULL,NULL,NULL,1,0),(1085,'Greece','GR',NULL,NULL,NULL,NULL,1,0),(1086,'Greenland','GL',NULL,NULL,NULL,NULL,2,0),(1087,'Grenada','GD',NULL,NULL,NULL,NULL,2,0),(1088,'Guadeloupe','GP',NULL,NULL,NULL,NULL,2,0),(1089,'Guam','GU',NULL,NULL,NULL,NULL,4,0),(1090,'Guatemala','GT',NULL,NULL,NULL,NULL,2,0),(1091,'Guinea','GN',NULL,NULL,NULL,NULL,5,0),(1092,'Guinea-Bissau','GW',NULL,NULL,NULL,NULL,5,0),(1093,'Guyana','GY',NULL,NULL,NULL,NULL,2,0),(1094,'Haiti','HT',NULL,NULL,NULL,NULL,2,0),(1095,'Heard Island and McDonald Islands','HM',NULL,NULL,NULL,NULL,4,0),(1096,'Holy See (Vatican City State)','VA',NULL,NULL,NULL,NULL,1,0),(1097,'Honduras','HN',NULL,NULL,NULL,NULL,2,0),(1098,'Hong Kong','HK',NULL,NULL,NULL,NULL,4,0),(1099,'Hungary','HU',NULL,NULL,NULL,NULL,1,0),(1100,'Iceland','IS',NULL,NULL,NULL,NULL,1,0),(1101,'India','IN',NULL,NULL,NULL,NULL,4,0),(1102,'Indonesia','ID',NULL,NULL,NULL,NULL,4,0),(1103,'Iran, Islamic Republic of','IR',NULL,NULL,NULL,NULL,3,0),(1104,'Iraq','IQ',NULL,NULL,NULL,NULL,3,0),(1105,'Ireland','IE',NULL,NULL,NULL,NULL,1,0),(1106,'Israel','IL',NULL,NULL,NULL,NULL,3,0),(1107,'Italy','IT',NULL,NULL,NULL,NULL,1,0),(1108,'Jamaica','JM',NULL,NULL,NULL,NULL,2,0),(1109,'Japan','JP',NULL,NULL,NULL,NULL,4,0),(1110,'Jordan','JO',NULL,NULL,NULL,NULL,3,0),(1111,'Kazakhstan','KZ',NULL,NULL,NULL,NULL,1,0),(1112,'Kenya','KE',NULL,NULL,NULL,NULL,5,0),(1113,'Kiribati','KI',NULL,NULL,NULL,NULL,4,0),(1114,'Korea, Democratic People\'s Republic of','KP',NULL,NULL,NULL,NULL,4,0),(1115,'Korea, Republic of','KR',NULL,NULL,NULL,NULL,4,0),(1116,'Kuwait','KW',NULL,NULL,NULL,NULL,3,0),(1117,'Kyrgyzstan','KG',NULL,NULL,NULL,NULL,1,0),(1118,'Lao People\'s Democratic Republic','LA',NULL,NULL,NULL,NULL,4,0),(1119,'Latvia','LV',NULL,NULL,NULL,NULL,1,0),(1120,'Lebanon','LB',NULL,NULL,NULL,NULL,3,0),(1121,'Lesotho','LS',NULL,NULL,NULL,NULL,5,0),(1122,'Liberia','LR',NULL,NULL,NULL,NULL,5,0),(1123,'Libya','LY',NULL,NULL,NULL,NULL,3,0),(1124,'Liechtenstein','LI',NULL,NULL,NULL,NULL,1,0),(1125,'Lithuania','LT',NULL,NULL,NULL,NULL,1,0),(1126,'Luxembourg','LU',NULL,NULL,NULL,NULL,1,0),(1127,'Macao','MO',NULL,NULL,NULL,NULL,4,0),(1128,'North Macedonia','MK',NULL,NULL,NULL,NULL,1,0),(1129,'Madagascar','MG',NULL,NULL,NULL,NULL,5,0),(1130,'Malawi','MW',NULL,NULL,NULL,NULL,5,0),(1131,'Malaysia','MY',NULL,NULL,NULL,NULL,4,0),(1132,'Maldives','MV',NULL,NULL,NULL,NULL,4,0),(1133,'Mali','ML',NULL,NULL,NULL,NULL,5,0),(1134,'Malta','MT',NULL,NULL,NULL,NULL,1,0),(1135,'Marshall Islands','MH',NULL,NULL,NULL,NULL,4,0),(1136,'Martinique','MQ',NULL,NULL,NULL,NULL,2,0),(1137,'Mauritania','MR',NULL,NULL,NULL,NULL,5,0),(1138,'Mauritius','MU',NULL,NULL,NULL,NULL,5,0),(1139,'Mayotte','YT',NULL,NULL,NULL,NULL,5,0),(1140,'Mexico','MX',NULL,NULL,NULL,NULL,2,0),(1141,'Micronesia, Federated States of','FM',NULL,NULL,NULL,NULL,4,0),(1142,'Moldova','MD',NULL,NULL,NULL,NULL,1,0),(1143,'Monaco','MC',NULL,NULL,NULL,NULL,1,0),(1144,'Mongolia','MN',NULL,NULL,NULL,NULL,4,0),(1145,'Montserrat','MS',NULL,NULL,NULL,NULL,2,0),(1146,'Morocco','MA',NULL,NULL,NULL,NULL,3,0),(1147,'Mozambique','MZ',NULL,NULL,NULL,NULL,5,0),(1148,'Namibia','NA',NULL,NULL,NULL,NULL,5,0),(1149,'Nauru','NR',NULL,NULL,NULL,NULL,4,0),(1150,'Nepal','NP',NULL,NULL,NULL,NULL,4,0),(1152,'Netherlands','NL',NULL,NULL,NULL,NULL,1,0),(1153,'New Caledonia','NC',NULL,NULL,NULL,NULL,4,0),(1154,'New Zealand','NZ',NULL,NULL,NULL,NULL,4,0),(1155,'Nicaragua','NI',NULL,NULL,NULL,NULL,2,0),(1156,'Niger','NE',NULL,NULL,NULL,NULL,5,0),(1157,'Nigeria','NG',NULL,NULL,NULL,NULL,5,0),(1158,'Niue','NU',NULL,NULL,NULL,NULL,4,0),(1159,'Norfolk Island','NF',NULL,NULL,NULL,NULL,4,0),(1160,'Northern Mariana Islands','MP',NULL,NULL,NULL,NULL,2,0),(1161,'Norway','NO',NULL,NULL,NULL,NULL,1,0),(1162,'Oman','OM',NULL,NULL,NULL,NULL,3,0),(1163,'Pakistan','PK',NULL,NULL,NULL,NULL,4,0),(1164,'Palau','PW',NULL,NULL,NULL,NULL,4,0),(1165,'Palestine, State of','PS',NULL,NULL,NULL,NULL,3,0),(1166,'Panama','PA',NULL,NULL,NULL,NULL,2,0),(1167,'Papua New Guinea','PG',NULL,NULL,NULL,NULL,4,0),(1168,'Paraguay','PY',NULL,NULL,NULL,NULL,2,0),(1169,'Peru','PE',NULL,NULL,NULL,NULL,2,0),(1170,'Philippines','PH',NULL,NULL,NULL,NULL,4,0),(1171,'Pitcairn','PN',NULL,NULL,NULL,NULL,4,0),(1172,'Poland','PL',NULL,NULL,NULL,NULL,1,0),(1173,'Portugal','PT',NULL,NULL,NULL,NULL,1,0),(1174,'Puerto Rico','PR',NULL,NULL,NULL,NULL,2,0),(1175,'Qatar','QA',NULL,NULL,NULL,NULL,3,0),(1176,'Romania','RO',NULL,NULL,NULL,NULL,1,0),(1177,'Russian Federation','RU',NULL,NULL,NULL,NULL,1,0),(1178,'Rwanda','RW',NULL,NULL,NULL,NULL,5,0),(1179,'Reunion','RE',NULL,NULL,NULL,NULL,5,0),(1180,'Saint Helena','SH',NULL,NULL,NULL,NULL,5,0),(1181,'Saint Kitts and Nevis','KN',NULL,NULL,NULL,NULL,2,0),(1182,'Saint Lucia','LC',NULL,NULL,NULL,NULL,2,0),(1183,'Saint Pierre and Miquelon','PM',NULL,NULL,NULL,NULL,2,0),(1184,'Saint Vincent and the Grenadines','VC',NULL,NULL,NULL,NULL,2,0),(1185,'Samoa','WS',NULL,NULL,NULL,NULL,4,0),(1186,'San Marino','SM',NULL,NULL,NULL,NULL,1,0),(1187,'Saudi Arabia','SA',NULL,NULL,NULL,NULL,3,0),(1188,'Senegal','SN',NULL,NULL,NULL,NULL,5,0),(1189,'Seychelles','SC',NULL,NULL,NULL,NULL,5,0),(1190,'Sierra Leone','SL',NULL,NULL,NULL,NULL,5,0),(1191,'Singapore','SG',NULL,NULL,NULL,NULL,4,0),(1192,'Slovakia','SK',NULL,NULL,NULL,NULL,1,0),(1193,'Slovenia','SI',NULL,NULL,NULL,NULL,1,0),(1194,'Solomon Islands','SB',NULL,NULL,NULL,NULL,4,0),(1195,'Somalia','SO',NULL,NULL,NULL,NULL,5,0),(1196,'South Africa','ZA',NULL,NULL,NULL,NULL,5,0),(1197,'South Georgia and the South Sandwich Islands','GS',NULL,NULL,NULL,NULL,2,0),(1198,'Spain','ES',NULL,NULL,NULL,NULL,1,0),(1199,'Sri Lanka','LK',NULL,NULL,NULL,NULL,4,0),(1200,'Sudan','SD',NULL,NULL,NULL,NULL,3,0),(1201,'Suriname','SR',NULL,NULL,NULL,NULL,2,0),(1202,'Svalbard and Jan Mayen','SJ',NULL,NULL,NULL,NULL,1,0),(1203,'Eswatini','SZ',NULL,NULL,NULL,NULL,5,0),(1204,'Sweden','SE',NULL,NULL,NULL,NULL,1,0),(1205,'Switzerland','CH',NULL,NULL,NULL,NULL,1,0),(1206,'Syrian Arab Republic','SY',NULL,NULL,NULL,NULL,3,0),(1207,'Sao Tome and Principe','ST',NULL,NULL,NULL,NULL,5,0),(1208,'Taiwan','TW',NULL,NULL,NULL,NULL,4,0),(1209,'Tajikistan','TJ',NULL,NULL,NULL,NULL,3,0),(1210,'Tanzania, United Republic of','TZ',NULL,NULL,NULL,NULL,5,0),(1211,'Thailand','TH',NULL,NULL,NULL,NULL,4,0),(1212,'Bahamas','BS',NULL,NULL,NULL,NULL,2,0),(1213,'Gambia','GM',NULL,NULL,NULL,NULL,5,0),(1214,'Togo','TG',NULL,NULL,NULL,NULL,5,0),(1215,'Tokelau','TK',NULL,NULL,NULL,NULL,4,0),(1216,'Tonga','TO',NULL,NULL,NULL,NULL,4,0),(1217,'Trinidad and Tobago','TT',NULL,NULL,NULL,NULL,2,0),(1218,'Tunisia','TN',NULL,NULL,NULL,NULL,3,0),(1219,'Turkey','TR',NULL,NULL,NULL,NULL,1,0),(1220,'Turkmenistan','TM',NULL,NULL,NULL,NULL,1,0),(1221,'Turks and Caicos Islands','TC',NULL,NULL,NULL,NULL,2,0),(1222,'Tuvalu','TV',NULL,NULL,NULL,NULL,4,0),(1223,'Uganda','UG',NULL,NULL,NULL,NULL,5,0),(1224,'Ukraine','UA',NULL,NULL,NULL,NULL,1,0),(1225,'United Arab Emirates','AE',NULL,NULL,NULL,NULL,3,0),(1226,'United Kingdom','GB',NULL,NULL,NULL,NULL,1,0),(1227,'United States Minor Outlying Islands','UM',NULL,NULL,NULL,NULL,2,0),(1228,'United States','US',NULL,NULL,NULL,NULL,2,1),(1229,'Uruguay','UY',NULL,NULL,NULL,NULL,2,0),(1230,'Uzbekistan','UZ',NULL,NULL,NULL,NULL,1,0),(1231,'Vanuatu','VU',NULL,NULL,NULL,NULL,4,0),(1232,'Venezuela','VE',NULL,NULL,NULL,NULL,2,0),(1233,'Viet Nam','VN',NULL,NULL,NULL,NULL,4,0),(1234,'Virgin Islands, U.S.','VI',NULL,NULL,NULL,NULL,2,0),(1235,'Wallis and Futuna','WF',NULL,NULL,NULL,NULL,4,0),(1236,'Western Sahara','EH',NULL,NULL,NULL,NULL,3,0),(1237,'Yemen','YE',NULL,NULL,NULL,NULL,3,0),(1238,'Serbia and Montenegro','CS',NULL,NULL,NULL,NULL,1,0),(1239,'Zambia','ZM',NULL,NULL,NULL,NULL,5,0),(1240,'Zimbabwe','ZW',NULL,NULL,NULL,NULL,5,0),(1241,'Åland Islands','AX',NULL,NULL,NULL,NULL,1,0),(1242,'Serbia','RS',NULL,NULL,NULL,NULL,1,0),(1243,'Montenegro','ME',NULL,NULL,NULL,NULL,1,0),(1244,'Jersey','JE',NULL,NULL,NULL,NULL,99,0),(1245,'Guernsey','GG',NULL,NULL,NULL,NULL,99,0),(1246,'Isle of Man','IM',NULL,NULL,NULL,NULL,99,0),(1247,'South Sudan','SS',NULL,NULL,NULL,NULL,5,0),(1248,'Curaçao','CW',NULL,NULL,NULL,NULL,2,0),(1249,'Sint Maarten (Dutch Part)','SX',NULL,NULL,NULL,NULL,2,0),(1250,'Bonaire, Saint Eustatius and Saba','BQ',NULL,NULL,NULL,NULL,2,0),(1251,'Kosovo','XK',NULL,NULL,NULL,NULL,1,0),(1252,'Saint Barthélemy','BL',NULL,NULL,NULL,NULL,2,0),(1253,'Saint Martin (French part)','MF',NULL,NULL,NULL,NULL,2,0); /*!40000 ALTER TABLE `civicrm_country` ENABLE KEYS */; UNLOCK TABLES; diff --git a/xml/templates/civicrm_country.tpl b/xml/templates/civicrm_country.tpl index 8e38bf1d8908..49c4882e3585 100644 --- a/xml/templates/civicrm_country.tpl +++ b/xml/templates/civicrm_country.tpl @@ -153,7 +153,7 @@ INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1125", "Lithuania", "LT", "1", "0"); INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1126", "Luxembourg", "LU", "1", "0"); INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1127", "Macao", "MO", "4", "0"); -INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1128", "Macedonia, Republic of", "MK", "1", "0"); +INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1128", "North Macedonia", "MK", "1", "0"); INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1129", "Madagascar", "MG", "5", "0"); INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1130", "Malawi", "MW", "5", "0"); INSERT INTO civicrm_country (id, name,iso_code,region_id,is_province_abbreviated) VALUES("1131", "Malaysia", "MY", "4", "0");