Author: thomas.heute(a)jboss.com Date: 2008-06-11 12:22:50 -0400 (Wed, 11 Jun 2008) New Revision: 10988 Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfoBuilder.java Modified: branches/JBoss_Portal_Branch_2_6/core-admin/.classpath branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml Log: i18n Modified: branches/JBoss_Portal_Branch_2_6/core-admin/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/.classpath 2008-06-11 15:09:56 UTC (rev 10987) +++ branches/JBoss_Portal_Branch_2_6/core-admin/.classpath 2008-06-11 16:22:50 UTC (rev 10988) @@ -17,10 +17,11 @@ <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/> <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/jsp-api.jar"/> <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar" sourcepath="/module-common"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/identity/lib/portal-identity-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/portlet/lib/portlet-api.jar"/> <classpathentry kind="output" path="output/classes"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java 2008-06-11 15:09:56 UTC (rev 10987) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/ControlPropertiesBean.java 2008-06-11 16:22:50 UTC (rev 10988) @@ -22,12 +22,23 @@ package org.jboss.portal.core.admin.ui; +import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.common.i18n.ResourceBundleManager; +import org.jboss.portal.common.i18n.SimpleResourceBundleFactory; import org.jboss.portal.core.model.portal.PortalObject; import org.jboss.portal.core.model.portal.control.ControlConstants; +import javax.faces.context.FacesContext; import javax.faces.model.SelectItem; +import javax.portlet.PortletConfig; +import javax.portlet.PortletRequest; + import java.util.ArrayList; +import java.util.Iterator; +import java.util.HashMap; import java.util.List; +import java.util.Locale; +import java.util.Map; /** * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> @@ -37,44 +48,65 @@ { /** . */ - private List portalSelectItems; + private Map<Locale, List<SelectItem>> portalSelectItems; /** . */ - private List pageSelectItems; + private Map<Locale, List<SelectItem>> pageSelectItems; /** . */ + private static final String BUNDLE_BASE_NAME = "Resource"; + + /** . */ final PortalObjectManagerBean pomgr; - private static final String DISPLAY_THE_DEFAULT_ERROR_MESSAGE = "Display the default error message"; - private static final String REDIRECT_TO_THE_SPECIFIED_RESOURCE = "Redirect to the specified resource"; - private static final String REMOVE_THE_RESOURCE_FROM_PAGE = "Remove the resource from page"; + private static LocalizedString DISPLAY_THE_DEFAULT_ERROR_MESSAGE = null; + private static LocalizedString REDIRECT_TO_THE_SPECIFIED_RESOURCE = null; + private static LocalizedString REMOVE_THE_RESOURCE_FROM_PAGE = null; public ControlPropertiesBean(PortalObjectManagerBean pomgr) { this.pomgr = pomgr; + + ResourceBundleManager rbm = new ResourceBundleManager(null, new SimpleResourceBundleFactory(BUNDLE_BASE_NAME, PropertiesInfoBuilder.class.getClassLoader())); + // Load all supported locales + Iterator<Locale> locales = FacesContext.getCurrentInstance().getApplication().getSupportedLocales(); + while (locales.hasNext()) + { + Locale locale = locales.next(); + rbm.getResourceBundle(locale); + } + DISPLAY_THE_DEFAULT_ERROR_MESSAGE = rbm.getLocalizedValue("DISPLAY_THE_DEFAULT_ERROR_MESSAGE", "Display the default error message"); + REDIRECT_TO_THE_SPECIFIED_RESOURCE = rbm.getLocalizedValue("REDIRECT_TO_THE_SPECIFIED_RESOURCE", "Redirect to the specified resource"); + REMOVE_THE_RESOURCE_FROM_PAGE = rbm.getLocalizedValue("REMOVE_THE_RESOURCE_FROM_PAGE", "Remove the resource from page"); + portalSelectItems = new HashMap<Locale, List<SelectItem>>(); + pageSelectItems = new HashMap<Locale, List<SelectItem>>(); } - public List getPortalSelectItems() + public List<SelectItem> getPortalSelectItems() { - if (portalSelectItems == null) + Locale locale = FacesContext.getCurrentInstance().getExternalContext().getRequestLocale(); + if (portalSelectItems.get(locale) == null) { - portalSelectItems = new ArrayList(); - portalSelectItems.add(new SelectItem(ControlConstants.IGNORE_CONTROL_VALUE, DISPLAY_THE_DEFAULT_ERROR_MESSAGE)); - portalSelectItems.add(new SelectItem(ControlConstants.JSP_CONTROL_VALUE, REDIRECT_TO_THE_SPECIFIED_RESOURCE)); + List<SelectItem> list = new ArrayList<SelectItem>(); + list.add(new SelectItem(ControlConstants.IGNORE_CONTROL_VALUE, DISPLAY_THE_DEFAULT_ERROR_MESSAGE.getString(locale, true))); + list.add(new SelectItem(ControlConstants.JSP_CONTROL_VALUE, REDIRECT_TO_THE_SPECIFIED_RESOURCE.getString(locale, true))); + portalSelectItems.put(locale, list); } - return portalSelectItems; + return portalSelectItems.get(locale); } - public List getPageSelectItems() + public List<SelectItem> getPageSelectItems() { - if (pageSelectItems == null) + Locale locale = FacesContext.getCurrentInstance().getExternalContext().getRequestLocale(); + if (pageSelectItems.get(locale) == null) { - pageSelectItems = new ArrayList(); - pageSelectItems.add(new SelectItem(ControlConstants.IGNORE_CONTROL_VALUE, DISPLAY_THE_DEFAULT_ERROR_MESSAGE)); - pageSelectItems.add(new SelectItem(ControlConstants.HIDE_CONTROL_VALUE, REMOVE_THE_RESOURCE_FROM_PAGE)); - pageSelectItems.add(new SelectItem(ControlConstants.JSP_CONTROL_VALUE, REDIRECT_TO_THE_SPECIFIED_RESOURCE)); + List<SelectItem> list = new ArrayList<SelectItem>(); + list.add(new SelectItem(ControlConstants.IGNORE_CONTROL_VALUE, DISPLAY_THE_DEFAULT_ERROR_MESSAGE.getString(locale, true))); + list.add(new SelectItem(ControlConstants.HIDE_CONTROL_VALUE, REMOVE_THE_RESOURCE_FROM_PAGE.getString(locale, true))); + list.add(new SelectItem(ControlConstants.JSP_CONTROL_VALUE, REDIRECT_TO_THE_SPECIFIED_RESOURCE.getString(locale, true))); + pageSelectItems.put(locale, list); } - return pageSelectItems; + return pageSelectItems.get(locale); } private ControlPropertyBean grabProperty(String name) Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2008-06-11 15:09:56 UTC (rev 10987) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2008-06-11 16:22:50 UTC (rev 10988) @@ -22,6 +22,23 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.ResourceBundle; +import java.util.Set; + +import javax.faces.application.FacesMessage; +import javax.faces.context.FacesContext; +import javax.faces.event.ActionEvent; +import javax.faces.model.SelectItem; + import org.jboss.portal.core.admin.ui.actions.AddPageAction; import org.jboss.portal.core.admin.ui.actions.PropertyAction; import org.jboss.portal.core.admin.ui.common.PageManagerBean; @@ -50,21 +67,6 @@ import org.jboss.portal.theme.LayoutService; import org.jboss.portal.theme.ThemeService; -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; -import javax.faces.event.ActionEvent; -import javax.faces.model.SelectItem; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - /** The portal object manager bean. */ public class PortalObjectManagerBean implements Serializable, AddPageAction.Listener { @@ -872,7 +874,8 @@ { SelectItem[] result = new SelectItem[ids.size() + 1]; int i = 1; - result[0] = new SelectItem("", "no bound listener"); + ResourceBundle rb = ResourceBundle.getBundle("Resource", FacesContext.getCurrentInstance().getExternalContext().getRequestLocale()); + result[0] = new SelectItem("", rb.getString("NO_BOUND_LISTENER")); for (Iterator idsIt = ids.iterator(); idsIt.hasNext();) { result[i++] = new SelectItem(idsIt.next()); Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java 2008-06-11 15:09:56 UTC (rev 10987) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfo.java 2008-06-11 16:22:50 UTC (rev 10988) @@ -44,41 +44,41 @@ // - public static final PropertyInfo THEME_LAYOUT_ID = new PropertyInfo(ThemeConstants.PORTAL_PROP_LAYOUT, new LocalizedString("Layout id"), new LocalizedString("The layout value formats a page"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE); - public static final PropertyInfo THEME_THEME_ID = new PropertyInfo(ThemeConstants.PORTAL_PROP_THEME, new LocalizedString("Theme id"), new LocalizedString("The theme value skins a page"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE); - public static final PropertyInfo THEME_RENDER_SET_ID = new PropertyInfo(ThemeConstants.PORTAL_PROP_RENDERSET, new LocalizedString("Renderset id"), new LocalizedString("The render set id"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE); - public static final PropertyInfo THEME_RENDER_REGION_ID = new PropertyInfo(ThemeConstants.PORTAL_PROP_REGION, new LocalizedString("Region id"), new LocalizedString("The region that will the window"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE); - public static final PropertyInfo THEME_RENDER_REGION_ORDER = new PropertyInfo(ThemeConstants.PORTAL_PROP_ORDER, new LocalizedString("Region order"), new LocalizedString("The vertical or horizontal order of the window within a region"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE); + public static final PropertyInfo THEME_LAYOUT_ID = PropertiesInfoBuilder.getPropertiesInfo().get(ThemeConstants.PORTAL_PROP_LAYOUT); + public static final PropertyInfo THEME_THEME_ID = PropertiesInfoBuilder.getPropertiesInfo().get(ThemeConstants.PORTAL_PROP_THEME); + public static final PropertyInfo THEME_RENDER_SET_ID = PropertiesInfoBuilder.getPropertiesInfo().get(ThemeConstants.PORTAL_PROP_RENDERSET); + public static final PropertyInfo THEME_RENDER_REGION_ID = PropertiesInfoBuilder.getPropertiesInfo().get(ThemeConstants.PORTAL_PROP_REGION); + public static final PropertyInfo THEME_RENDER_REGION_ORDER = PropertiesInfoBuilder.getPropertiesInfo().get(ThemeConstants.PORTAL_PROP_ORDER); // - public static final PropertyInfo AJAX_PARTIAL_REFRESH = new PropertyInfo(DynaRenderOptions.PARTIAL_REFRESH_ENABLED, new LocalizedString("Partial refresh"), new LocalizedString("Enable partial refresh for portlets"), "java.lang.Boolean", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE); - public static final PropertyInfo AJAX_DND = new PropertyInfo(DynaRenderOptions.DND_ENABLED, new LocalizedString("Drag and drop"), new LocalizedString("Enable window drag and drop"), "java.lang.Boolean", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE); + public static final PropertyInfo AJAX_PARTIAL_REFRESH = PropertiesInfoBuilder.getPropertiesInfo().get(DynaRenderOptions.PARTIAL_REFRESH_ENABLED); + public static final PropertyInfo AJAX_DND = PropertiesInfoBuilder.getPropertiesInfo().get(DynaRenderOptions.DND_ENABLED); // - public static final PropertyInfo WINDOW_CONTENT_TYPE = new PropertyInfo(WindowImpl.PORTAL_PROP_WINDOW_CONTENT_TYPE, new LocalizedString("Content type"), new LocalizedString("The type of content of a window"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE); - public static final PropertyInfo DEFAULT_CHILD_NAME = new PropertyInfo(WindowImpl.PORTAL_PROP_DEFAULT_OBJECT_NAME, new LocalizedString("Default child name"), new LocalizedString("The child name used when no specific child name is explicited"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE); - public static final PropertyInfo PAGE_ORDER = new PropertyInfo("order", new LocalizedString("Tab order"), new LocalizedString("The order value to display pages in tabs"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE); - public static final PropertyInfo INITIAL_WINDOW_STATE = new PropertyInfo(WindowImpl.PORTAL_INITIAL_WINDOW_STATE, new LocalizedString("Initial Mode"), new LocalizedString("The inital mode of the window"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE); + public static final PropertyInfo WINDOW_CONTENT_TYPE = PropertiesInfoBuilder.getPropertiesInfo().get(WindowImpl.PORTAL_PROP_WINDOW_CONTENT_TYPE); + public static final PropertyInfo DEFAULT_CHILD_NAME = PropertiesInfoBuilder.getPropertiesInfo().get(WindowImpl.PORTAL_PROP_DEFAULT_OBJECT_NAME); + public static final PropertyInfo PAGE_ORDER = PropertiesInfoBuilder.getPropertiesInfo().get("order"); + public static final PropertyInfo INITIAL_WINDOW_STATE = PropertiesInfoBuilder.getPropertiesInfo().get(WindowImpl.PORTAL_INITIAL_WINDOW_STATE); // - public static final PropertyInfo CONTROL_POLICY_PAGE_ACCESS_DENIED = new PropertyInfo(ControlConstants.PAGE_ACCESS_DENIED_CONTROL_KEY, new LocalizedString("When access to the window is denied"), new LocalizedString("When access to the window is denied"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE); - public static final PropertyInfo CONTROL_POLICY_PAGE_UNAVAILABLE = new PropertyInfo(ControlConstants.PAGE_UNAVAILABLE_CONTROL_KEY, new LocalizedString("When the window is unavailable"), new LocalizedString("When the window is unavailable"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE); - public static final PropertyInfo CONTROL_POLICY_PAGE_ERROR = new PropertyInfo(ControlConstants.PAGE_ERROR_CONTROL_KEY, new LocalizedString("When there is an error on the window"), new LocalizedString("When there is an error on the window"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE); - public static final PropertyInfo CONTROL_POLICY_PAGE_INTERNAL_ERROR = new PropertyInfo(ControlConstants.PAGE_INTERNAL_ERROR_CONTROL_KEY, new LocalizedString("When there is an error within the window"), new LocalizedString("When there is an error within the window"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE); - public static final PropertyInfo CONTROL_POLICY_PAGE_NOT_FOUND = new PropertyInfo(ControlConstants.PAGE_NOT_FOUND_CONTROL_KEY, new LocalizedString("When the window is not found"), new LocalizedString("When the window is not found"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE); - public static final PropertyInfo CONTROL_POLICY_PAGE_RESOURCE_URI = new PropertyInfo(ControlConstants.PAGE_RESOURCE_URI_CONTROL_KEY, new LocalizedString("On error redirect to this resource"), new LocalizedString("On error redirect to this resource"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE); + public static final PropertyInfo CONTROL_POLICY_PAGE_ACCESS_DENIED = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PAGE_ACCESS_DENIED_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PAGE_UNAVAILABLE = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PAGE_UNAVAILABLE_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PAGE_ERROR = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PAGE_ERROR_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PAGE_INTERNAL_ERROR = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PAGE_INTERNAL_ERROR_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PAGE_NOT_FOUND = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PAGE_NOT_FOUND_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PAGE_RESOURCE_URI = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PAGE_RESOURCE_URI_CONTROL_KEY); // - public static final PropertyInfo CONTROL_POLICY_PORTAL_ACCESS_DENIED = new PropertyInfo(ControlConstants.PORTAL_ACCESS_DENIED_CONTROL_KEY, new LocalizedString("When access to the page is denied"), new LocalizedString("When access to the page is denied"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE); - public static final PropertyInfo CONTROL_POLICY_PORTAL_UNAVAILABLE = new PropertyInfo(ControlConstants.PORTAL_UNAVAILABLE_CONTROL_KEY, new LocalizedString("When the page is unavailable"), new LocalizedString("When the page is unavailable"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE); - public static final PropertyInfo CONTROL_POLICY_PORTAL_ERROR = new PropertyInfo(ControlConstants.PORTAL_ERROR_CONTROL_KEY, new LocalizedString("When there is an error on the page"), new LocalizedString("When there is an error on the page"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE); - public static final PropertyInfo CONTROL_POLICY_PORTAL_INTERNAL_ERROR = new PropertyInfo(ControlConstants.PORTAL_INTERNAL_ERROR_CONTROL_KEY, new LocalizedString("When there is an error within the page"), new LocalizedString("When there is an error within the page"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE); - public static final PropertyInfo CONTROL_POLICY_PORTAL_NOT_FOUND = new PropertyInfo(ControlConstants.PORTAL_NOT_FOUND_CONTROL_KEY, new LocalizedString("When the page is not found"), new LocalizedString("When the page is not found"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE); - public static final PropertyInfo CONTROL_POLICY_PORTAL_RESOURCE_URI = new PropertyInfo(ControlConstants.PORTAL_RESOURCE_URI_CONTROL_KEY, new LocalizedString("On error redirect to this resource"), new LocalizedString("On error redirect to this resource"), "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE); + public static final PropertyInfo CONTROL_POLICY_PORTAL_ACCESS_DENIED = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PORTAL_ACCESS_DENIED_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PORTAL_UNAVAILABLE = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PORTAL_UNAVAILABLE_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PORTAL_ERROR = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PORTAL_ERROR_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PORTAL_INTERNAL_ERROR = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PORTAL_INTERNAL_ERROR_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PORTAL_NOT_FOUND = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PORTAL_NOT_FOUND_CONTROL_KEY); + public static final PropertyInfo CONTROL_POLICY_PORTAL_RESOURCE_URI = PropertiesInfoBuilder.getPropertiesInfo().get(ControlConstants.PORTAL_RESOURCE_URI_CONTROL_KEY); /** . */ Copied: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfoBuilder.java (from rev 10901, branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfoBuilder.java) =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfoBuilder.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesInfoBuilder.java 2008-06-11 16:22:50 UTC (rev 10988) @@ -0,0 +1,172 @@ +/****************************************************************************** + * 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. * + ******************************************************************************/ +package org.jboss.portal.core.admin.ui; + +import java.util.Iterator; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + +import javax.faces.context.FacesContext; +import javax.portlet.PortletConfig; +import javax.portlet.PortletRequest; + +import org.jboss.portal.common.i18n.LocalizedString; +import org.jboss.portal.common.i18n.ResourceBundleManager; +import org.jboss.portal.common.i18n.SimpleResourceBundleFactory; +import org.jboss.portal.core.impl.model.portal.WindowImpl; +import org.jboss.portal.core.model.portal.control.ControlConstants; +import org.jboss.portal.theme.ThemeConstants; +import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision$ + */ +public class PropertiesInfoBuilder +{ + private static Map<String, PropertyInfo> map; + + private static final String BUNDLE_BASE_NAME = "Resource"; + + public static Map<String, PropertyInfo> getPropertiesInfo() + { + if (map == null) + { + map = new HashMap<String, PropertyInfo>(); + + ResourceBundleManager rbm = new ResourceBundleManager(null, new SimpleResourceBundleFactory(BUNDLE_BASE_NAME, PropertiesInfoBuilder.class.getClassLoader())); + + // Load all supported locales + Iterator<Locale> locales = FacesContext.getCurrentInstance().getApplication().getSupportedLocales(); + while (locales.hasNext()) + { + Locale locale = locales.next(); + rbm.getResourceBundle(locale); + } + + LocalizedString name = rbm.getLocalizedValue("THEME_LAYOUT_ID_NAME", "Layout id"); + LocalizedString desc = rbm.getLocalizedValue("THEME_LAYOUT_ID_DESCRIPTION", "The layout value formats a page"); + map.put(ThemeConstants.PORTAL_PROP_LAYOUT, new PropertyInfo(ThemeConstants.PORTAL_PROP_LAYOUT, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("THEME_THEME_ID_NAME", "Theme id"); + desc = rbm.getLocalizedValue("THEME_THEME_ID_DESCRIPTION", "The theme value skins a page"); + map.put(ThemeConstants.PORTAL_PROP_THEME, new PropertyInfo(ThemeConstants.PORTAL_PROP_THEME, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("THEME_RENDER_SET_ID_NAME", "Renderset id"); + desc = rbm.getLocalizedValue("THEME_RENDER_SET_ID_DESCRIPTION", "The render set id"); + map.put(ThemeConstants.PORTAL_PROP_RENDERSET, new PropertyInfo(ThemeConstants.PORTAL_PROP_RENDERSET, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("THEME_RENDER_REGION_ID_NAME", "Region id"); + desc = rbm.getLocalizedValue("THEME_RENDER_REGION_ID_DESCRIPTION", "The region that will the window"); + map.put(ThemeConstants.PORTAL_PROP_REGION, new PropertyInfo(ThemeConstants.PORTAL_PROP_REGION, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("THEME_RENDER_REGION_ORDER_NAME", "Region order"); + desc = rbm.getLocalizedValue("THEME_RENDER_REGION_ORDER_DESCRIPTION", "The vertical or horizontal order of the window within a region"); + map.put(ThemeConstants.PORTAL_PROP_ORDER, new PropertyInfo(ThemeConstants.PORTAL_PROP_ORDER, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE)); + + + name = rbm.getLocalizedValue("AJAX_PARTIAL_REFRESH_NAME", "Partial refresh"); + desc = rbm.getLocalizedValue("AJAX_PARTIAL_REFRESH_DESCRIPTION", "Enable partial refresh for portlets"); + map.put(DynaRenderOptions.PARTIAL_REFRESH_ENABLED, new PropertyInfo(DynaRenderOptions.PARTIAL_REFRESH_ENABLED, name, desc, "java.lang.Boolean", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE)); + + name = rbm.getLocalizedValue("AJAX_DND_NAME", "Drag and drop"); + desc = rbm.getLocalizedValue("AJAX_DND_DESCRIPTION", "Enable window drag and drop"); + map.put(DynaRenderOptions.DND_ENABLED, new PropertyInfo(DynaRenderOptions.DND_ENABLED, name, desc, "java.lang.Boolean", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE)); + + + name = rbm.getLocalizedValue("WINDOW_CONTENT_TYPE_NAME", "Content type"); + desc = rbm.getLocalizedValue("WINDOW_CONTENT_TYPE_DESCRIPTION", "The type of content of a window"); + map.put(WindowImpl.PORTAL_PROP_WINDOW_CONTENT_TYPE, new PropertyInfo(WindowImpl.PORTAL_PROP_WINDOW_CONTENT_TYPE, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("DEFAULT_CHILD_NAME_NAME", "Default child name"); + desc = rbm.getLocalizedValue("DEFAULT_CHILD_NAME_DESCRIPTION", "The child name used when no specific child name is explicited"); + map.put(WindowImpl.PORTAL_PROP_DEFAULT_OBJECT_NAME, new PropertyInfo(WindowImpl.PORTAL_PROP_DEFAULT_OBJECT_NAME, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE)); + + name = rbm.getLocalizedValue("TAB_ORDER_NAME", "Tab order"); + desc = rbm.getLocalizedValue("TAB_ORDER_DESCRIPTION", "The order value to display pages in tabs"); + map.put("order", new PropertyInfo("order", name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE)); + + + name = rbm.getLocalizedValue("INITIAL_WINDOW_STATE_NAME", "Initial Mode"); + desc = rbm.getLocalizedValue("INITIAL_WINDOW_STATE_DESCRIPTION", "The inital mode of the window"); + map.put(WindowImpl.PORTAL_INITIAL_WINDOW_STATE, new PropertyInfo(WindowImpl.PORTAL_INITIAL_WINDOW_STATE, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PUBLIC_SCOPE)); + + // + + name = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_ACCESS_DENIED_NAME", "When access to the window is denied"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_ACCESS_DENIED_DESCRIPTION", "When access to the window is denied"); + map.put(ControlConstants.PAGE_ACCESS_DENIED_CONTROL_KEY, new PropertyInfo(ControlConstants.PAGE_ACCESS_DENIED_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_UNAVAILABLE_NAME", "When the window is unavailable"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_UNAVAILABLE_DESCRIPTION", "When the window is unavailable"); + map.put(ControlConstants.PAGE_UNAVAILABLE_CONTROL_KEY, new PropertyInfo(ControlConstants.PAGE_UNAVAILABLE_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_ERROR_NAME", "When there is an error on the window"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_ERROR_DESCRIPTION", "When there is an error on the window"); + map.put(ControlConstants.PAGE_ERROR_CONTROL_KEY, new PropertyInfo(ControlConstants.PAGE_ERROR_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_INTERNAL_ERROR_NAME", "When there is an error within the window"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_INTERNAL_ERROR_DESCRIPTION", "When there is an error within the window"); + map.put(ControlConstants.PAGE_INTERNAL_ERROR_CONTROL_KEY, new PropertyInfo(ControlConstants.PAGE_INTERNAL_ERROR_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_NOT_FOUND_NAME", "When the window is not found"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_NOT_FOUND_DESCRIPTION", "When the window is not found"); + map.put(ControlConstants.PAGE_NOT_FOUND_CONTROL_KEY, new PropertyInfo(ControlConstants.PAGE_NOT_FOUND_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_RESOURCE_URI_NAME", "On error redirect to this resource"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PAGE_RESOURCE_URI_DESCRIPTION", "On error redirect to this resource"); + map.put(ControlConstants.PAGE_RESOURCE_URI_CONTROL_KEY, new PropertyInfo(ControlConstants.PAGE_RESOURCE_URI_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + // + + name = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_ACCESS_DENIED_NAME", "When access to the page is denied"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_ACCESS_DENIED_DESCRIPTION", "When access to the page is denied"); + map.put(ControlConstants.PORTAL_ACCESS_DENIED_CONTROL_KEY, new PropertyInfo(ControlConstants.PORTAL_ACCESS_DENIED_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_UNAVAILABLE_NAME", "When the page is unavailable"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_UNAVAILABLE_DESCRIPTION", "When the page is unavailable"); + map.put(ControlConstants.PORTAL_UNAVAILABLE_CONTROL_KEY, new PropertyInfo(ControlConstants.PORTAL_UNAVAILABLE_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_ERROR_NAME", "When there is an error on the page"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_ERROR_DESCRIPTION", "When there is an error on the page"); + map.put(ControlConstants.PORTAL_ERROR_CONTROL_KEY, new PropertyInfo(ControlConstants.PORTAL_ERROR_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_INTERNAL_ERROR_NAME", "When there is an error within the page"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DESCRIPTION", "When there is an error within the page"); + map.put(ControlConstants.PORTAL_INTERNAL_ERROR_CONTROL_KEY, new PropertyInfo(ControlConstants.PORTAL_INTERNAL_ERROR_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_NOT_FOUND_NAME", "When the page is not found"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_NOT_FOUND_DESCRIPTION", "When the page is not found"); + map.put(ControlConstants.PORTAL_NOT_FOUND_CONTROL_KEY, new PropertyInfo(ControlConstants.PORTAL_NOT_FOUND_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + name = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_RESOURCE_URI_NAME", "On error redirect to this resource"); + desc = rbm.getLocalizedValue("CONTROL_POLICY_PORTAL_RESOURCE_URI_DESCRIPTION", "On error redirect to this resource"); + map.put(ControlConstants.PORTAL_RESOURCE_URI_CONTROL_KEY, new PropertyInfo(ControlConstants.PORTAL_RESOURCE_URI_CONTROL_KEY, name, desc, "java.lang.String", PropertyInfo.READ_WRITE_ACCESS_MODE, PropertyInfo.PRIVATE_SCOPE)); + + + } + return map; + } +} + Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java 2008-06-11 15:09:56 UTC (rev 10987) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java 2008-06-11 16:22:50 UTC (rev 10988) @@ -22,6 +22,8 @@ ******************************************************************************/ package org.jboss.portal.core.admin.ui; +import javax.faces.context.FacesContext; + import org.jboss.portal.core.model.portal.PortalObject; /** @@ -74,12 +76,12 @@ public String getDescription() { - return info.getDescription().getDefaultString(); + return info.getDescription().getString(FacesContext.getCurrentInstance().getExternalContext().getRequestLocale(), true); } public String getDisplayName() { - return info.getDisplayName().getDefaultString(); + return info.getDisplayName().getString(FacesContext.getCurrentInstance().getExternalContext().getRequestLocale(), true); } public boolean isInherited() Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-06-11 15:09:56 UTC (rev 10987) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource.properties 2008-06-11 16:22:50 UTC (rev 10988) @@ -199,4 +199,57 @@ WIZARD_NEXT=Next WIZARD_SUB_PAGES=Sub-Pages WIZARD_PORTLET_PROVIDER=Portlet provider -WIZARD_CHANGE=Change \ No newline at end of file +WIZARD_CHANGE=Change + +DISPLAY_THE_DEFAULT_ERROR_MESSAGE=Display the default error message +REDIRECT_TO_THE_SPECIFIED_RESOURCE=Redirect to the specified resource +REMOVE_THE_RESOURCE_FROM_PAGE=Remove the resource from page + +THEME_LAYOUT_ID_NAME=Layout id +THEME_LAYOUT_ID_DESCRIPTION=The layout value formats a page +THEME_THEME_ID_NAME=Theme id +THEME_THEME_ID_DESCRIPTION=The theme value skins a page +THEME_RENDER_SET_ID_NAME=Renderset id +THEME_RENDER_SET_ID_DESCRIPTION=The render set id +THEME_RENDER_REGION_ID_NAME=Region id +THEME_RENDER_REGION_ID_DESCRIPTION=The region that will the window +THEME_RENDER_REGION_ORDER_NAME=Region order +THEME_RENDER_REGION_ORDER_DESCRIPTION=The vertical or horizontal order of the window within a region +AJAX_PARTIAL_REFRESH_NAME=Partial refresh +AJAX_PARTIAL_REFRESH_DESCRIPTION=Enable partial refresh for portlets +AJAX_DND_NAME=Drag and drop +AJAX_DND_DESCRIPTION=Enable window drag and drop +WINDOW_CONTENT_TYPE_NAME=Content type +WINDOW_CONTENT_TYPE_DESCRIPTION=The type of content of a window +DEFAULT_CHILD_NAME_NAME=Default child name +DEFAULT_CHILD_NAME_DESCRIPTION=The child name used when no specific child name is explicited +TAB_ORDER_NAME=Tab order +TAB_ORDER_DESCRIPTION=The order value to display pages in tabs +INITIAL_WINDOW_STATE_NAME=Initial Mode +INITIAL_WINDOW_STATE_DESCRIPTION=The initial mode of the window +CONTROL_POLICY_PAGE_ACCESS_DENIED_NAME=When access to the window is denied +CONTROL_POLICY_PAGE_ACCESS_DENIED_DESCRIPTION=When access to the window is denied +CONTROL_POLICY_PAGE_UNAVAILABLE_NAME=When the window is unavailable +CONTROL_POLICY_PAGE_UNAVAILABLE_DESCRIPTION=When the window is unavailable +CONTROL_POLICY_PAGE_ERROR_NAME=When there is an error on the window +CONTROL_POLICY_PAGE_ERROR_DESCRIPTION=When there is an error on the window +CONTROL_POLICY_PAGE_INTERNAL_ERROR_NAME=When there is an error within the window +CONTROL_POLICY_PAGE_INTERNAL_ERROR_DESCRIPTION=When there is an error within the window +CONTROL_POLICY_PAGE_NOT_FOUND_NAME=When the window is not found +CONTROL_POLICY_PAGE_NOT_FOUND_DESCRIPTION=When the window is not found +CONTROL_POLICY_PAGE_RESOURCE_URI_NAME=On error redirect to this resource +CONTROL_POLICY_PAGE_RESOURCE_URI_DESCRIPTION=On error redirect to this resource +CONTROL_POLICY_PORTAL_ACCESS_DENIED_NAME=When access to the page is denied +CONTROL_POLICY_PORTAL_ACCESS_DENIED_DESCRIPTION=When access to the page is denied +CONTROL_POLICY_PORTAL_UNAVAILABLE_NAME=When the page is unavailable +CONTROL_POLICY_PORTAL_UNAVAILABLE_DESCRIPTION=When the page is unavailable +CONTROL_POLICY_PORTAL_ERROR_NAME=When there is an error on the page +CONTROL_POLICY_PORTAL_ERROR_DESCRIPTION=When there is an error on the page +CONTROL_POLICY_PORTAL_INTERNAL_ERROR_NAME=When there is an error within the page +CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DESCRIPTION=When there is an error within the page +CONTROL_POLICY_PORTAL_NOT_FOUND_NAME=When the page is not found +CONTROL_POLICY_PORTAL_NOT_FOUND_DESCRIPTION=When the page is not found +CONTROL_POLICY_PORTAL_RESOURCE_URI_NAME=On error redirect to this resource +CONTROL_POLICY_PORTAL_RESOURCE_URI_DESCRIPTION=On error redirect to this resource + +NO_BOUND_LISTENER=no bound listener Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-06-11 15:09:56 UTC (rev 10987) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/classes/Resource_it.properties 2008-06-11 16:22:50 UTC (rev 10988) @@ -197,4 +197,58 @@ WIZARD_NEXT=Avanti WIZARD_SUB_PAGES=Sotto-Pagine WIZARD_PORTLET_PROVIDER=Fornitore di Portlet -WIZARD_CHANGE=Cambia \ No newline at end of file +<<<<<<< .working +WIZARD_CHANGE=Cambia + +DISPLAY_THE_DEFAULT_ERROR_MESSAGE=Visualizza il messaggio di errore di default +REDIRECT_TO_THE_SPECIFIED_RESOURCE=Redireziona alla risorsa specificata +REMOVE_THE_RESOURCE_FROM_PAGE=Rimuovi la risorsa dalla pagina + +THEME_LAYOUT_ID_NAME=Id Layout +THEME_LAYOUT_ID_DESCRIPTION=Il valore del layout formatta la pagina +THEME_THEME_ID_NAME=Id Tema +THEME_THEME_ID_DESCRIPTION=Il valore del tema copre la pagina +THEME_RENDER_SET_ID_NAME=Id Renderset +THEME_RENDER_SET_ID_DESCRIPTION=L'id del renderset +THEME_RENDER_REGION_ID_NAME=Id Regione +THEME_RENDER_REGION_ID_DESCRIPTION=Regione desiderata per la finestra +THEME_RENDER_REGION_ORDER_NAME=Ordine Regione +THEME_RENDER_REGION_ORDER_DESCRIPTION=L'ordine verticale o orizzontale della finestra dentro una regione +AJAX_PARTIAL_REFRESH_NAME=Aggiornamento parziale +AJAX_PARTIAL_REFRESH_DESCRIPTION=Attiva l'aggiornamento parziale per le portlet +AJAX_DND_NAME=Copia e incolla +AJAX_DND_DESCRIPTION=Attiva il copia e incolla per la finestra +WINDOW_CONTENT_TYPE_NAME=Tipo Contenuto +WINDOW_CONTENT_TYPE_DESCRIPTION=Il tipo di contenuto di una finestra +DEFAULT_CHILD_NAME_NAME=Nome di default del figlio +DEFAULT_CHILD_NAME_DESCRIPTION=Il nome del figlio quando non c'\u00e8 un nome specificato +PAGE_ORDER_NAME=Ordine Etichetta +PAGE_ORDER_DESCRIPTION=Il valore dell'ordine per visualizzare le pagine nelle etichette +INITIAL_WINDOW_STATE_NAME=Modalit\u00e0 iniziale +INITIAL_WINDOW_STATE_DESCRIPTION=La modalit\u00e8 iniziale della finestra +CONTROL_POLICY_PAGE_ACCESS_DENIED_NAME=Quando l'accesso alla finestra \u00e8 negato +CONTROL_POLICY_PAGE_ACCESS_DENIED_DESCRIPTION=Quando l'accesso alla finestra \u00e8 negato +CONTROL_POLICY_PAGE_UNAVAILABLE_NAME=Quando la finestra non \u00e8 disponibile +CONTROL_POLICY_PAGE_UNAVAILABLE_DESCRIPTION=Quando la finestra non \u00e8 disponibile +CONTROL_POLICY_PAGE_ERROR_NAME=Quando c'\u00e8 un errore sulla finestra +CONTROL_POLICY_PAGE_ERROR_DESCRIPTION=Quando c'\u00e8 un errore sulla finestra +CONTROL_POLICY_PAGE_INTERNAL_ERROR_NAME=Quando c'\u00e8 un errore nella finestra +CONTROL_POLICY_PAGE_INTERNAL_ERROR_DESCRIPTION=Quando c'\u00e8 un errore nella finestra +CONTROL_POLICY_PAGE_NOT_FOUND_NAME=Quando la finestra non viene trovata +CONTROL_POLICY_PAGE_NOT_FOUND_DESCRIPTION=Quando la finestra non viene trovata +CONTROL_POLICY_PAGE_RESOURCE_URI_NAME=In caso di errore redireziona sulla risorsa +CONTROL_POLICY_PAGE_RESOURCE_URI_DESCRIPTION=In caso di errore redireziona sulla risorsa +CONTROL_POLICY_PORTAL_ACCESS_DENIED_NAME=Quando l'accesso alla pagina \u00e8 negato +CONTROL_POLICY_PORTAL_ACCESS_DENIED_DESCRIPTION=Quando l'accesso alla pagina \u00e8 negato +CONTROL_POLICY_PORTAL_UNAVAILABLE_NAME=Quando la pagina non \u00e8 disponibile +CONTROL_POLICY_PORTAL_UNAVAILABLE_DESCRIPTION=Quando la pagina non \u00e8 disponibile +CONTROL_POLICY_PORTAL_ERROR_NAME=Quando c'\u00e8 un errore sulla pagina +CONTROL_POLICY_PORTAL_ERROR_DESCRIPTION=Quando c'\u00e8 un errore sulla pagina +CONTROL_POLICY_PORTAL_INTERNAL_ERROR_NAME=Quando c'\u00e8 un errore nella pagina +CONTROL_POLICY_PORTAL_INTERNAL_ERROR_DESCRIPTION=Quando c'\u00e8 un errore nella pagina +CONTROL_POLICY_PORTAL_NOT_FOUND_NAME=Quando la pagina non viene trovata +CONTROL_POLICY_PORTAL_NOT_FOUND_DESCRIPTION=Quando la pagina non viene trovata +CONTROL_POLICY_PORTAL_RESOURCE_URI_NAME=In caso di errore redireziona sulla risorsa +CONTROL_POLICY_PORTAL_RESOURCE_URI_DESCRIPTION=In caso di errore redireziona sulla risorsa + +NO_BOUND_LISTENER=nessun listener Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-06-11 15:09:56 UTC (rev 10987) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/faces-config.xml 2008-06-11 16:22:50 UTC (rev 10988) @@ -31,7 +31,11 @@ <message-bundle>Resource</message-bundle> <property-resolver>org.jboss.portal.core.admin.ui.AdminPropertyResolver</property-resolver> <view-handler>com.sun.facelets.FaceletPortletViewHandler</view-handler> - </application> + <locale-config> + <default-locale>en</default-locale> + <supported-locale>it</supported-locale> + </locale-config> + </application> <converter> <converter-for-class>org.jboss.portal.core.model.content.ContentType</converter-for-class> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-06-11 15:09:56 UTC (rev 10987) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-06-11 16:22:50 UTC (rev 10988) @@ -32,6 +32,8 @@ <portlet-name>AdminPortlet</portlet-name> <display-name>Administration Portlet</display-name> <portlet-class>org.jboss.portal.faces.loader.FacesPortlet</portlet-class> + <supported-locale>en</supported-locale> + <supported-locale>it</supported-locale> <init-param> <name>default-view</name> <value>/WEB-INF/jsf/objects.xhtml</value>