dlr 02/03/08 10:00:24
Modified: src/java/org/apache/turbine/services/localization
Localization.java
Log:
Patch by Chris Kimpton <[EMAIL PROTECTED]>:
"Change the Localization class to always use the LocalizationService
getString - thus using the bundle chaining feature.
Some methods were using it and some weren't. This patch makes them
all use it."
Fixes <http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6979>.
Revision Changes Path
1.6 +4 -5
jakarta-turbine-2/src/java/org/apache/turbine/services/localization/Localization.java
Index: Localization.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/localization/Localization.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- Localization.java 27 Feb 2002 17:17:23 -0000 1.5
+++ Localization.java 8 Mar 2002 18:00:24 -0000 1.6
@@ -86,7 +86,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: Localization.java,v 1.5 2002/02/27 17:17:23 dlr Exp $
+ * @version $Id: Localization.java,v 1.6 2002/03/08 18:00:24 dlr Exp $
*/
public abstract class Localization
{
@@ -115,7 +115,7 @@
*/
public static String getString(String key)
{
- return getService().getBundle().getString(key);
+ return getService().getString(null, null, key);
}
/**
@@ -143,7 +143,7 @@
*/
public static String getString(String key, HttpServletRequest req)
{
- return getService().getBundle(req).getString(key);
+ return getService().getString(null, getLocale(req), key);
}
/**
@@ -158,8 +158,7 @@
*/
public static String getString(String key, String lang)
{
- return getBundle(getDefaultBundleName(), new Locale(lang, ""))
- .getString(key);
+ return getString(getDefaultBundleName(), new Locale(lang, ""),key);
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
