From ad0702fe1bb4090a471e218d47f768a810710879 Mon Sep 17 00:00:00 2001 From: shmyga Date: Mon, 25 Nov 2013 18:07:34 +0400 Subject: [PATCH] formatter fix --- haxework/format/Formatter.hx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/haxework/format/Formatter.hx b/haxework/format/Formatter.hx index 81036d8..63caa56 100755 --- a/haxework/format/Formatter.hx +++ b/haxework/format/Formatter.hx @@ -9,8 +9,7 @@ class Formatter implements IFormatter { var locale:ILocale = Provider.get(ILocale); var r:EReg = ~/\{(\w+)\}/g; return r.map(format, function(r:EReg):String { - var pattern:String = r.matched(1); - return switch(pattern) { + return switch(r.matched(1)) { case "ss": doubleDigit(date.getSeconds()); case "nn": doubleDigit(date.getMinutes()); case "hh": doubleDigit(date.getHours()); @@ -19,9 +18,8 @@ class Formatter implements IFormatter { case "yyyy": date.getFullYear() + ""; case "month": locale.getArray("month")[date.getMonth()]; case "Month": firstLetterUp(locale.getArray("month")[date.getMonth()]); - default: return ""; + default: r.matched(0); } - return r.matched(0); }); }