Merge "Bug 1852358: New name for Macedonia"

1babdfd1 · Cecilia Vela Gurovic · Gerrit Code Review · 47840482 · 168cb73d · 1babdfd1
Commit 1babdfd1 authored Nov 13, 2019 by Cecilia Vela Gurovic Committed by Gerrit Code Review Nov 13, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

htdocs/lang/en.utf8/mahara.php htdocs/lang/en.utf8/mahara.php +1 -1

htdocs/lib/country.php htdocs/lib/country.php +1 -1

No files found.
--- a/htdocs/lang/en.utf8/mahara.php
+++ b/htdocs/lang/en.utf8/mahara.php
@@ -1112,7 +1112,7 @@ $string['country.li'] = 'Liechtenstein';
 $string['country.lt'] = 'Lithuania';
 $string['country.lu'] = 'Luxembourg';
 $string['country.mo'] = 'Macao';
-$string['country.mk'] = 'Macedonia, The Former Yugoslav Republic of';
+$string['country.mk'] = 'North Macedonia';
 $string['country.mg'] = 'Madagascar';
 $string['country.mw'] = 'Malawi';
 $string['country.my'] = 'Malaysia';

--- a/htdocs/lib/country.php
+++ b/htdocs/lib/country.php
@@ -737,7 +737,7 @@ class Country {
        array(
            '2' => 'mk',
            '3' => 'mkd',
-            'match' => "^Macedonia, the Former Yugoslav Republic of\$",
+            'match' => "^North Macedonia\$",
        ),
        array(
            '2' => 'ml',