MDL-22050 removing moodle/langconfig duplicates

AMOS BEGIN
  MOV [firstdayofweek,core],[firstdayofweek,core_langconfig]
AMOS END

diff --git a/calendar/lib.php b/calendar/lib.php
index c3015a1..d9bdc9f 100644 (file)
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -73,7 +73,7 @@ function calendar_get_starting_weekday() {
     if (isset($CFG->calendar_startwday)) {
         $firstday = $CFG->calendar_startwday;
     } else {
-        $firstday = get_string('firstdayofweek');
+        $firstday = get_string('firstdayofweek', 'langconfig');
     }
 
     if(!is_numeric($firstday)) {

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index dcbb5c8..a6e17ee 100644 (file)
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -688,7 +688,6 @@ $string['filloutallfields'] = 'Please fill out all fields in this form';
 $string['filter'] = 'Filter';
 $string['findmorecourses'] = 'Find more courses...';
 $string['firstaccess'] = 'First access';
-$string['firstdayofweek'] = '0';
 $string['firstname'] = 'First name';
 $string['firsttime'] = 'Is this your first time here?';
 $string['flashlinkmessage'] = 'Please upgrade your Flash player now:';

diff --git a/lib/formslib.php b/lib/formslib.php
index 0e48c40..d667de4 100644 (file)
--- a/lib/formslib.php
+++ b/lib/formslib.php
@@ -72,7 +72,7 @@ function form_init_date_js() {
         $PAGE->requires->yui2_lib('calendar');
         $PAGE->requires->yui2_lib('container');
         $PAGE->requires->js_function_call('init_date_selectors',
-                array(get_string('firstdayofweek')));
+                array(get_string('firstdayofweek', 'langconfig')));
         $done = true;
     }
 }