[gatein-commits] gatein SVN: r5722 - in portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui: portal and 1 other directory.

[do-not-reply at jboss.org]

Author: ndkhoiits
Date: 2011-01-11 01:50:46 -0500 (Tue, 11 Jan 2011)
New Revision: 5722

Modified:
   portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java
   portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
Log:
GTNPORTAL-1743 Multi-panguage navigation nodes failed for the language having particular country

Modified: portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java	2011-01-11 02:33:36 UTC (rev 5721)
+++ portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/PageNavigationUtils.java	2011-01-11 06:50:46 UTC (rev 5722)
@@ -414,7 +414,7 @@
       if (nav.getOwnerType().equals(PortalConfig.USER_TYPE))
          return;
       ResourceBundle res =
-         i18nManager.getNavigationResourceBundle(locale.getLanguage(), nav.getOwnerType(), nav.getOwnerId());
+         i18nManager.getNavigationResourceBundle(locale.toString(), nav.getOwnerType(), nav.getOwnerId());
       for (PageNode node : nav.getNodes())
       {
          resolveLabel(res, node);

Modified: portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
===================================================================
--- portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java	2011-01-11 02:33:36 UTC (rev 5721)
+++ portal/branches/branch-GTNPORTAL-1745/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java	2011-01-11 06:50:46 UTC (rev 5722)
@@ -382,7 +382,7 @@
       ResourceBundleManager mgr = getApplicationComponent(ResourceBundleManager.class);
       if (nav.getOwnerType().equals(PortalConfig.USER_TYPE))
          return;
-      ResourceBundle res = mgr.getNavigationResourceBundle(locale.getLanguage(), nav.getOwnerType(), nav.getOwnerId());
+      ResourceBundle res = mgr.getNavigationResourceBundle(locale.toString(), nav.getOwnerType(), nav.getOwnerId());
       for (PageNode node : nav.getNodes())
       {
          resolveLabel(res, node);