From 55ce974f2ab21987751af69f9f2eddd8672ef563 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Sun, 1 Nov 2009 08:22:39 +0000 Subject: [PATCH] Changed $date_system value of 3 to be traditional, but non-workday is Friday and start of week is Saturday. For DatePicker. --- CHANGELOG.txt | 6 ++++++ config.default.php | 2 +- includes/ui/ui_view.inc | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 634cd0aa..799facef 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,12 @@ Legend: ! -> Note $ -> Affected files +01-Nov-2009 Joe Hunt +! Changed $date_system value of 3 to be traditional, but non-workday is Friday + and start of week is Saturday. For DatePicker. +$ config.default.php + /includes/ui/ui_view.inc + 30-Oct-2009 Janusz Dobrowolski # Fixed non-default company selection bug on login. $ /includes/session.inc diff --git a/config.default.php b/config.default.php index 6834dbc7..cfc37170 100644 --- a/config.default.php +++ b/config.default.php @@ -97,7 +97,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_ $accounts_alpha = 0; /* Date systems. 0 = traditional, 1 = Jalali used by Iran, nabour countries, Afghanistan and some other Central Asian nations, - 2 = Islamic used by other arabic nations */ + 2 = Islamic used by other arabic nations. 3 = traditional, but where non-workday is Friday and start of week is Saturday */ $date_system = 0; /* email stock location if order below reorder-level */ diff --git a/includes/ui/ui_view.inc b/includes/ui/ui_view.inc index 48ef063e..8c6bf63b 100644 --- a/includes/ui/ui_view.inc +++ b/includes/ui/ui_view.inc @@ -708,7 +708,7 @@ function get_js_date_picker() $how = user_date_format(); // 0 = us/ca, 1 = eu, au, nz, 2 = jp, sw $sep = $dateseps[user_date_sep()]; // date separator - $wstart = (($date_system == 1 || $date_system == 2) ? 6 : ($how == 0 ? 0 : 1)); // weekstart (sun = 0, mon = 1) + $wstart = (($date_system == 1 || $date_system == 2 || $date_system == 3) ? 6 : ($how == 0 ? 0 : 1)); // weekstart (sun = 0, mon = 1) $months = array(_("January"),_("February"),_("March"),_("April"),_("May"),_("June"),_("July"),_("August"),_("September"),_("October"),_("November"),_("December")); $wdays = array(_("Su"),_("Mo"),_("Tu"),_("We"),_("Th"),_("Fr"),_("Sa")); $wno = _("W"); // week no @@ -1005,7 +1005,7 @@ function CC() { if (dayOfMonth == selectedDay && currentYear == selectedYear && currentMonth == selectedMonth) { css_class = 'current'; "; - if ($date_system == 1 || $date_system == 2) + if ($date_system == 1 || $date_system == 2 || $date_system == 3) $js .= " } else if (dayOfWeek == 5) { "; -- 2.30.2