MDL-51651 lang: add consitency for application of firstdayofweek

1) Set the site-wide default based on language pack
2) Use the site/user preference for js popups, like we do in /calendar/
This commit is contained in:
Dan Poltawski
2015-10-15 10:17:08 +01:00
parent b340da9420
commit acbdf41d83
2 changed files with 4 additions and 2 deletions
+2 -1
View File
@@ -64,7 +64,8 @@ preferences,moodle|/user/preferences.php|preferences',
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'),
+2 -1
View File
@@ -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),