holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get fallback country from locale, rather than language

Browse Source 
Fixes problems with EN is not a country.
This commit is contained in:
Nathan Gray 2016-04-18 22:44:10 +00:00
parent da2dd3bd16
commit b798327eec
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
preferences/inc/class.preferences_hooks.inc.php
View File

@ -91,7 +91,8 @@ class preferences_hooks
$lang = setup::get_lang(); $lang = setup::get_lang();
if (empty($lang)) $lang = 'en'; if (empty($lang)) $lang = 'en';
list(,$country) = explode('-',$lang); list(,$country) = explode('-',$lang);
if (empty($country)) $country = $lang; if (empty($country)) $country = Locale::getRegion(Locale::getDefault());
if (empty($country)) $country = 'de';
} }
// check for old rte_font_size pref including px and split it in size and unit // check for old rte_font_size pref including px and split it in size and unit
if (!isset($GLOBALS['egw_setup']) && if (!isset($GLOBALS['egw_setup']) &&