From 84ce9bc94ba555228b8c13e6cef93f8ba75972f3 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Fri, 8 Jan 2016 20:47:35 +0100
Subject: [PATCH] Move locale code.

---
 app/Http/Controllers/Controller.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 7a0c715502..ea8b4c3a99 100755
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -2,6 +2,7 @@
 
 namespace FireflyIII\Http\Controllers;
 
+use App;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
@@ -36,6 +37,14 @@ class Controller extends BaseController
             $this->monthFormat       = trans('config.month');
             $this->monthAndDayFormat = trans('config.month_and_day');
 
+            App::setLocale($lang);
+            Carbon::setLocale(substr($lang, 0, 2));
+            $locale = explode(',', trans('config.locale'));
+            $locale = array_map('trim', $locale);
+
+            setlocale(LC_TIME, $locale);
+            setlocale(LC_MONETARY, $locale);
+
             View::share('monthFormat', $this->monthFormat);
             View::share('monthAndDayFormat', $this->monthAndDayFormat);
             View::share('language', $lang);