[gatein-commits] gatein SVN: r3923 - epp/portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace.
Author: thomas.heute(a)jboss.com
Date: 2010-08-24 14:43:15 -0400 (Tue, 24 Aug 2010)
New Revision: 3923
Modified:
epp/portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java
Log:
JBEPP-383: Language selection lost at re-login for languages defined with country variant
Modified:
epp/portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java
===================================================================
---
epp/portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2010-08-24
18:38:43 UTC (rev 3922)
+++
epp/portal/branches/EPP_5_0_Branch/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2010-08-24
18:43:15 UTC (rev 3923)
@@ -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
// ->