Commit b206c8ef authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1849225: Updating the country code info"

parents 68c584fc 89fbf1af
......@@ -78,6 +78,8 @@ $siteoptionform = array(
'options' => array('' => get_string('nocountryselected')) + $countries,
'help' => true,
'disabled' => in_array('country', $OVERRIDDEN),
'description' => get_string('countryisodisclaimer', 'mahara') . '<br>' .
get_string('countryisocustomise', 'mahara'),
),
'timezone' => array(
'type' => 'select',
......
......@@ -107,6 +107,7 @@ foreach ( $element_list as $element => $type ) {
$countries = getoptions_country();
$items[$element]['options'] = array('' => get_string('nocountryselected')) + $countries;
$items[$element]['defaultvalue'] = get_config('country');
$items[$element]['description'] = get_string('countryisodisclaimer', 'mahara');
}
$classname = 'ArtefactType' . ucfirst($element);
if (is_callable(array($classname, 'getoptions'))) {
......
......@@ -1006,7 +1006,7 @@ $string['country.bz'] = 'Belize';
$string['country.bj'] = 'Benin';
$string['country.bm'] = 'Bermuda';
$string['country.bt'] = 'Bhutan';
$string['country.bo'] = 'Bolivia';
$string['country.bo'] = 'Bolivia (Plurinational State of)';
$string['country.bq'] = 'Bonaire';
$string['country.ba'] = 'Bosnia and Herzegovina';
$string['country.bw'] = 'Botswana';
......@@ -1077,7 +1077,7 @@ $string['country.gw'] = 'Guinea-bissau';
$string['country.gy'] = 'Guyana';
$string['country.ht'] = 'Haiti';
$string['country.hm'] = 'Heard Island and McDonald Islands';
$string['country.va'] = 'Holy See (Vatican City State)';
$string['country.va'] = 'Holy See';
$string['country.hn'] = 'Honduras';
$string['country.hk'] = 'Hong Kong';
$string['country.hu'] = 'Hungary';
......@@ -1166,7 +1166,7 @@ $string['country.ro'] = 'Romania';
$string['country.ru'] = 'Russian Federation';
$string['country.rw'] = 'Rwanda';
$string['country.bl'] = 'Saint Barthelemy';
$string['country.sh'] = 'Saint Helena';
$string['country.sh'] = 'Saint Helena, Ascension and Tristan da Cunha';
$string['country.kn'] = 'Saint Kitts and Nevis';
$string['country.lc'] = 'Saint Lucia';
$string['country.mf'] = 'Saint Martin (French part)';
......@@ -1221,7 +1221,7 @@ $string['country.um'] = 'United States Minor Outlying Islands';
$string['country.uy'] = 'Uruguay';
$string['country.uz'] = 'Uzbekistan';
$string['country.vu'] = 'Vanuatu';
$string['country.ve'] = 'Venezuela';
$string['country.ve'] = 'Venezuela (Bolivarian Republic of)';
$string['country.vn'] = 'Viet Nam';
$string['country.vg'] = 'Virgin Islands, British';
$string['country.vi'] = 'Virgin Islands, U.S.';
......@@ -1232,7 +1232,8 @@ $string['country.zm'] = 'Zambia';
$string['country.zw'] = 'Zimbabwe';
$string['nocountryselected'] = 'No country selected';
$string['countryisodisclaimer'] = 'Country names are displayed as defined in ISO 3166, published by the International Organization for Standardization (ISO).';
$string['countryisocustomise'] = 'To adjust any country names for your site, please edit the "mahara.php" language file in each translation or <a href="https://wiki.mahara.org/wiki/Developer_Area/Language_strings#Custom_lang_strings_in_.2Flocal">create strings in the local directory</a>.';
// general stuff that doesn't really fit anywhere else
$string['system'] = 'System';
$string['done'] = 'Done';
......
......@@ -162,7 +162,7 @@ class Country {
array(
'2' => 'bo',
'3' => 'bol',
'match' => "^Bolivia\$",
'match' => "^Bolivia (Plurinational State of)\$",
),
array(
'2' => 'bq',
......@@ -402,7 +402,7 @@ class Country {
array(
'2' => 'gb',
'3' => 'gbr',
'match' => "^United Kingdom\$",
'match' => "^United Kingdom of Great Britain and Northern Ireland\$",
),
array(
'2' => 'gd',
......@@ -1012,7 +1012,7 @@ class Country {
array(
'2' => 'sh',
'3' => 'shn',
'match' => "^Saint Helena\$",
'match' => "^Saint Helena, Ascension and Tristan da Cunha\$",
),
array(
'2' => 'si',
......@@ -1182,7 +1182,7 @@ class Country {
array(
'2' => 'us',
'3' => 'usa',
'match' => "^United States\$",
'match' => "^United States of America\$",
),
array(
'2' => 'uy',
......@@ -1197,7 +1197,7 @@ class Country {
array(
'2' => 'va',
'3' => 'vat',
'match' => "^Holy See (Vatican City State)\$",
'match' => "^Holy See\$",
),
array(
'2' => 'vc',
......@@ -1207,7 +1207,7 @@ class Country {
array(
'2' => 've',
'3' => 'ven',
'match' => "^Venezuela\$",
'match' => "^Venezuela (Bolivarian Republic of)\$",
),
array(
'2' => 'vg',
......@@ -1222,7 +1222,7 @@ class Country {
array(
'2' => 'vn',
'3' => 'vnm',
'match' => "^Vietnam\$",
'match' => "^Viet Nam\$",
),
array(
'2' => 'vu',
......@@ -1243,6 +1243,7 @@ class Country {
'2' => 'xk',
'3' => 'xk',
'match' => "^Kosovo\$",
'userassigned' => true,
),
array(
'2' => 'ye',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment