You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sh...@apache.org on 2005/06/19 11:25:10 UTC
svn commit: r191332 - in /portals/jetspeed-2/trunk:
commons/src/java/org/apache/jetspeed/util/JetspeedLocale.java
portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java
Author: shinsuke
Date: Sun Jun 19 02:25:08 2005
New Revision: 191332
URL: http://svn.apache.org/viewcvs?rev=191332&view=rev
Log:
submitted by James Liao. fixed JS2-280(1 and 2)
Modified:
portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/util/JetspeedLocale.java
portals/jetspeed-2/trunk/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java
Modified: portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/util/JetspeedLocale.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/util/JetspeedLocale.java?rev=191332&r1=191331&r2=191332&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/util/JetspeedLocale.java (original)
+++ portals/jetspeed-2/trunk/commons/src/java/org/apache/jetspeed/util/JetspeedLocale.java Sun Jun 19 02:25:08 2005
@@ -31,9 +31,12 @@
public class JetspeedLocale
{
// TODO We need to get this from the properties
-
- public static Locale getDefaultLocale()
- {
- return Locale.getDefault();
- }
+
+ /**
+ * According to PLT.21.8.1, the default locale should be English.
+ */
+ public static Locale getDefaultLocale()
+ {
+ return Locale.ENGLISH;
+ }
}
Modified: portals/jetspeed-2/trunk/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java?rev=191332&r1=191331&r2=191332&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java (original)
+++ portals/jetspeed-2/trunk/portal/src/java/org/apache/jetspeed/util/descriptor/PortletApplicationDescriptor.java Sun Jun 19 02:25:08 2005
@@ -103,12 +103,12 @@
digester.addCallMethod("portlet-app/portlet/supported-locale", "addSupportedLocale", 0);
digester.addObjectCreate("portlet-app/portlet/display-name", PortletDisplayNameImpl.class);
- digester.addSetProperties("portlet-app/portlet/display-name", "lang", "language");
+ digester.addSetProperties("portlet-app/portlet/display-name", "xml:lang", "language");
digester.addBeanPropertySetter("portlet-app/portlet/display-name", "displayName");
digester.addSetNext("portlet-app/portlet/display-name", "addDisplayName");
digester.addObjectCreate("portlet-app/portlet/description", PortletDescriptionImpl.class);
- digester.addSetProperties("portlet-app/portlet/description", "lang", "language");
+ digester.addSetProperties("portlet-app/portlet/description", "xml:lang", "language");
digester.addBeanPropertySetter("portlet-app/portlet/description", "description");
digester.addSetNext("portlet-app/portlet/description", "addDescription");
@@ -118,7 +118,7 @@
digester.addSetNext("portlet-app/portlet/init-param", "addInitParameter");
digester.addObjectCreate("portlet-app/portlet/init-param/description", ParameterDescriptionImpl.class);
- digester.addSetProperties("portlet-app/portlet/init-param/description", "lang", "language");
+ digester.addSetProperties("portlet-app/portlet/init-param/description", "xml:lang", "language");
digester.addBeanPropertySetter("portlet-app/portlet/init-param/description", "description");
digester.addSetNext("portlet-app/portlet/init-param/description", "addDescription");
@@ -147,7 +147,7 @@
digester.addSetNext("portlet-app/portlet/security-role-ref", "addSecurityRoleRef");
digester.addObjectCreate("portlet-app/portlet/security-role-ref/description", SecurityRoleRefDescriptionImpl.class);
- digester.addSetProperties("portlet-app/portlet/security-role-ref/description", "lang", "language");
+ digester.addSetProperties("portlet-app/portlet/security-role-ref/description", "xml:lang", "language");
digester.addBeanPropertySetter("portlet-app/portlet/security-role-ref/description", "description");
digester.addSetNext("portlet-app/portlet/security-role-ref/description", "addDescription");
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org