remm 2003/07/18 15:54:20
Modified: catalina/src/share/org/apache/catalina/util
StringManager.java
Log:
- Fix a problem where the Strings weren't escaped in the same way for chars
such as '. This caused problems for localization in French.
Revision Changes Path
1.4 +9 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/StringManager.java
Index: StringManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/util/StringManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StringManager.java 9 Apr 2003 04:29:56 -0000 1.3
+++ StringManager.java 18 Jul 2003 22:54:19 -0000 1.4
@@ -142,8 +142,12 @@
*
* @param key
*/
-
public String getString(String key) {
+ return MessageFormat.format(getStringInternal(key), null);
+ }
+
+
+ protected String getStringInternal(String key) {
if (key == null) {
String msg = "key is null";
@@ -173,7 +177,7 @@
public String getString(String key, Object[] args) {
String iString = null;
- String value = getString(key);
+ String value = getStringInternal(key);
// this check for the runtime exception is some pre 1.1.6
// VM's don't do an automatic toString() on the passed in
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
