projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
adb5b57
)
CRM-19512 - Return en_US by default from getLocale
author
Coleman Watts
<coleman@civicrm.org>
Mon, 17 Oct 2016 23:40:01 +0000
(19:40 -0400)
committer
Coleman Watts
<coleman@civicrm.org>
Mon, 17 Oct 2016 23:40:01 +0000
(19:40 -0400)
CRM/Core/I18n.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Core/I18n.php
b/CRM/Core/I18n.php
index fef2bed8523dcbff69d38fbb79f47558473f7b5a..0e07b06b95951ad746ee894e0e2cfbe3991c542f 100644
(file)
--- 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'
;
}
}