Author: phuong_vu Date: 2011-03-07 06:37:38 -0500 (Mon, 07 Mar 2011) New Revision: 5971 Modified: portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl Log: GTNPORTAL-1234 Still display Vietnamese language in default tab of dashboard after change to French Modified: portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java =================================================================== --- portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java 2011-03-07 09:58:41 UTC (rev 5970) +++ portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/UIUserToolBarDashboardPortlet.java 2011-03-07 11:37:38 UTC (rev 5971) @@ -49,7 +49,7 @@ public class UIUserToolBarDashboardPortlet extends UIPortletApplication { - public static String DEFAULT_TAB_NAME = "Tab_0"; + public static String DEFAULT_TAB_NAME = "Tab_Default"; public UIUserToolBarDashboardPortlet() throws Exception { @@ -130,8 +130,7 @@ PageNode pageNode = new PageNode(); pageNode.setName(_nodeName); - pageNode.setLabel(prContext.getApplicationResourceBundle().getString("UIUserToolBarDashboard.page.ClickAndType")); - pageNode.setResolvedLabel(prContext.getApplicationResourceBundle()); + pageNode.setLabel("UIUserToolBarDashboard.page.ClickAndType"); pageNode.setUri(_nodeName); pageNode.setPageReference(page.getPageId()); Modified: portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl =================================================================== --- portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-03-07 09:58:41 UTC (rev 5970) +++ portal/branches/branch-GTNPORTAL-1822/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-03-07 11:37:38 UTC (rev 5971) @@ -52,6 +52,11 @@ String href = Util.getPortalRequestContext().getPortalURI() + node.getUri(); String icon = node.getIcon(); if(icon == null) icon = "DefaultPageIcon"; + if (uicomponent.DEFAULT_TAB_NAME.equals(node.getName())) + { + node.setResolvedLabel(_ctx.appRes(node.getLabel())); + } + boolean toolong = (node.resolvedLabel.length() > 60); String label = ( toolong ? node.resolvedLabel.substring(0, 57) + "..." : node.resolvedLabel); String title = ""; @@ -121,4 +126,4 @@ </div> </div> </div> -<% } %> +<% } %>