MDL-22050 removing moodle/langconfig duplicates

AMOS BEGIN
  MOV [locale,core],[locale,core_langconfig]
  MOV [localewin,core],[localewin,core_langconfig]
  MOV [localewincharset,core],[localewincharset,core_langconfig]
  MOV [oldcharset,core],[oldcharset,core_langconfig]
AMOS END

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index a6e17ee..fcee07f 100644 (file)
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -954,7 +954,6 @@ $string['listfiles'] = 'List of files in {$a}';
 $string['listofallpeople'] = 'List of all people';
 $string['livelogs'] = 'Live logs from the past hour';
 $string['local'] = 'Local';
-$string['locale'] = 'en_AU.UTF-8';
 $string['localplugindeleteconfirm'] = 'You are about to completely delete the local plugin \'{$a}\'. This will completely delete everything in the database associated with this plugin. Are you SURE you want to continue?';
 $string['localplugins'] = 'Local plugins';
 $string['localpluginsmanage'] = 'Manage local plugins';

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index ccdbe48..bbd904c 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1520,7 +1520,7 @@ function userdate($date, $format = '', $timezone = 99, $fixday = true) {
 /// (because it's impossible to specify UTF-8 to fetch locale info in Win32)
 
    if ($CFG->ostype == 'WINDOWS') {
-       if ($localewincharset = get_string('localewincharset')) {
+       if ($localewincharset = get_string('localewincharset', 'langconfig')) {
            $textlib = textlib_get_instance();
            $datestring = $textlib->convert($datestring, $localewincharset, 'utf-8');
        }
@@ -7841,7 +7841,7 @@ function moodle_setlocale($locale='') {
     $oldlocale = $currentlocale;
 
 /// Fetch the correct locale based on ostype
-    if($CFG->ostype == 'WINDOWS') {
+    if ($CFG->ostype == 'WINDOWS') {
         $stringtofetch = 'localewin';
     } else {
         $stringtofetch = 'locale';
@@ -7853,7 +7853,7 @@ function moodle_setlocale($locale='') {
     } else if (!empty($CFG->locale)) { // override locale for all language packs
         $currentlocale = $CFG->locale;
     } else {
-        $currentlocale = get_string($stringtofetch);
+        $currentlocale = get_string($stringtofetch, 'langconfig');
     }
 
 /// do nothing if locale already set up

diff --git a/lib/textlib.class.php b/lib/textlib.class.php
index efa066a..9d7140a 100644 (file)
--- a/lib/textlib.class.php
+++ b/lib/textlib.class.php
@@ -385,11 +385,11 @@ class textlib {
     function get_encodings() {
         $encodings = array();
         $encodings['UTF-8'] = 'UTF-8';
-        $winenc = strtoupper(get_string('localewincharset'));
+        $winenc = strtoupper(get_string('localewincharset', 'langconfig'));
         if ($winenc != '') {
             $encodings[$winenc] = $winenc;
         }
-        $nixenc = strtoupper(get_string('oldcharset'));
+        $nixenc = strtoupper(get_string('oldcharset', 'langconfig'));
         $encodings[$nixenc] = $nixenc;
 
         foreach ($this->typo3cs->synonyms as $enc) {

diff --git a/mod/feedback/easy_excel.php b/mod/feedback/easy_excel.php
index 99265ce..8a0a89f 100644 (file)
--- a/mod/feedback/easy_excel.php
+++ b/mod/feedback/easy_excel.php
@@ -240,7 +240,7 @@ function feedback_convert_to_win($text) {
         if(!isset($CFG->latinexcelexport) || !$CFG->latinexcelexport) {
             $newwincharset = 'UTF-16LE';
         }else {
-            $newwincharset = get_string('localewincharset');
+            $newwincharset = get_string('localewincharset', 'langconfig');
             if($newwincharset == '') {
                 $newwincharset = 'windows-1252';
             }