Setting for the first day of the week

diff --git a/mod/events.php b/mod/events.php
index c9c9b7d9f12ecc345def94e80a5dfd45ce56b643..e601ce8e4e82bf9332184aebca452ff23b7972da 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -189,8 +189,7 @@ function events_content(&$a) {
                $editselect = 'textareas';
 
        // First day of the week (0 = Sunday)
-       // To-Do: Needs to be configurable
-       $firstDay = 0;
+       $firstDay = get_pconfig(local_user(),'system','first_day_of_week');
 
        $i18n = array(
                        "firstDay" => $firstDay,

diff --git a/mod/settings.php b/mod/settings.php
index 556fb63e8ad294c35dae29fe6131cdf7971afba3..e18d8bd6d85fdc0cf645586dd61a4da25b9fcff1 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -284,6 +284,7 @@ function settings_post(&$a) {
                $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme']))  : $a->user['theme']);
                $mobile_theme = ((x($_POST,'mobile_theme')) ? notags(trim($_POST['mobile_theme']))  : '');
                $nosmile = ((x($_POST,'nosmile')) ? intval($_POST['nosmile'])  : 0);
+               $first_day_of_week = ((x($_POST,'first_day_of_week')) ? intval($_POST['first_day_of_week'])  : 0);
                $noinfo = ((x($_POST,'noinfo')) ? intval($_POST['noinfo'])  : 0);
                $infinite_scroll = ((x($_POST,'infinite_scroll')) ? intval($_POST['infinite_scroll'])  : 0);
                $no_auto_update = ((x($_POST,'no_auto_update')) ? intval($_POST['no_auto_update'])  : 0);
@@ -308,6 +309,7 @@ function settings_post(&$a) {
                set_pconfig(local_user(),'system','itemspage_network', $itemspage_network);
                set_pconfig(local_user(),'system','itemspage_mobile_network', $itemspage_mobile_network);
                set_pconfig(local_user(),'system','no_smilies',$nosmile);
+               set_pconfig(local_user(),'system','first_day_of_week',$first_day_of_week);
                set_pconfig(local_user(),'system','ignore_info',$noinfo);
                set_pconfig(local_user(),'system','infinite_scroll',$infinite_scroll);
                set_pconfig(local_user(),'system','no_auto_update',$no_auto_update);
@@ -915,6 +917,10 @@ function settings_content(&$a) {
                $nosmile = get_pconfig(local_user(),'system','no_smilies');
                $nosmile = (($nosmile===false)? '0': $nosmile); // default if not set: 0
 
+               $first_day_of_week = get_pconfig(local_user(),'system','first_day_of_week');
+               $first_day_of_week = (($first_day_of_week===false)? '0': $first_day_of_week); // default if not set: 0
+               $weekdays = array(0 => t("Sunday"), 1 => t("Monday"));
+
                $noinfo = get_pconfig(local_user(),'system','ignore_info');
                $noinfo = (($noinfo===false)? '0': $noinfo); // default if not set: 0
 
@@ -944,6 +950,7 @@ function settings_content(&$a) {
                        '$itemspage_network'   => array('itemspage_network',  t("Number of items to display per page:"), $itemspage_network, t('Maximum of 100 items')),
                        '$itemspage_mobile_network'   => array('itemspage_mobile_network',  t("Number of items to display per page when viewed from mobile device:"), $itemspage_mobile_network, t('Maximum of 100 items')),
                        '$nosmile'      => array('nosmile', t("Don't show emoticons"), $nosmile, ''),
+                       '$first_day_of_week'    => array('first_day_of_week', t('Beginning of week:'), $first_day_of_week, '', $weekdays, false),
                        '$noinfo'       => array('noinfo', t("Don't show notices"), $noinfo, ''),
                        '$infinite_scroll'      => array('infinite_scroll', t("Infinite scroll"), $infinite_scroll, ''),
                        '$no_auto_update'       => array('no_auto_update', t("Automatic updates only at the top of the network page"), $no_auto_update, 'When disabled, the network page is updated all the time, which could be confusing while reading.'),

diff --git a/view/templates/settings_display.tpl b/view/templates/settings_display.tpl
index ac41c1c27c7e220df3a99523c16b7181a443df7a..ff2d7fe1d64757e12acc7f894c1ee822ce562442 100644 (file)
--- a/view/templates/settings_display.tpl
+++ b/view/templates/settings_display.tpl
@@ -13,6 +13,7 @@
 {{include file="field_checkbox.tpl" field=$nosmile}}
 {{include file="field_checkbox.tpl" field=$noinfo}}
 {{include file="field_checkbox.tpl" field=$infinite_scroll}}
+{{include file="field_select.tpl" field=$first_day_of_week}}
 
 
 <div class="settings-submit-wrapper" >