Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
mahara
mahara
Commits
1babdfd1
Commit
1babdfd1
authored
Nov 13, 2019
by
Cecilia Vela Gurovic
Committed by
Gerrit Code Review
Nov 13, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Bug 1852358: New name for Macedonia"
parents
47840482
168cb73d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
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.
htdocs/lang/en.utf8/mahara.php
View file @
1babdfd1
...
...
@@ -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'
;
...
...
htdocs/lib/country.php
View file @
1babdfd1
...
...
@@ -737,7 +737,7 @@ class Country {
array
(
'2'
=>
'mk'
,
'3'
=>
'mkd'
,
'match'
=>
"^Macedonia
, the Former Yugoslav Republic of
\$
"
,
'match'
=>
"^
North
Macedonia
\$
"
,
),
array
(
'2'
=>
'ml'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment