From 338ff41197c0a8bb5629a7094449c7f262af4540 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 17 Oct 2016 19:40:01 -0400
Subject: [PATCH] CRM-19512 - Return en_US by default from getLocale

---
 CRM/Core/I18n.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Core/I18n.php b/CRM/Core/I18n.php
index fef2bed852..0e07b06b95 100644
--- a/CRM/Core/I18n.php
+++ b/CRM/Core/I18n.php
@@ -669,7 +669,7 @@ class CRM_Core_I18n {
    */
   public static function getLocale() {
     global $tsLocale;
-    return $tsLocale;
+    return $tsLocale ? $tsLocale : 'en_US';
   }
 
 }
-- 
2.25.1