Author: ndkhoiits Date: 2010-06-06 23:11:51 -0400 (Sun, 06 Jun 2010) New Revision: 3233 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java Log: GTNPORTAL-1302 Compare [language]_[country] instead of [language] for languages that have another countries Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2010-06-04 10:49:31 UTC (rev 3232) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2010-06-07 03:11:51 UTC (rev 3233) @@ -165,7 +165,10 @@ } } localeConfig = localeConfigService.getLocaleConfig(portalLanguage); - if (portalLanguage == null || !portalLanguage.equals(localeConfig.getLanguage())) + String localeLanguage = (localeConfig.getLocale().getCountry().length() > 0) ? localeConfig.getLocale() + .getLanguage() + + "_" + localeConfig.getLocale().getCountry() : localeConfig.getLocale().getLanguage(); + if (portalLanguage == null || !portalLanguage.equals(localeLanguage)) { // if user language no support by portal -> get browser language if no // ->