L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-22061 workaround for special handling of parentlanguage string

Browse Source
This commit is contained in:
Petr Skoda
2010-04-11 20:30:58 +00:00
parent ef44fbedb6
commit c2ed166e6d
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+5 -3
View File
@@ -5647,7 +5647,7 @@ function get_parent_language($lang=null) {
}
$parentlang = get_string('parentlanguage', 'langconfig');
if ($parentlang === 'en' or $parentlang === '[[parentlanguage]]' or strpos($parentlang, '<') !== false) {
if ($parentlang === 'en') {
$parentlang = '';
}
@@ -5910,9 +5910,11 @@ class amos_string_manager implements string_manager {
// not all of them are supposed to be defined
return '';
}
if ($identifier !== 'parentlanguage') {
debugging("Invalid get_string() identifier: '$identifier' or component '$component'", DEBUG_DEVELOPER);
if ($identifier === 'parentlanguage' and ($component === 'langconfig' or $component === 'core_langconfig')) {
// parentlanguage is a special string, undefined means use english if not defined
return 'en';
}
debugging("Invalid get_string() identifier: '$identifier' or component '$component'", DEBUG_DEVELOPER);
return "[[$identifier]]";
}