From aa9e867f77a163c4286b7d12119c0f72c32845cd Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Fri, 4 Sep 2015 22:19:28 +0930
Subject: [PATCH] Fallback to English if system-wide default_locale doesn't
 exist

---
 framework/core/src/Support/ClientAction.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/framework/core/src/Support/ClientAction.php b/framework/core/src/Support/ClientAction.php
index 40f110ea8..1a3f44340 100644
--- a/framework/core/src/Support/ClientAction.php
+++ b/framework/core/src/Support/ClientAction.php
@@ -248,7 +248,11 @@ abstract class ClientAction extends HtmlAction
         }
 
         if (! $locale || ! $this->locales->hasLocale($locale)) {
-            return $this->settings->get('default_locale', 'en');
+            $locale = $this->settings->get('default_locale', 'en');
+        }
+
+        if (! $this->locales->hasLocale($locale)) {
+            return 'en';
         }
 
         return $locale;