Commit 0d13a9bc authored by Robert Lyon's avatar Robert Lyon Committed by Cecilia Vela Gurovic
Browse files

Bug 1852358: New name for Macedonia 



Change-Id: Ic51182f89eaf3a89c7e7022817aad63616ab25dc
Signed-off-by: default avatarRobert Lyon <robertl@catalyst.net.nz>
(cherry picked from commit 168cb73d)
(cherry picked from commit 0dcaeae6)
parent 1f1ad0ac

htdocs/lang/en.utf8/mahara.php

+1 −1
Original line number Diff line number Diff line
@@ -1108,7 +1108,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';

htdocs/lib/country.php

+1 −1
Original line number Diff line number Diff line
@@ -737,7 +737,7 @@ class Country { 
        array(

            '2' => 'mk',

            '3' => 'mkd',

            'match' => "^Macedonia, the Former Yugoslav Republic of\$",

            'match' => "^North Macedonia\$",

        ),

        array(

            '2' => 'ml',