From 41cabeee597faffc2e932a7417d831018d761096 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 3 Feb 2015 12:40:49 +0100
Subject: [PATCH] Fix pb into date management. Added phpunit to avoid this in
future.
---
htdocs/core/datepicker.php | 34 ++++++++++++++++++++++++----------
1 file changed, 24 insertions(+), 10 deletions(-)
diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index 893b3929e2e..03264601624 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -26,13 +26,13 @@
* \brief File to manage popup date selector
*/
-if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // disabled
-//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled cause need to load global conf for START_WEEK
+//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled cause need to load personalized language
+//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled cause need to load personalized language
if (! defined('NOREQUIRESOC')) define('NOREQUIRESOC','1');
-//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Not disabled cause need to do translations
+//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Not disabled cause need to do translations
if (! defined('NOCSRFCHECK')) define('NOCSRFCHECK',1);
if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL',1);
-if (! defined('NOLOGIN')) define('NOLOGIN',1); // disabled
+if (! defined('NOLOGIN')) define('NOLOGIN',1); // Not disabled cause need to load personalized language
if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1);
if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
@@ -188,12 +188,26 @@ function displayBox($selectedDate,$month,$year)
<tr class="dpDayNames">
<?php
$startday=isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:1;
- $day_names = array('ShortSunday', 'ShortMonday', 'ShortTuesday', 'ShortWednesday', 'ShortThursday', 'ShortFriday', 'ShortSaturday');
- for( $i=0; $i < 7; $i++ )
- {
- echo '<td width="', (int) (($i+1)*100/7) - (int) ($i*100/7), '%">', $langs->trans($day_names[($i + $startday) % 7]), '</td>', "\n";
- }
- ?>
+ if($startday==1)
+ {?>
+ <td width="14%"><?php echo $langs->trans("ShortMonday") ?></td>
+ <td width="15%"><?php echo $langs->trans("ShortTuesday") ?></td>
+ <td width="14%"><?php echo $langs->trans("ShortWednesday") ?></td>
+ <td width="15%"><?php echo $langs->trans("ShortThursday") ?></td>
+ <td width="14%"><?php echo $langs->trans("ShortFriday") ?></td>
+ <td width="14%"><?php echo $langs->trans("ShortSaturday") ?></td>
+ <td width="14%"><?php echo $langs->trans("ShortSunday") ?></td>
+ <?php
+ }else {?>
+ <td width="14%"><?php echo $langs->trans("ShortSunday") ?></td>
+ <td width="14%"><?php echo $langs->trans("ShortMonday") ?></td>
+ <td width="15%"><?php echo $langs->trans("ShortTuesday") ?></td>
+ <td width="14%"><?php echo $langs->trans("ShortWednesday") ?></td>
+ <td width="15%"><?php echo $langs->trans("ShortThursday") ?></td>
+ <td width="14%"><?php echo $langs->trans("ShortFriday") ?></td>
+ <td width="14%"><?php echo $langs->trans("ShortSaturday") ?></td>
+ <?php
+ }?>
</tr>
<?php
//print "x ".$thedate." y"; // $thedate = first day of month
--
GitLab