From 20f744602aef235b3b8c5a597b3e05c49e421d31 Mon Sep 17 00:00:00 2001
From: Joseph Cohen <joseph.cohen@dinkbit.com>
Date: Thu, 8 Jan 2015 13:21:53 -0600
Subject: [PATCH] Fix undefined global on setup and timezone names settings

---
 app/views/partials/dashboard/head.blade.php     | 5 +++++
 src/Http/Controllers/DashSettingsController.php | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/app/views/partials/dashboard/head.blade.php b/app/views/partials/dashboard/head.blade.php
index 1133d9d4..98597284 100644
--- a/app/views/partials/dashboard/head.blade.php
+++ b/app/views/partials/dashboard/head.blade.php
@@ -22,6 +22,11 @@
 
     <link href="//fonts.googleapis.com/css?family=Lato:300,400,700" rel="stylesheet" type="text/css">
     <link rel="stylesheet" href="{{ elixir('css/all.css') }}">
+
+    <script type="text/javascript">
+        var Global = {};
+        Global.locale = '{{ Setting::get('app_locale') }}';
+    </script>
     <script src="{{ elixir('js/all.js') }}"></script>
 
 </head>
diff --git a/src/Http/Controllers/DashSettingsController.php b/src/Http/Controllers/DashSettingsController.php
index edcfdc3b..4809a34c 100644
--- a/src/Http/Controllers/DashSettingsController.php
+++ b/src/Http/Controllers/DashSettingsController.php
@@ -87,6 +87,8 @@ class DashSettingsController extends Controller
 
                 // Remove region name and add a sample time
                 $timezones[$name][$timezone] = substr($timezone, strlen($name) + 1).' - '.$time->format('H:i').$ampm;
+
+                $timezones[$name] = str_replace('_', ' ', $timezones[$name]);
             }
         }