From b719f243c234ee1cfc03d5a6923616375b9cbbf4 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 3 Mar 2016 22:24:27 +0200 Subject: [PATCH] Fix for #751 --- app/Libraries/Utils.php | 7 +++++++ resources/views/tasks/edit.blade.php | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php index c7e003b02090..fbe1cb6a1c52 100644 --- a/app/Libraries/Utils.php +++ b/app/Libraries/Utils.php @@ -127,6 +127,13 @@ class Utils { return App::getLocale() == 'en'; } + + public static function getLocaleRegion() + { + $parts = explode('_', App::getLocale()); + + return count($parts) ? $parts[0] : 'en'; + } public static function getUserType() { diff --git a/resources/views/tasks/edit.blade.php b/resources/views/tasks/edit.blade.php index 279e5917fe55..fb3648206c6c 100644 --- a/resources/views/tasks/edit.blade.php +++ b/resources/views/tasks/edit.blade.php @@ -156,13 +156,12 @@ return moment(this).format(format); }; - ko.bindingHandlers.dateTimePicker = { init: function (element, valueAccessor, allBindingsAccessor) { var value = ko.utils.unwrapObservable(valueAccessor()); // http://xdsoft.net/jqplugins/datetimepicker/ $(element).datetimepicker({ - lang: '{{ App::getLocale() }}', + lang: '{{ Utils::getLocaleRegion() }}', lazyInit: true, validateOnBlur: false, step: 30,