MDL-22050 removing moodle/langconfig duplicates

AMOS BEGIN
  MOV [decsep,core],[decsep,core_langconfig]
  MOV [listsep,core],[listsep,core_langconfig]
  MOV [thousandsep,core],[thousandsep,core_langconfig]
AMOS END

diff --git a/admin/uploaduser_form.php b/admin/uploaduser_form.php
index 14c40ab..eef727b 100644 (file)
--- a/admin/uploaduser_form.php
+++ b/admin/uploaduser_form.php
@@ -18,7 +18,7 @@ class admin_uploaduser_form1 extends moodleform {
         $mform->addElement('select', 'delimiter_name', get_string('csvdelimiter', 'admin'), $choices);
         if (array_key_exists('cfg', $choices)) {
             $mform->setDefault('delimiter_name', 'cfg');
-        } else if (get_string('listsep') == ';') {
+        } else if (get_string('listsep', 'langconfig') == ';') {
             $mform->setDefault('delimiter_name', 'semicolon');
         } else {
             $mform->setDefault('delimiter_name', 'comma');

diff --git a/admin/user/user_bulk_download.php b/admin/user/user_bulk_download.php
index 4115454..a1d16a5 100755 (executable)
--- a/admin/user/user_bulk_download.php
+++ b/admin/user/user_bulk_download.php
@@ -157,7 +157,7 @@ function user_download_csv($fields) {
     header("Cache-Control: must-revalidate,post-check=0,pre-check=0");
     header("Pragma: public");
 
-    $delimiter = get_string('listsep');
+    $delimiter = get_string('listsep', 'langconfig');
     $encdelim  = '&#'.ord($delimiter);
 
     $row = array();

diff --git a/lib/mathslib.php b/lib/mathslib.php
index 817535b..7f61f8d 100644 (file)
--- a/lib/mathslib.php
+++ b/lib/mathslib.php
@@ -114,8 +114,8 @@ class calc_formula {
      */
     function localize($formula) {
         $formula = str_replace('.', '$', $formula); // temp placeholder
-        $formula = str_replace(',', get_string('listsep'), $formula);
-        $formula = str_replace('$', get_string('decsep'), $formula);
+        $formula = str_replace(',', get_string('listsep', 'langconfig'), $formula);
+        $formula = str_replace('$', get_string('decsep', 'langconfig'), $formula);
         return $formula;
     }
 
@@ -125,8 +125,8 @@ class calc_formula {
      * @return string
      */
     function unlocalize($formula) {
-        $formula = str_replace(get_string('decsep'), '$', $formula);
-        $formula = str_replace(get_string('listsep'), ',', $formula);
+        $formula = str_replace(get_string('decsep', 'langconfig'), '$', $formula);
+        $formula = str_replace(get_string('listsep', 'langconfig'), ',', $formula);
         $formula = str_replace('$', '.', $formula); // temp placeholder
         return $formula;
     }

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index e90e5d0..ccdbe48 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -8212,7 +8212,7 @@ function format_float($float, $decimalpoints=1, $localized=true) {
         return '';
     }
     if ($localized) {
-        return number_format($float, $decimalpoints, get_string('decsep'), '');
+        return number_format($float, $decimalpoints, get_string('decsep', 'langconfig'), '');
     } else {
         return number_format($float, $decimalpoints, '.', '');
     }
@@ -8234,7 +8234,7 @@ function unformat_float($locale_float) {
 
     $locale_float = str_replace(' ', '', $locale_float); // no spaces - those might be used as thousand separators
 
-    return (float)str_replace(get_string('decsep'), '.', $locale_float);
+    return (float)str_replace(get_string('decsep', 'langconfig'), '.', $locale_float);
 }
 
 /**

diff --git a/mod/data/export_form.php b/mod/data/export_form.php
index 9c27e41..54fa90a 100644 (file)
--- a/mod/data/export_form.php
+++ b/mod/data/export_form.php
@@ -41,7 +41,7 @@ class mod_data_export_form extends moodleform {
         $mform->setDefault('exporttype', 'csv');
         if (array_key_exists('cfg', $choices)) {
             $mform->setDefault('delimiter_name', 'cfg');
-        } else if (get_string('listsep') == ';') {
+        } else if (get_string('listsep', 'langconfig') == ';') {
             $mform->setDefault('delimiter_name', 'semicolon');
         } else {
             $mform->setDefault('delimiter_name', 'comma');