Author: thomas.heute(a)jboss.com Date: 2009-01-19 07:59:27 -0500 (Mon, 19 Jan 2009) New Revision: 12548 Added: tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/ tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource.properties tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource_ja.properties Modified: tags/JBoss_Portal_2_7_1/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/data/default-object.xml tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties Log: Adding Japanese translation Modified: tags/JBoss_Portal_2_7_1/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java =================================================================== --- tags/JBoss_Portal_2_7_1/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java 2009-01-19 11:49:57 UTC (rev 12547) +++ tags/JBoss_Portal_2_7_1/core/src/main/org/jboss/portal/core/model/portal/metadata/PortalObjectMetaData.java 2009-01-19 12:59:27 UTC (rev 12548) @@ -199,7 +199,17 @@ if (resourceBundle != null) { - ResourceBundleManager bundleMgr = MetaDataResourceBundleFactory.createResourceBundleManager(buildContext.getPortalWebApp().getClassLoader(), supportedLocales, resourceBundle); + ClassLoader classloader = null; + if (buildContext.getPortalWebApp() != null) + { + classloader = buildContext.getPortalWebApp().getClassLoader(); + } + else + { + classloader = Thread.currentThread().getContextClassLoader(); + } + + ResourceBundleManager bundleMgr = MetaDataResourceBundleFactory.createResourceBundleManager(classloader, supportedLocales, resourceBundle); object.setDisplayName(bundleMgr.getLocalizedValue("org.jboss.portal.object.name." + object.getId().getPath().toString(PortalObjectPath.LEGACY_FORMAT), object.getName())); } Added: tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource.properties =================================================================== --- tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource.properties (rev 0) +++ tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource.properties 2009-01-19 12:59:27 UTC (rev 12548) @@ -0,0 +1,24 @@ +################################################################################ +# JBoss, a division of Red Hat # +# Copyright 2006, Red Hat Middleware, LLC, and individual # +# contributors as indicated by the @authors tag. See the # +# copyright.txt in the distribution for a full listing of # +# individual contributors. # +# # +# 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. # +################################################################################ + +org.jboss.portal.object.name.admin.default=Admin Property changes on: tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource.properties ___________________________________________________________________ Name: svn:executable + * Added: tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties =================================================================== --- tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties (rev 0) +++ tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties 2009-01-19 12:59:27 UTC (rev 12548) @@ -0,0 +1,24 @@ +################################################################################ +# JBoss, a division of Red Hat # +# Copyright 2006, Red Hat Middleware, LLC, and individual # +# contributors as indicated by the @authors tag. See the # +# copyright.txt in the distribution for a full listing of # +# individual contributors. # +# # +# 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. # +################################################################################ + +org.jboss.portal.object.name.admin.default=Administration Property changes on: tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource_fr.properties ___________________________________________________________________ Name: svn:executable + * Added: tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties =================================================================== --- tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties (rev 0) +++ tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties 2009-01-19 12:59:27 UTC (rev 12548) @@ -0,0 +1,24 @@ +################################################################################ +# JBoss, a division of Red Hat # +# Copyright 2006, Red Hat Middleware, LLC, and individual # +# contributors as indicated by the @authors tag. See the # +# copyright.txt in the distribution for a full listing of # +# individual contributors. # +# # +# 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. # +################################################################################ + +org.jboss.portal.object.name.admin.default=Amministrazione Property changes on: tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties ___________________________________________________________________ Name: svn:executable + * Added: tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource_ja.properties =================================================================== --- tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource_ja.properties (rev 0) +++ tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource_ja.properties 2009-01-19 12:59:27 UTC (rev 12548) @@ -0,0 +1,24 @@ +################################################################################ +# JBoss, a division of Red Hat # +# Copyright 2006, Red Hat Middleware, LLC, and individual # +# contributors as indicated by the @authors tag. See the # +# copyright.txt in the distribution for a full listing of # +# individual contributors. # +# # +# 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. # +################################################################################ + +org.jboss.portal.object.name.admin.default=\u30dd\u30fc\u30bf\u30eb\u7ba1\u7406 Property changes on: tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/bundles/Resource_ja.properties ___________________________________________________________________ Name: svn:executable + * Modified: tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/data/default-object.xml =================================================================== --- tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/data/default-object.xml 2009-01-19 11:49:57 UTC (rev 12547) +++ tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-sar/conf/data/default-object.xml 2009-01-19 12:59:27 UTC (rev 12548) @@ -359,11 +359,12 @@ </security-constraint> <page> <page-name>default</page-name> - <display-name xml:lang="en">Admin</display-name> - <display-name xml:lang="it">Amministrazione</display-name> - <display-name xml:lang="es">Administración</display-name> - <display-name xml:lang="fr">Administration</display-name> - <display-name xml:lang="ru">Администрирование</display-name> + <supported-locale>fr</supported-locale> + <supported-locale>en</supported-locale> + <supported-locale>it</supported-locale> + <supported-locale>ja</supported-locale> + <resource-bundle>conf.bundles.Resource</resource-bundle> + <window> <window-name>AdminPortletWindow</window-name> <instance-ref>AdminPortletInstance</instance-ref> Modified: tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties =================================================================== --- tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2009-01-19 11:49:57 UTC (rev 12547) +++ tags/JBoss_Portal_2_7_1/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2009-01-19 12:59:27 UTC (rev 12548) @@ -34,4 +34,4 @@ PORTAL=Portal ADMIN=Admin MEMBERS=Members -LOGGED=Logged in as \ No newline at end of file +LOGGED=Logged in as