revert locale modification

OFBIZ-13224

Author: florianMo

framework/base/src/main/java/org/apache/ofbiz/base/conversion/NumberConverters.java

@@ -32,7 +32,7 @@
 public class NumberConverters implements ConverterLoader {
 
     private static Number fromString(String str, Locale locale) throws ConversionException {
-        NumberFormat nf = NumberFormat.getNumberInstance(Locale.getDefault());
+        NumberFormat nf = NumberFormat.getNumberInstance(locale);
         if (nf instanceof DecimalFormat) {
             // CHECKSTYLE_OFF: ALMOST_ALL
             ((DecimalFormat) nf).setParseBigDecimal(true);

framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelFormField.java

@@ -366,7 +366,7 @@ public String getEntry(Map<String, ? extends Object> context, String defaultValu
             if (retVal != null) {
                 // format string based on the user's locale and time zone
                 if (retVal instanceof Double || retVal instanceof Float || retVal instanceof BigDecimal) {
-                    NumberFormat nf = NumberFormat.getInstance(Locale.getDefault());
+                    NumberFormat nf = NumberFormat.getInstance(locale);
                     nf.setMaximumFractionDigits(10);
                     return nf.format(retVal);
                 } else if (retVal instanceof java.sql.Date) {

framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/RenderableFtlFormElementsBuilder.java

@@ -249,7 +249,6 @@ public RenderableFtl displayField(final Map<String, Object> context, final Displ
 
     public RenderableFtl textField(final Map<String, Object> context, final ModelFormField.TextField textField,
                                    final boolean javaScriptEnabled) {
-        Locale locale = (Locale) context.get("locale");
         ModelFormField modelFormField = textField.getModelFormField();
         String name = modelFormField.getParameterName(context);
         String type = textField.getType();
@@ -317,7 +316,6 @@ public RenderableFtl textField(final Map<String, Object> context, final ModelFor
                 .stringParameter("className", String.join(" ", classes))
                 .stringParameter("type", type)
                 .stringParameter("step", step)
-                .stringParameter("lang", locale.getLanguage())
                 .stringParameter("pattern", pattern)
                 .stringParameter("alert", alert)
                 .stringParameter("value", value)

themes/common-theme/template/macro/HtmlFormMacroLibrary.ftl

@@ -44,7 +44,7 @@ under the License.
 <#macro renderHyperlinkField></#macro>
 
 <#macro renderTextField type step pattern name className alert value="" textSize="" maxlength="" id="" event="" action=""
-        disabled=false clientAutocomplete="" ajaxUrl="" ajaxEnabled="" mask="" tabindex="" readonly="" lang="en" required=false
+        disabled=false clientAutocomplete="" ajaxUrl="" ajaxEnabled="" mask="" tabindex="" readonly="" required=false
         placeholder="" delegatorName="default">
   <input type="${type}" name="${name?default("")?html}"<#t/>
   <#if ajaxEnabled?has_content && ajaxEnabled && ajaxUrl?has_content>
@@ -70,7 +70,6 @@ under the License.
     <#if required?has_content && required> required</#if>
     <#if pattern?has_content> pattern="${pattern}"</#if>
     <#if step?has_content> step="${step}"</#if>
-    lang="${lang}"
   /><#t/>
 </#macro>