Fix issues with localizations not applying properly

cachethq · May 26, 2016 · 2b87629 · 2b87629
1 parent 48c4240
commit 2b87629
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/app/Foundation/Providers/ConfigServiceProvider.php b/app/Foundation/Providers/ConfigServiceProvider.php
@@ -61,7 +61,7 @@ public function boot()
             $this->app->config->set('app.url', $appDomain);
         }
 
-        if ($appLocale = $this->app->config->get('setting.app.locale')) {
+        if ($appLocale = $this->app->config->get('setting.app_locale')) {
             $this->app->config->set('app.locale', $appLocale);
             $this->app->translator->setLocale($appLocale);
         }

diff --git a/app/Http/Middleware/Localize.php b/app/Http/Middleware/Localize.php
@@ -55,8 +55,7 @@ public function __construct(Repository $config)
      */
     public function handle(Request $request, Closure $next)
     {
-        // Early exit optimization.
-        if (!$this->config->get('setting.automatic_localization')) {
+        if (!(bool) $this->config->get('setting.automatic_localization')) {
             return $next($request);
         }
 

diff --git a/config/setting.php b/config/setting.php
@@ -23,12 +23,24 @@
 
     /*
     |--------------------------------------------------------------------------
-    | Enable subscribers.
+    | Enable subscribers
     |--------------------------------------------------------------------------
     |
     | Whether to allow people to subscribe to the status page.
     |
     */
 
     'enable_subscribers' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Automatic Localization
+    |--------------------------------------------------------------------------
+    |
+    | Whether to automatically localize the status to the visitors default
+    | browser language settings.
+    |
+    */
+
+   'automatic_localization' => false,
 ];