dlr 01/10/25 16:07:16
Modified: src/tool/org/apache/turbine/tool LocalizationTool.java
Log:
Patch by Leonard Richardson to delegate to Localization wrapper for
implementation. Modification by myself to change format(String,
Object[]) to format(String, List) for easier use in Velocity
templates.
Revision Changes Path
1.16 +7 -5
jakarta-turbine-3/src/tool/org/apache/turbine/tool/LocalizationTool.java
Index: LocalizationTool.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/tool/org/apache/turbine/tool/LocalizationTool.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- LocalizationTool.java 2001/10/23 18:46:11 1.15
+++ LocalizationTool.java 2001/10/25 23:07:16 1.16
@@ -54,7 +54,7 @@
* <http://www.apache.org/>.
*/
-import java.text.MessageFormat;
+import java.util.List;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
@@ -181,7 +181,7 @@
*/
public String format(String key, Object arg1)
{
- return format(key, new Object[] { arg1 });
+ return Localization.format(bundleName, locale, key, arg1);
}
/**
@@ -195,20 +195,22 @@
*/
public String format(String key, Object arg1, Object arg2)
{
- return format(key, new Object[] { arg1, arg2 });
+ return Localization.format(bundleName, locale, key, arg1, arg2);
}
/**
* Formats a localized value using the provided objects.
*
+ * ['foo', 'bar']
+ *
* @param key The identifier for the localized text to retrieve,
* @param args The objects to use as {0}, {1}, etc. when
* formatting the localized text.
* @return Formatted localized text.
*/
- public String format(String key, Object[] args)
+ public String format(String key, List args)
{
- return MessageFormat.format(get(key), args);
+ return Localization.format(bundleName, locale, key, args.toArray());
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
