[engine] Add String -> Locale in provided default explicit conversions

git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@1847458 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 14 insertions, 1 deletions

diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandlerImpl.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandlerImpl.java
index 13275221..23ceb88f 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandlerImpl.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandlerImpl.java
@@ -19,9 +19,11 @@ package org.apache.velocity.util.introspection;
  * under the License.
  */
 
+import org.apache.commons.lang3.LocaleUtils;
 import org.apache.velocity.util.Pair;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -468,7 +470,7 @@ public class ConversionHandlerImpl implements ConversionHandler
         standardConverterMap.put(new Pair<>(Integer.TYPE, Boolean.class), booleanToInteger);
         standardConverterMap.put(new Pair<>(Integer.TYPE, Boolean.TYPE), booleanToInteger);
 
-        /* boolean to lonf */
+        /* boolean to long */
         Converter<Long> booleanToLong = new Converter<Long>()
         {
             @Override
@@ -491,6 +493,17 @@ public class ConversionHandlerImpl implements ConversionHandler
                 return String.valueOf(o);
             }
         };
+
+        /* string to locale */
+        Converter<Locale> stringToLocale = new Converter<Locale>()
+        {
+            @Override
+            public Locale convert(Object o)
+            {
+                return o == null ? null : LocaleUtils.toLocale((String)o);
+            }
+        };
+        standardConverterMap.put(new Pair<>(Locale.class, String.class), stringToLocale);
     }
 
     /**