moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-22050 removing moodle/langconfig duplicates

Browse source 
AMOS BEGIN
  MOV [parentlanguage,core],[parentlanguage,core_langconfig]
AMOS END
This commit is contained in:
Petr Skoda 2010-04-10 18:01:49 +00:00
parent bf69b06d1b
commit c9042db5c7
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/langimport.php
View file

@ -252,7 +252,7 @@ die('Work in progress, to be replaced by the new language update interface...');
foreach($installedlangs as $l=>$unused) { foreach($installedlangs as $l=>$unused) {
$SESSION->lang = $l; $SESSION->lang = $l;
$parent = get_string('parentlanguage'); $parent = get_string('parentlanguage', 'langconfig');
if ($parent == 'en') { if ($parent == 'en') {
continue; continue;
} }

2
filter/multilang/filter.php
View file

@ -76,7 +76,7 @@ function multilang_filter_impl($langblock) {
$parentcache = array(); $parentcache = array();
} }
if (!array_key_exists($mylang, $parentcache)) { if (!array_key_exists($mylang, $parentcache)) {
$parentlang = get_string('parentlanguage'); $parentlang = get_parent_language($mylang);
$parentcache[$mylang] = $parentlang; $parentcache[$mylang] = $parentlang;
} else { } else {
$parentlang = $parentcache[$mylang]; $parentlang = $parentcache[$mylang];

2
install/stringnames.txt
View file

@ -28,7 +28,7 @@ language,moodle
langdownloaderror,install langdownloaderror,install
memorylimithelp,install memorylimithelp,install
next,moodle next,moodle
parentlanguage,moodle parentlanguage,langconfig
paths,install paths,install
pathserrcreatedataroot,install pathserrcreatedataroot,install
pathsrodataroot,install pathsrodataroot,install

2
lib/datalib.php
View file

@ -1590,7 +1590,7 @@ function make_default_scale() {
/// Read in the big description from the file. Note this is not /// Read in the big description from the file. Note this is not
/// HTML (despite the file extension) but Moodle format text. /// HTML (despite the file extension) but Moodle format text.
$parentlang = get_string('parentlanguage'); $parentlang = get_parent_language();
if ($parentlang[0] == '[') { if ($parentlang[0] == '[') {
$parentlang = ''; $parentlang = '';
} }

2
lib/moodlelib.php
View file

@ -5642,7 +5642,7 @@ function get_parent_language($lang=null) {
$SESSION->lang = $lang; $SESSION->lang = $lang;
} }
$parentlang = get_string('parentlanguage'); $parentlang = get_string('parentlanguage', 'langconfig');
if ($parentlang === 'en' or $parentlang === '[[parentlanguage]]' or strpos($parentlang, '<') !== false) { if ($parentlang === 'en' or $parentlang === '[[parentlanguage]]' or strpos($parentlang, '<') !== false) {
$parentlang = ''; $parentlang = '';
} }