From c9042db5c7ecc3070501d581d6c35319bea4ee3f Mon Sep 17 00:00:00 2001
From: Petr Skoda <skodak@moodle.org>
Date: Sat, 10 Apr 2010 18:01:49 +0000
Subject: [PATCH] MDL-22050 removing moodle/langconfig duplicates

AMOS BEGIN
  MOV [parentlanguage,core],[parentlanguage,core_langconfig]
AMOS END
---
 admin/langimport.php        | 2 +-
 filter/multilang/filter.php | 2 +-
 install/stringnames.txt     | 2 +-
 lib/datalib.php             | 2 +-
 lib/moodlelib.php           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin/langimport.php b/admin/langimport.php
index 78074aebea5..acd01275cd5 100755
--- a/admin/langimport.php
+++ b/admin/langimport.php
@@ -252,7 +252,7 @@ die('Work in progress, to be replaced by the new language update interface...');
 
     foreach($installedlangs as $l=>$unused) {
         $SESSION->lang = $l;
-        $parent = get_string('parentlanguage');
+        $parent = get_string('parentlanguage', 'langconfig');
         if ($parent == 'en') {
             continue;
         }
diff --git a/filter/multilang/filter.php b/filter/multilang/filter.php
index 6e3dc52264d..adf5b31ff89 100644
--- a/filter/multilang/filter.php
+++ b/filter/multilang/filter.php
@@ -76,7 +76,7 @@ function multilang_filter_impl($langblock) {
         $parentcache = array();
     }
     if (!array_key_exists($mylang, $parentcache)) {
-        $parentlang = get_string('parentlanguage');
+        $parentlang = get_parent_language($mylang);
         $parentcache[$mylang] = $parentlang;
     } else {
         $parentlang = $parentcache[$mylang];
diff --git a/install/stringnames.txt b/install/stringnames.txt
index 0eb0370a1e4..011b83b2f4c 100644
--- a/install/stringnames.txt
+++ b/install/stringnames.txt
@@ -28,7 +28,7 @@ language,moodle
 langdownloaderror,install
 memorylimithelp,install
 next,moodle
-parentlanguage,moodle
+parentlanguage,langconfig
 paths,install
 pathserrcreatedataroot,install
 pathsrodataroot,install
diff --git a/lib/datalib.php b/lib/datalib.php
index 06b7c56b171..5a484125d3a 100644
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -1590,7 +1590,7 @@ function make_default_scale() {
 
     /// Read in the big description from the file.  Note this is not
     /// HTML (despite the file extension) but Moodle format text.
-    $parentlang = get_string('parentlanguage');
+    $parentlang = get_parent_language();
     if ($parentlang[0] == '[') {
         $parentlang = '';
     }
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index bbd904c0f6d..fc3444867de 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -5642,7 +5642,7 @@ function get_parent_language($lang=null) {
         $SESSION->lang = $lang;
     }
 
-    $parentlang = get_string('parentlanguage');
+    $parentlang = get_string('parentlanguage', 'langconfig');
     if ($parentlang === 'en' or $parentlang === '[[parentlanguage]]' or strpos($parentlang, '<') !== false) {
         $parentlang = '';
     }