Author: kien_nguyen Date: 2011-02-14 23:07:34 -0500 (Mon, 14 Feb 2011) New Revision: 5883 Added: portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/UserToolbarPortlet_fr.properties portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/UserToolbarPortlet_vi.properties Modified: portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/UserToolbarPortlet_en.properties portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl Log: GTNPORTAL-1749 Labels on user toolbar are not translated Modified: portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/UserToolbarPortlet_en.properties =================================================================== --- portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/UserToolbarPortlet_en.properties 2011-02-14 23:59:44 UTC (rev 5882) +++ portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/UserToolbarPortlet_en.properties 2011-02-15 04:07:34 UTC (rev 5883) @@ -16,4 +16,6 @@ # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA # 02110-1301 USA, or see the FSF site: http://www.fsf.org. # - +UIUserToolBarSitePortlet.header.site=Site +UIUserToolBarGroupPortlet.header.group=Group +UIUserToolBarDashboardPortlet.header.dashboard=Dashboard \ No newline at end of file Added: portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/UserToolbarPortlet_fr.properties =================================================================== --- portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/UserToolbarPortlet_fr.properties (rev 0) +++ portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/UserToolbarPortlet_fr.properties 2011-02-15 04:07:34 UTC (rev 5883) @@ -0,0 +1,21 @@ +# +# Copyright (C) 2009 eXo Platform SAS. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# +UIUserToolBarSitePortlet.header.site=Site +UIUserToolBarGroupPortlet.header.group=Groupe +UIUserToolBarDashboardPortlet.header.dashboard=Dashboard Added: portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/UserToolbarPortlet_vi.properties =================================================================== --- portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/UserToolbarPortlet_vi.properties (rev 0) +++ portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/UserToolbarPortlet_vi.properties 2011-02-15 04:07:34 UTC (rev 5883) @@ -0,0 +1,21 @@ +# +# Copyright (C) 2009 eXo Platform SAS. +# +# This is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; either version 2.1 of +# the License, or (at your option) any later version. +# +# This software is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this software; if not, write to the Free +# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +# 02110-1301 USA, or see the FSF site: http://www.fsf.org. +# +UIUserToolBarSitePortlet.header.site=Site +UIUserToolBarGroupPortlet.header.group=Nhóm +UIUserToolBarDashboardPortlet.header.dashboard=Bảng điều khiển Modified: portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl =================================================================== --- portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-02-14 23:59:44 UTC (rev 5882) +++ portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-02-15 04:07:34 UTC (rev 5883) @@ -99,7 +99,7 @@ <div class="TabsContainer"> <div class="UITab NormalToolbarTab"> <div class=""> - <a class="DashboardIcon TBIcon" href="<%= uicomponent.url("AddDefaultDashboard", defaultDashboardPage); %>">Dashboard</a> + <a class="DashboardIcon TBIcon" href="<%= uicomponent.url("AddDefaultDashboard", defaultDashboardPage); %>"><%=_ctx.appRes("UIUserToolBarDashboardPortlet.header.dashboard")%></a> </div> </div> </div> @@ -114,7 +114,7 @@ <div class="TabsContainer" > <div class="UITab NormalToolbarTab"> <div class=""> - <a class="DashboardIcon TBIcon" href="<%= portalURI + defaultDashboardPage %>">Dashboard</a> + <a class="DashboardIcon TBIcon" href="<%= portalURI + defaultDashboardPage %>"><%=_ctx.appRes("UIUserToolBarDashboardPortlet.header.dashboard")%></a> </div> <% renderDashboards(); %> </div> Modified: portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl =================================================================== --- portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2011-02-14 23:59:44 UTC (rev 5882) +++ portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2011-02-15 04:07:34 UTC (rev 5883) @@ -87,7 +87,7 @@ <div class="TabsContainer"> <div class="UITab NormalToolbarTab"> <div class=""> - <a class="GroupIcon TBIcon" href="<%= portalURI + "groupnavigation" %>">Group</a> + <a class="GroupIcon TBIcon" href="<%= portalURI + "groupnavigation" %>"><%=_ctx.appRes("UIUserToolBarGroupPortlet.header.group")%></a> </div> <% if (!groupNavigations.isEmpty()) { %> <div style="display:none" class="MenuItemContainer"> Modified: portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl =================================================================== --- portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2011-02-14 23:59:44 UTC (rev 5882) +++ portal/branches/branch-GTNPORTAL-1790/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2011-02-15 04:07:34 UTC (rev 5883) @@ -130,7 +130,7 @@ <div class="UITab NormalToolbarTab"> <div class=""> <a class="SitesIcon TBIcon" href="<%= portalURI + "portalnavigation" %>"> - Site + <%=_ctx.appRes("UIUserToolBarSitePortlet.header.site")%> </a> </div> <% renderPortalNavigations() %>