Commit f731f9c6 authored by Andrew Nicols's avatar Andrew Nicols
Browse files

Merge branch 'MDL-50829-master' of git://github.com/danpoltawski/moodle

parents 1b671133 0a7051ff
......@@ -188,7 +188,7 @@ echo html_writer::end_tag('td');
$options = array();
foreach ($availablelangs as $alang) {
if (!empty($alang[0]) and trim($alang[0]) !== 'en' and !$controller->is_installed_lang($alang[0], $alang[1])) {
$options[$alang[0]] = $alang[2].' ('.$alang[0].')';
$options[$alang[0]] = $alang[2].' ‎('.$alang[0].')‎';
}
}
if (!empty($options)) {
......
......@@ -532,6 +532,11 @@ class core_string_manager_standard implements core_string_manager {
$langdirs = get_list_of_plugins('', 'en', $this->otherroot);
$langdirs["$CFG->dirroot/lang/en"] = 'en';
// We use left to right mark to demark the shortcodes contained in LTR brackets, but we need to do
// this hacky thing to have the utf8 char until we go php7 minimum and can simply put \u200E in
// a double quoted string.
$lrm = json_decode('"\u200E"');
// Loop through all langs and get info.
foreach ($langdirs as $lang) {
if (strrpos($lang, '_local') !== false) {
......@@ -548,7 +553,7 @@ class core_string_manager_standard implements core_string_manager {
}
$string = $this->load_component_strings('langconfig', $lang);
if (!empty($string['thislanguage'])) {
$languages[$lang] = $string['thislanguage'].' ('. $lang .')';
$languages[$lang] = $string['thislanguage'].' '.$lrm.'('. $lang .')'.$lrm;
}
}
......
Supports Markdown
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