From 17110710afb0ca1812d00602a27820686b4f8e5f Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 4 Nov 2009 06:55:51 +0000 Subject: [PATCH] Fix: monday is a first day of week by default --- htdocs/admin/ihm.php | 4 ++-- htdocs/comm/action/index.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index c2a1013be62..382355e4c4f 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -187,7 +187,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'edit') // Edit // First day for weeks $var=!$var; print ''.$langs->trans("WeekStartOnDay").''; - print $html->select_dayofweek((isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:''),'MAIN_START_WEEK',0); + print $html->select_dayofweek((isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'),'MAIN_START_WEEK',0); print ''; print ' '; print ''; @@ -346,7 +346,7 @@ else // Show // First day for weeks $var=!$var; print ''.$langs->trans("WeekStartOnDay").''; - print $langs->trans("Day".(isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'0')); + print $langs->trans("Day".(isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1')); print ''; print ' '; print ''; diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 2b69a2d7a4e..ece88d094ff 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -443,7 +443,7 @@ if ($_GET["action"] != 'show_day') // View by month $i=0; while ($i < 7) { - echo ' '.$langs->trans("Day".(($i+$conf->global->MAIN_START_WEEK) % 7))."\n"; + echo ' '.$langs->trans("Day".(($i+(isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1)) % 7))."\n"; $i++; } echo " \n";