diff --git a/admin/settings/appearance.php b/admin/settings/appearance.php index 58677118e0ecf..a8b6c6aeb450f 100644 --- a/admin/settings/appearance.php +++ b/admin/settings/appearance.php @@ -64,7 +64,8 @@ array('0' => new lang_string('default', 'calendar'), '%I:%M %p' => new lang_string('timeformat_12', 'calendar'), '%H:%M' => new lang_string('timeformat_24', 'calendar')))); - $temp->add(new admin_setting_configselect('calendar_startwday', new lang_string('configstartwday', 'admin'), new lang_string('helpstartofweek', 'admin'), 0, + $temp->add(new admin_setting_configselect('calendar_startwday', new lang_string('configstartwday', 'admin'), + new lang_string('helpstartofweek', 'admin'), get_string('firstdayofweek', 'langconfig'), array( 0 => new lang_string('sunday', 'calendar'), 1 => new lang_string('monday', 'calendar'), diff --git a/lang/en/langconfig.php b/lang/en/langconfig.php index f44d7f9a23e26..48eaf09cc39c4 100644 --- a/lang/en/langconfig.php +++ b/lang/en/langconfig.php @@ -25,7 +25,7 @@ $string['alphabet'] = 'A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z'; $string['backupnameformat'] = '%Y%m%d-%H%M'; $string['decsep'] = '.'; -$string['firstdayofweek'] = '0'; +$string['firstdayofweek'] = '1'; $string['iso6391'] = 'en'; $string['iso6392'] = 'eng'; $string['labelsep'] = ': '; diff --git a/lib/formslib.php b/lib/formslib.php index d82f79a26fcbb..e65979c76963b 100644 --- a/lib/formslib.php +++ b/lib/formslib.php @@ -77,10 +77,11 @@ function form_init_date_js() { global $PAGE; static $done = false; if (!$done) { + $calendar = \core_calendar\type_factory::get_calendar_instance(); $module = 'moodle-form-dateselector'; $function = 'M.form.dateselector.init_date_selectors'; $config = array(array( - 'firstdayofweek' => get_string('firstdayofweek', 'langconfig'), + 'firstdayofweek' => $calendar->get_starting_weekday(), 'mon' => date_format_string(strtotime("Monday"), '%a', 99), 'tue' => date_format_string(strtotime("Tuesday"), '%a', 99), 'wed' => date_format_string(strtotime("Wednesday"), '%a', 99),