From a2d7c49c2a4c75313088beff5ca69790eb901bdd Mon Sep 17 00:00:00 2001
From: James Brooks <jbrooksuk@me.com>
Date: Sat, 21 Nov 2015 22:58:25 +0000
Subject: [PATCH] Move $app_locale into AppComposer

---
 app/Composers/AppComposer.php                             | 1 +
 resources/views/dashboard/partials/head.blade.php         | 2 +-
 resources/views/dashboard/settings/localization.blade.php | 2 +-
 resources/views/layout/master.blade.php                   | 2 +-
 resources/views/partials/crowdin.blade.php                | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Composers/AppComposer.php b/app/Composers/AppComposer.php
index 1a4a978d..37c2a41c 100644
--- a/app/Composers/AppComposer.php
+++ b/app/Composers/AppComposer.php
@@ -31,6 +31,7 @@ class AppComposer
         $view->withAppBanner(Setting::get('app_banner'));
         $view->withAppBannerType(Setting::get('app_banner_type'));
         $view->withAppDomain(Setting::get('app_domain'));
+        $view->withAppLocale(Setting::get('app_locale'));
         $view->withAppName(Setting::get('app_name'));
         $view->withAppStylesheet(Setting::get('app_stylesheet'));
         $view->withAppUrl(Config::get('app.url'));
diff --git a/resources/views/dashboard/partials/head.blade.php b/resources/views/dashboard/partials/head.blade.php
index c0dff310..d40c5182 100644
--- a/resources/views/dashboard/partials/head.blade.php
+++ b/resources/views/dashboard/partials/head.blade.php
@@ -28,7 +28,7 @@
 
     <script type="text/javascript">
         var Global = {};
-        Global.locale = '{{ Setting::get('app_locale') }}';
+        Global.locale = '{{ $app_locale }}';
     </script>
     <script src="{{ elixir('dist/js/all.js') }}"></script>
 </head>
diff --git a/resources/views/dashboard/settings/localization.blade.php b/resources/views/dashboard/settings/localization.blade.php
index a88b64fd..3ffbeab8 100644
--- a/resources/views/dashboard/settings/localization.blade.php
+++ b/resources/views/dashboard/settings/localization.blade.php
@@ -65,7 +65,7 @@
                                         <select name="app_locale" class="form-control" required>
                                             <option value="">Select Language</option>
                                             @foreach($langs as $lang => $name)
-                                                <option value="{{ $lang }}" @if(Setting::get('app_locale') == $lang) selected @endif>
+                                                <option value="{{ $lang }}" @if($app_locale == $lang) selected @endif>
                                                     {{ $name }}
                                                 </option>
                                             @endforeach
diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php
index 7bdb6859..dc51c821 100644
--- a/resources/views/layout/master.blade.php
+++ b/resources/views/layout/master.blade.php
@@ -52,7 +52,7 @@
 
     <script type="text/javascript">
         var Global = {};
-        Global.locale = '{{ Setting::get('app_locale') }}';
+        Global.locale = '{{ $app_locale }}';
     </script>
     <script src="{{ elixir('dist/js/all.js') }}"></script>
 </head>
diff --git a/resources/views/partials/crowdin.blade.php b/resources/views/partials/crowdin.blade.php
index e717ed67..e55c2b2d 100644
--- a/resources/views/partials/crowdin.blade.php
+++ b/resources/views/partials/crowdin.blade.php
@@ -1,4 +1,4 @@
-@if(Setting::get('app_locale') === 'en-UD')
+@if($app_locale === 'en-UD')
 <script type="text/javascript">
     var _jipt = [];
     _jipt.push(['project', 'cachet']);