Author: theute Date: 2011-03-16 17:07:20 -0400 (Wed, 16 Mar 2011) New Revision: 6052 Modified: epp/portal/branches/EPP_5_1_RH_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java Log: JBEPP-853: Performance issues with the shipped-in applications when the portal has many nodes or pages Fixing again JBEPP-813 Modified: epp/portal/branches/EPP_5_1_RH_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java =================================================================== --- epp/portal/branches/EPP_5_1_RH_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-03-16 21:04:51 UTC (rev 6051) +++ epp/portal/branches/EPP_5_1_RH_Branch/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2011-03-16 21:07:20 UTC (rev 6052) @@ -473,8 +473,9 @@ ExoContainer container = ExoContainerContext.getCurrentContainer(); ResourceBundleManager rbMgr = (ResourceBundleManager)container.getComponentInstanceOfType(ResourceBundleManager.class); Locale locale = Util.getPortalRequestContext().getLocale(); + String localeLanguage = (locale.getCountry().length() > 0) ? locale.getLanguage() + "_" + locale.getCountry() : locale.getLanguage(); return rbMgr.getNavigationResourceBundle( - locale.getLanguage(), + localeLanguage, navigation.getKey().getTypeName(), navigation.getKey().getName()); }