You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/10/03 21:53:10 UTC
svn commit: r1178545 -
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java
Author: lu4242
Date: Mon Oct 3 19:53:09 2011
New Revision: 1178545
URL: http://svn.apache.org/viewvc?rev=1178545&view=rev
Log:
MYFACES-3343 f:convertNumber in jsp only accept Locale instance into its locale attribute
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java?rev=1178545&r1=1178544&r2=1178545&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/taglib/core/ConvertNumberTag.java Mon Oct 3 19:53:09 2011
@@ -19,6 +19,7 @@
package org.apache.myfaces.taglib.core;
import org.apache.myfaces.shared.taglib.UIComponentELTagUtils;
+import org.apache.myfaces.shared.util.LocaleUtils;
import javax.el.ELContext;
import javax.el.ValueExpression;
@@ -150,11 +151,19 @@ public class ConvertNumberTag extends Co
Locale locale;
if (_locale.isLiteralText())
{
- locale = new Locale(_locale.getExpressionString());
+ locale = LocaleUtils.toLocale(_locale.getExpressionString());
}
else
{
- locale = (Locale)_locale.getValue(elContext);
+ Object localeValue = _locale.getValue(elContext);
+ if (localeValue instanceof Locale)
+ {
+ locale = (Locale)localeValue;
+ }
+ else
+ {
+ locale = LocaleUtils.toLocale(localeValue.toString());
+ }
if (null == locale)
{
locale = FacesContext.getCurrentInstance().getViewRoot().getLocale();