Comma as decimal mark for Numeral TR

Summary: Closes facebook#28

Differential Revision: D5120967

Pulled By: patapizza

fbshipit-source-id: 41a5e4b

Author: serefayar

Duckling/Distance/TR/Corpus.hs

@@ -31,7 +31,7 @@ allExamples = concat
              , "3km"
              ]
   , examples (DistanceValue Kilometre 3.0)
-             [ "3.0 km"
+             [ "3,0 km"
              ]
   , examples (DistanceValue Mile 8)
              [ "8 Mil"

Duckling/Numeral/TR/Corpus.hs

@@ -68,18 +68,20 @@ allExamples = concat
              , "on sekiz"
              ]
   , examples (NumeralValue 1.1)
-             [ "1.1"
-             , "1.10"
-             , "01.10"
+             [ "1,1"
+             , "1,10"
+             , "01,10"
              , "bir virgül bir"
              , "bir nokta bir"
              ]
   , examples (NumeralValue 0.77)
-             [ "0.77"
-             , ".77"
+             [ "0,77"
+             , ",77"
+             , "sıfır virgül yetmişyedi"
+             , "sıfır virgül yetmiş yedi"
              ]
   , examples (NumeralValue 100000)
-             [ "100,000"
+             [ "100.000"
              , "100000"
              , "100K"
              , "100k"
@@ -89,24 +91,24 @@ allExamples = concat
              [ "3M"
              , "3000K"
              , "3000000"
-             , "3,000,000"
+             , "3.000.000"
              ]
   , examples (NumeralValue 1200000)
-             [ "1,200,000"
+             [ "1.200.000"
              , "1200000"
-             , "1.2M"
+             , "1,2M"
              , "1200K"
-             , ".0012G"
+             , ",0012G"
              , "1200B"
              ]
   , examples (NumeralValue (-1200000))
-             [ "- 1,200,000"
+             [ "- 1.200.000"
              , "-1200000"
-             , "eksi 1,200,000"
+             , "eksi 1.200.000"
              , "negatif 1200000"
-             , "-1.2M"
+             , "-1,2M"
              , "-1200K"
-             , "-.0012G"
+             , "-,0012G"
              , "-1200B"
              ]
   , examples (NumeralValue 5000)
@@ -149,32 +151,34 @@ allExamples = concat
              [ "beş buçuk"
              , "beşbuçuk"
              , "5 buçuk"
-             , "5.5"
+             , "5,5"
              ]
   , examples (NumeralValue 3500000)
-             [ "3.5 milyon"
+             [ "3,5 milyon"
              , "3500000"
              , "üç buçuk milyon"
              , "üçbuçuk milyon"
-             , "3.5M"
+             , "3,5M"
              ]
   , examples (NumeralValue 0.5)
              [ "yarım"
-             , "0.5"
+             , "0,5"
              ]
   , examples (NumeralValue 2500)
-             [ "2.5 bin"
+             [ "2,5 bin"
              , "2500"
-             , "iki buçuk bin"
-             , "ikibuçuk bin"
+             , "iki bin beş yüz"
+             , "ikibin beşyüz"
              ]
   , examples (NumeralValue 2200000)
-             [ "2.2 milyon"
+             [ "2,2 milyon"
              , "iki nokta iki milyon"
+             , "iki virgül iki milyon"
              ]
   , examples (NumeralValue 72.5)
              [ "yetmişikibuçuk"
              , "yetmişiki buçuk"
-             , "72.5"
+             , "yetmiş iki buçuk"
+             , "72,5"
              ]
   ]

Duckling/Numeral/TR/Rules.hs

@@ -110,11 +110,14 @@ ruleDecimalWithThousandsSeparator :: Rule
 ruleDecimalWithThousandsSeparator = Rule
   { name = "decimal with thousands separator"
   , pattern =
-    [ regex "(\\d+(,\\d\\d\\d)+\\.\\d+)"
+    [ regex "(\\d+(\\.\\d\\d\\d)+,\\d+)"
     ]
   , prod = \tokens -> case tokens of
       (Token RegexMatch (GroupMatch (match:_)):_) ->
-        parseDouble (Text.replace (Text.singleton ',') Text.empty match) >>= double
+        let dot = Text.singleton '.'
+            comma = Text.singleton ','
+            fmt = Text.replace comma dot $ Text.replace dot Text.empty match
+        in parseDouble fmt >>= double
       _ -> Nothing
   }
 
@@ -138,11 +141,11 @@ ruleDecimalNumeral :: Rule
 ruleDecimalNumeral = Rule
   { name = "decimal number"
   , pattern =
-    [ regex "(\\d*\\.\\d+)"
+    [ regex "(\\d*,\\d+)"
     ]
   , prod = \tokens -> case tokens of
       (Token RegexMatch (GroupMatch (match:_)):_) ->
-        parseDecimal True match
+        parseDecimal False match
       _ -> Nothing
   }
 
@@ -689,13 +692,13 @@ ruleNumeralDotNumeral = Rule
 
 ruleIntegerWithThousandsSeparator :: Rule
 ruleIntegerWithThousandsSeparator = Rule
-  { name = "integer with thousands separator ,"
+  { name = "integer with thousands separator ."
   , pattern =
-    [ regex "(\\d{1,3}(,\\d\\d\\d){1,5})"
+    [ regex "(\\d{1,3}(\\.\\d\\d\\d){1,5})"
     ]
   , prod = \tokens -> case tokens of
       (Token RegexMatch (GroupMatch (match:_)):_) ->
-        parseDouble (Text.replace (Text.singleton ',') Text.empty match) >>= double
+        parseDouble (Text.replace (Text.singleton '.') Text.empty match) >>= double
       _ -> Nothing
   }