[richfaces-svn-commits] JBoss Rich Faces SVN: r11761 - trunk/ui/dataTable/src/main/java/org/richfaces/component.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2008-12-14 16:30:03 -0500 (Sun, 14 Dec 2008)
New Revision: 11761

Modified:
   trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
Log:
https://jira.jboss.org/jira/browse/RF-5008

Modified: trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java	2008-12-14 21:23:18 UTC (rev 11760)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/component/UIDataTable.java	2008-12-14 21:30:03 UTC (rev 11761)
@@ -27,6 +27,7 @@
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.el.ELContext;
@@ -34,12 +35,14 @@
 import javax.el.ValueExpression;
 import javax.faces.FacesException;
 import javax.faces.component.UIComponent;
+import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
 
 import org.ajax4jsf.component.SequenceDataAdaptor;
+import org.ajax4jsf.context.ContextInitParameters;
 import org.ajax4jsf.model.ExtendedDataModel;
+import org.richfaces.model.FilterField;
 import org.richfaces.model.Modifiable;
-import org.richfaces.model.FilterField;
 import org.richfaces.model.ModifiableModel;
 import org.richfaces.model.SortField2;
 
@@ -126,7 +129,15 @@
 			if (dataModel instanceof Modifiable) {
 				modifiable = (Modifiable) dataModel;
 			} else {
-				ModifiableModel modifiableModel = new ModifiableModel(dataModel, getVar());
+				Locale locale = null;
+
+				FacesContext facesContext = getFacesContext();
+				if (ContextInitParameters.isDatatableUsesViewLocale(facesContext)) {
+					UIViewRoot viewRoot = facesContext.getViewRoot();
+					locale = viewRoot.getLocale();
+				}
+				
+				ModifiableModel modifiableModel = new ModifiableModel(dataModel, getVar(), locale);
 				dataModel = modifiableModel;
 				modifiable = modifiableModel;
 			}