From 254c81af1b53758307f426af2319375f5f7966c4 Mon Sep 17 00:00:00 2001 From: Davide Bellini Date: Fri, 2 Oct 2015 18:50:10 +0200 Subject: [PATCH] Fixed wrong Locale on Settings form submit Except Setup section, when you submit a form, the Success message doesn't use your current locale but always English (that is the default language). --- app/Http/Controllers/Dashboard/SettingsController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Dashboard/SettingsController.php b/app/Http/Controllers/Dashboard/SettingsController.php index c92ef89e..308d0e41 100644 --- a/app/Http/Controllers/Dashboard/SettingsController.php +++ b/app/Http/Controllers/Dashboard/SettingsController.php @@ -168,7 +168,9 @@ class SettingsController extends Controller return Redirect::route('dashboard.settings.setup')->withErrors(trans('dashboard.settings.edit.failure')); } - Lang::setLocale(Binput::get('app_locale')); + if (Binput::has('app_locale')) { + Lang::setLocale(Binput::get('app_locale')); + } return Redirect::route('dashboard.settings.setup') ->withSuccess(trans('dashboard.settings.edit.success'));