[eGroupWare-svn] r55772 - /trunk/preferences/inc/class.preferences_hooks.inc.php

Author: nathangray
Date: Tue Apr 19 00:44:10 2016
New Revision: 55772

URL: http://svn.stylite.de/viewvc/egroupware?rev=55772&view=rev
Log:
Get fallback country from locale, rather than language
Fixes problems with EN is not a country.

Modified:
    trunk/preferences/inc/class.preferences_hooks.inc.php

Modified: trunk/preferences/inc/class.preferences_hooks.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/preferences/inc/class.preferences_hooks.inc.php?rev=55772&r1=55771&r2=55772&view=diff
==============================================================================
--- trunk/preferences/inc/class.preferences_hooks.inc.php (original)
+++ trunk/preferences/inc/class.preferences_hooks.inc.php Tue Apr 19 00:44:10 2016
@@ -91,7 +91,8 @@
 			$lang = setup::get_lang();
 			if (empty($lang)) $lang = 'en';
 			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
 		if (!isset($GLOBALS['egw_setup']) &&


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z