From c7b0f4d024e569d0c0a096ac6ed3264c22395cf8 Mon Sep 17 00:00:00 2001 From: Tom Morris Date: Fri, 26 Nov 2010 23:47:09 +0000 Subject: [PATCH] Issue 184 - use default locale date formatting if no format string is specified git-svn-id: http://google-refine.googlecode.com/svn/trunk@1932 7d457c2a-affb-35e4-300a-418c747d4874 --- main/src/com/google/refine/expr/functions/ToString.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/main/src/com/google/refine/expr/functions/ToString.java b/main/src/com/google/refine/expr/functions/ToString.java index 1e9b2c148..3f56f5a95 100644 --- a/main/src/com/google/refine/expr/functions/ToString.java +++ b/main/src/com/google/refine/expr/functions/ToString.java @@ -33,6 +33,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. package com.google.refine.expr.functions; +import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Properties; @@ -49,13 +50,17 @@ public class ToString implements Function { Object o1 = args[0]; if (o1 != null) { if (o1 instanceof Calendar) { + DateFormat formatter = null; if (args.length == 2) { Object o2 = args[1]; if (o2 != null && o2 instanceof String) { - SimpleDateFormat formatter = new SimpleDateFormat((String) o2); - return formatter.format(((Calendar) o1).getTime()); + formatter = new SimpleDateFormat((String) o2); } } + if (formatter == null) { + formatter = DateFormat.getDateInstance(); + } + return formatter.format(((Calendar) o1).getTime()); } else { return (o1 instanceof String) ? o1 : o1.toString(); }