shinsuke 2004/09/11 16:40:18
Modified: components/registry/src/java/org/apache/jetspeed/om/impl
LanguageSetImpl.java
portal/src/java/org/apache/jetspeed/request
JetspeedRequestContext.java
Log:
Fixed JS2-117
http://nagoya.apache.org/jira/browse/JS2-117
Revision Changes Path
1.7 +10 -25
jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/LanguageSetImpl.java
Index: LanguageSetImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/LanguageSetImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LanguageSetImpl.java 17 Aug 2004 06:39:28 -0000 1.6
+++ LanguageSetImpl.java 11 Sep 2004 23:40:18 -0000 1.7
@@ -121,33 +121,18 @@
}
}
- if (fallBack == null)
- {
- if (locale.equals(getDefaultLocale()))
- {
- return new LanguageImpl(locale, "");
- }
- ResourceBundle bundle = null;
- if (resources != null)
- {
- bundle = loadResourceBundle(locale);
- }
- fallBack = createLanguage(locale, bundle);
- }
- else
+ if (fallBack != null && resources != null)
{
- if (resources != null)
- {
- fallBack =
- createLanguage(
- fallBack.getLocale(),
- loadResourceBundle(fallBack.getLocale()),
- fallBack.getTitle(),
- fallBack.getShortTitle(),
- StringUtils.join(fallBack.getKeywords(), ","));
- }
+ fallBack =
+ createLanguage(
+ fallBack.getLocale(),
+ loadResourceBundle(fallBack.getLocale()),
+ fallBack.getTitle(),
+ fallBack.getShortTitle(),
+ StringUtils.join(fallBack.getKeywords(), ","));
}
+
return fallBack;
}
1.32 +5 -0
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java
Index: JetspeedRequestContext.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- JetspeedRequestContext.java 24 Aug 2004 14:27:26 -0000 1.31
+++ JetspeedRequestContext.java 11 Sep 2004 23:40:18 -0000 1.32
@@ -521,6 +521,11 @@
{
language = (Language) langItr.next();
}
+
+ if (language == null)
+ {
+ language = languageSet.get(languageSet.getDefaultLocale());
+ }
if (language == null)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
