From aada3371b70113c5cae02ab8eb407192ba976c74 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 29 Mar 2016 15:09:37 +0200 Subject: [PATCH] Better translations for dates and so on. --- app/Http/Controllers/Controller.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index b3070f64bf..56f0900feb 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -43,9 +43,6 @@ class Controller extends BaseController if (Auth::check()) { $pref = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US')); $lang = $pref->data; - $this->monthFormat = (string)trans('config.month'); - $this->monthAndDayFormat = (string)trans('config.month_and_day'); - $this->dateTimeFormat = (string)trans('config.date_time'); App::setLocale($lang); Carbon::setLocale(substr($lang, 0, 2)); @@ -55,6 +52,11 @@ class Controller extends BaseController setlocale(LC_TIME, $locale); setlocale(LC_MONETARY, $locale); + // save some formats: + $this->monthFormat = (string)trans('config.month'); + $this->monthAndDayFormat = (string)trans('config.month_and_day'); + $this->dateTimeFormat = (string)trans('config.date_time'); + // change localeconv to a new array: $numberFormatter = numfmt_create($lang, NumberFormatter::CURRENCY); $localeconv = [