From 6c1a29b2328e996d24865659bfdada2199daa999 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 12 Sep 2013 10:33:15 +0200 Subject: [PATCH] make it possible to set saturday as first day of the week --- js/l10n.php | 34 +++++++++++++++++++++++++++++++++- templates/settings.php | 1 + 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/js/l10n.php b/js/l10n.php index d86d10ca..08bcaef4 100644 --- a/js/l10n.php +++ b/js/l10n.php @@ -38,6 +38,38 @@ $eventSources[] = array('url' => $events_baseURL.'?calendar_id=shared_events', OCP\Util::emitHook('OC_Calendar', 'getSources', array('sources' => &$eventSources)); +$firstDay = null; +$firstDayConfig = OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'firstday', 'mo'); +switch($firstDayConfig) { + case 'su': + $firstDay = 0; + break; + + case 'tu': + $firstDay = 2; + break; + + case 'we': + $firstDay = 3; + break; + + case 'th': + $firstDay = 4; + break; + + case 'fr': + $firstDay = 5; + break; + + case 'sa': + $firstDay = 6; + break; + + default: + $firstDay = 1; + break; +} + $array = array( "defaultView" => "\"".OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'currentview', 'month')."\"", "eventSources" => json_encode($eventSources), @@ -60,7 +92,7 @@ $array = array( "missing_field_startsbeforeends" => "\"".addslashes($l->t('The event ends before it starts'))."\"", "missing_field_dberror" => "\"".addslashes($l->t('There was a database fail'))."\"", "totalurl" => "\"".OCP\Util::linkToRemote('caldav')."calendars"."\"", - "firstDay" => (OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'firstday', 'mo') == 'mo' ? '1' : '0'), + "firstDay" => $firstDay, ); // Echo it diff --git a/templates/settings.php b/templates/settings.php index 9936979b..0391470f 100644 --- a/templates/settings.php +++ b/templates/settings.php @@ -67,6 +67,7 @@