dlr 02/02/27 16:18:46
Modified: src/java/org/apache/turbine/services/localization
LocalizationTool.java
Log:
The rest of Chris Kimpton's backport (good catch by him, cut and past
into patch must have dropped the second chunk).
PR: http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6241
Revision Changes Path
1.3 +12 -7
jakarta-turbine-2/src/java/org/apache/turbine/services/localization/LocalizationTool.java
Index: LocalizationTool.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/localization/LocalizationTool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- LocalizationTool.java 27 Feb 2002 17:17:23 -0000 1.2
+++ LocalizationTool.java 28 Feb 2002 00:18:46 -0000 1.3
@@ -111,20 +111,25 @@
*/
public String get(String key)
{
- if (bundle == null)
- {
- // Cache bundle for use during current request.
- bundle = Localization.getBundle(bundleName, locale);
- }
-
try
{
- return bundle.getString(key);
+ return Localization.getString(getBundleName(null), getLocale(), key);
}
catch (MissingResourceException noKey)
{
+ Log.error(noKey);
return null;
}
+ }
+
+ /**
+ * Gets the current locale.
+ *
+ * @return The locale currently in use.
+ */
+ public Locale getLocale()
+ {
+ return locale;
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
