MDL-12294 merge parentlang

diff --git a/lib/datalib.php b/lib/datalib.php
index b4598e201adbac388af2a510e5573ab3ef1bbc9a..b607625f3ceda27431b89e5e03b7df1db5ba3d86 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -1504,7 +1504,10 @@ 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('parentlang');
+    $parentlang = get_string('parentlanguage');
+    if ($parentlang[0] == '[') {
+        $parentlang = '';
+    }
     if (is_readable($CFG->dataroot .'/lang/'. $CFG->lang .'/help/forum/ratings.html')) {
         $file = file($CFG->dataroot .'/lang/'. $CFG->lang .'/help/forum/ratings.html');
     } else if (is_readable($CFG->dirroot .'/lang/'. $CFG->lang .'/help/forum/ratings.html')) {