Permalink
Browse files

MDL-35750 - update to the ISO list of countries

Netherlands Antilles has been split up as specified in ISO 3166-1
Newsletter VI-8 (2010-12-15). Users will need to choose their country.
http://www.iso.org/iso/iso_3166-1_newsletter_vi-8_split_of_the_dutch_antilles_final-en.pdf

PLEASE NOTE: if you are updating this list again, i've written a script
to automate it from now on, linked from the bug.
  • Loading branch information...
1 parent 1dd6835 commit 47570cc67db7f592fe1beebf313a7895c72559a3 @danpoltawski danpoltawski committed Feb 15, 2013
Showing with 21 additions and 9 deletions.
  1. +11 −8 lang/en/countries.php
  2. +9 −0 lib/db/upgrade.php
  3. +1 −1 version.php
View
@@ -30,7 +30,6 @@
$string['AI'] = 'Anguilla';
$string['AL'] = 'Albania';
$string['AM'] = 'Armenia';
-$string['AN'] = 'Netherlands Antilles';
$string['AO'] = 'Angola';
$string['AQ'] = 'Antarctica';
$string['AR'] = 'Argentina';
@@ -52,7 +51,8 @@
$string['BL'] = 'Saint Barthélemy';
$string['BM'] = 'Bermuda';
$string['BN'] = 'Brunei Darussalam';
-$string['BO'] = 'Bolivia';
+$string['BO'] = 'Bolivia, Plurinational State Of';
+$string['BQ'] = 'Bonaire, Sint Eustatius And Saba';
$string['BR'] = 'Brazil';
$string['BS'] = 'Bahamas';
$string['BT'] = 'Bhutan';
@@ -65,6 +65,7 @@
$string['CD'] = 'Congo, The Democratic Republic Of The';
$string['CF'] = 'Central African Republic';
$string['CG'] = 'Congo';
+$string['CH'] = 'Switzerland';
$string['CI'] = 'Côte D\'Ivoire';
$string['CK'] = 'Cook Islands';
$string['CL'] = 'Chile';
@@ -74,6 +75,7 @@
$string['CR'] = 'Costa Rica';
$string['CU'] = 'Cuba';
$string['CV'] = 'Cape Verde';
+$string['CW'] = 'Curaçao';
$string['CX'] = 'Christmas Island';
$string['CY'] = 'Cyprus';
$string['CZ'] = 'Czech Republic';
@@ -121,7 +123,6 @@
$string['HR'] = 'Croatia';
$string['HT'] = 'Haiti';
$string['HU'] = 'Hungary';
-$string['CH'] = 'Switzerland';
$string['ID'] = 'Indonesia';
$string['IE'] = 'Ireland';
$string['IL'] = 'Israel';
@@ -157,12 +158,12 @@
$string['LT'] = 'Lithuania';
$string['LU'] = 'Luxembourg';
$string['LV'] = 'Latvia';
-$string['LY'] = 'Libyan Arab Jamahiriya';
+$string['LY'] = 'Libya';
$string['MA'] = 'Morocco';
$string['MC'] = 'Monaco';
$string['MD'] = 'Moldova, Republic Of';
$string['ME'] = 'Montenegro';
-$string['MF'] = 'Saint Martin';
+$string['MF'] = 'Saint Martin (French Part)';
$string['MG'] = 'Madagascar';
$string['MH'] = 'Marshall Islands';
$string['MK'] = 'Macedonia, The Former Yugoslav Republic Of';
@@ -204,7 +205,7 @@
$string['PM'] = 'Saint Pierre And Miquelon';
$string['PN'] = 'Pitcairn';
$string['PR'] = 'Puerto Rico';
-$string['PS'] = 'Palestinian Territory, Occupied';
+$string['PS'] = 'Palestine, State Of';
$string['PT'] = 'Portugal';
$string['PW'] = 'Palau';
$string['PY'] = 'Paraguay';
@@ -220,7 +221,7 @@
$string['SD'] = 'Sudan';
$string['SE'] = 'Sweden';
$string['SG'] = 'Singapore';
-$string['SH'] = 'Saint Helena';
+$string['SH'] = 'Saint Helena, Ascension And Tristan Da Cunha';
$string['SI'] = 'Slovenia';
$string['SJ'] = 'Svalbard And Jan Mayen';
$string['SK'] = 'Slovakia';
@@ -229,8 +230,10 @@
$string['SN'] = 'Senegal';
$string['SO'] = 'Somalia';
$string['SR'] = 'Suriname';
+$string['SS'] = 'South Sudan';
$string['ST'] = 'Sao Tome And Principe';
$string['SV'] = 'El Salvador';
+$string['SX'] = 'Sint Maarten (Dutch Part)';
$string['SY'] = 'Syrian Arab Republic';
$string['SZ'] = 'Swaziland';
$string['TC'] = 'Turks And Caicos Islands';
@@ -257,7 +260,7 @@
$string['UZ'] = 'Uzbekistan';
$string['VA'] = 'Holy See (Vatican City State)';
$string['VC'] = 'Saint Vincent And The Grenadines';
-$string['VE'] = 'Venezuela';
+$string['VE'] = 'Venezuela, Bolivarian Republic Of';
$string['VG'] = 'Virgin Islands, British';
$string['VI'] = 'Virgin Islands, U.S.';
$string['VN'] = 'Viet Nam';
View
@@ -1577,5 +1577,14 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2013021100.01);
}
+ if ($oldversion < 2013021500.00) {
+ // ISO country change: Netherlands Antilles is split into BQ, CW & SX
+ // http://www.iso.org/iso/iso_3166-1_newsletter_vi-8_split_of_the_dutch_antilles_final-en.pdf
+ $sql = "UPDATE {user} SET country = '' WHERE country = ?";
+ $DB->execute($sql, array('AN'));
+
+ upgrade_main_savepoint(true, 2013021500.00);
+ }
+
return true;
}
View
@@ -30,7 +30,7 @@
defined('MOODLE_INTERNAL') || die();
-$version = 2013021400.00; // YYYYMMDD = weekly release date of this DEV branch
+$version = 2013021500.00; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes

0 comments on commit 47570cc

Please sign in to comment.