From 9f99e7c0af9617c821ca765e16acd72ea6fbe28f Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 14 May 2015 09:59:30 +0200 Subject: [PATCH] Edit and set language [skip ci] --- app/Http/Controllers/PreferencesController.php | 11 ++++++++++- resources/twig/preferences/index.twig | 6 +++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index 88aba3e124..cd8ac3a10c 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -1,5 +1,6 @@ data; $frontPageAccounts = Preferences::get('frontPageAccounts', []); $budgetMax = Preferences::get('budgetMaximum', 1000); + $languagePref = Preferences::get('language', 'en'); + $language = $languagePref->data; $budgetMaximum = $budgetMax->data; - return view('preferences.index', compact('budgetMaximum', 'accounts', 'frontPageAccounts', 'viewRange')); + return view('preferences.index', compact('budgetMaximum', 'language', 'accounts', 'frontPageAccounts', 'viewRange')); } /** @@ -65,6 +68,12 @@ class PreferencesController extends Controller $budgetMaximum = intval(Input::get('budgetMaximum')); Preferences::set('budgetMaximum', $budgetMaximum); + // language: + $lang = Input::get('language'); + if (in_array($lang, array_keys(Config::get('firefly.lang')))) { + Preferences::set('language', $lang); + } + Session::flash('success', 'Preferences saved!'); diff --git a/resources/twig/preferences/index.twig b/resources/twig/preferences/index.twig index 0cde000ade..9d00c78e28 100644 --- a/resources/twig/preferences/index.twig +++ b/resources/twig/preferences/index.twig @@ -95,7 +95,11 @@ {% for key, lang in Config.get('firefly.lang') %}