You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by to...@apache.org on 2008/03/11 10:11:50 UTC
svn commit: r635856 - in /myfaces/shared/trunk_3.0.x/core/src:
main/java/org/apache/myfaces/shared/util/MessageUtils.java
test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java
Author: tomsp
Date: Tue Mar 11 02:11:48 2008
New Revision: 635856
URL: http://svn.apache.org/viewvc?rev=635856&view=rev
Log:
MYFACES-1827: fixed thanks to Veit Guna
Modified:
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
myfaces/shared/trunk_3.0.x/core/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java
Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java?rev=635856&r1=635855&r2=635856&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/util/MessageUtils.java Tue Mar 11 02:11:48 2008
@@ -156,10 +156,9 @@
if(params == null || msgtext == null)
return msgtext;
StringBuffer b = new StringBuffer(100);
- MessageFormat mf = new MessageFormat(msgtext);
if(locale != null)
{
- mf.setLocale(locale);
+ MessageFormat mf = new MessageFormat(msgtext,locale);
b.append(mf.format(params));
localizedStr = b.toString();
}
Modified: myfaces/shared/trunk_3.0.x/core/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java?rev=635856&r1=635855&r2=635856&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/test/java/org/apache/myfaces/shared/util/MessageUtilsTest.java Tue Mar 11 02:11:48 2008
@@ -191,4 +191,23 @@
assertEquals("Konvertierungsfehler", msg.getSummary());
}
+ /**
+ * testSubstituteParamsWithDELocale(
+ */
+ public void testSubstituteParamsWithDELocale() {
+ String paramString = MessageUtils.substituteParams(Locale.GERMANY, "currency {0,number,currency}", new Object[]{100});
+
+ assertEquals("currency 100,00 ",paramString);
+ }
+
+ /**
+ * testSubstituteParamsWithGBLocale(
+ */
+ public void testSubstituteParamsWithGBLocale() {
+ String paramString = MessageUtils.substituteParams(Locale.UK, "currency {0,number,currency}", new Object[]{100});
+
+ System.out.println(paramString);
+ assertEquals("currency £100.00",paramString);
+ }
+
}