Fix undefined global on setup and timezone names settings

This commit is contained in:
Joseph Cohen
2015-01-08 13:21:53 -06:00
parent 9c50573f18
commit 20f744602a
2 changed files with 7 additions and 0 deletions

View File

@@ -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>

View File

@@ -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]);
}
}