[.NET] Add workaround for USD$/MXN$ empty resolution issue (microsoft…

…#2721)
Ylopo · Sep 27, 2021 · f9b9b44 · f9b9b44
1 parent 3464322
commit f9b9b44
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 14 deletions.
diff --git a/.NET/Microsoft.Recognizers.Definitions.Common/English/NumbersWithUnitDefinitions.cs b/.NET/Microsoft.Recognizers.Definitions.Common/English/NumbersWithUnitDefinitions.cs
@@ -243,7 +243,7 @@ public static class NumbersWithUnitDefinitions
             { @"Cuban convertible peso", @"cuban convertible pesos|cuban convertible peso|cuc|cuba convertible pesos|cuba convertible peso" },
             { @"Cuban peso", @"cuban pesos|cuban peso|cup|cuba pesos|cuba peso" },
             { @"Dominican peso", @"dominican pesos|dominican peso|dop|dominica pesos|dominica peso" },
-            { @"Mexican peso", @"mexican pesos|mexican peso|mxn|mexico pesos|mexico peso" },
+            { @"Mexican peso", @"mexican pesos|mexican peso|mxn|mexico pesos|mexico peso|mxn$" },
             { @"Philippine peso", @"piso|philippine pesos|philippine peso|₱|php" },
             { @"Uruguayan peso", @"uruguayan pesos|uruguayan peso|uyu" },
             { @"Peso", @"pesos|peso" },
@@ -268,7 +268,7 @@ public static class NumbersWithUnitDefinitions
             { @"Pence", @"pence" },
             { @"Shilling", @"shillings|shilling|shilingi|sh" },
             { @"Penny", @"pennies|penny" },
-            { @"United States dollar", @"united states dollars|united states dollar|united states $|u.s. dollars|u.s. dollar|u s dollar|u s dollars|usd|american dollars|american dollar|us$|us dollar|us dollars|u.s dollar|u.s dollars" },
+            { @"United States dollar", @"united states dollars|united states dollar|united states $|u.s. dollars|u.s. dollar|u s dollar|u s dollars|usd|american dollars|american dollar|us$|us dollar|us dollars|u.s dollar|u.s dollars|usd$" },
             { @"East Caribbean dollar", @"east caribbean dollars|east caribbean dollar|east Caribbean $|xcd" },
             { @"Australian dollar", @"australian dollars|australian dollar|australian $|australian$|aud|australia dollars|australia dollar|australia $|australia$" },
             { @"Bahamian dollar", @"bahamian dollars|bahamian dollar|bahamian $|bahamian$|bsd|bahamia dollars|bahamia dollar|bahamia $|bahamia$" },
@@ -583,8 +583,9 @@ public static class NumbersWithUnitDefinitions
             { @"Dobra", @"db|std" },
             { @"Dollar", @"$" },
             { @"Brazilian Real", @"R$" },
-            { @"United States dollar", @"united states $|us$|us $|u.s. $|u.s $" },
+            { @"United States dollar", @"united states $|us$|us $|u.s. $|u.s $|usd$" },
             { @"East Caribbean dollar", @"east caribbean $" },
+            { @"Mexican peso", @"mxn$" },
             { @"Australian dollar", @"australian $|australia $" },
             { @"Bahamian dollar", @"bahamian $|bahamia $" },
             { @"Barbadian dollar", @"barbadian $|barbadin $" },

diff --git a/.../java/com/microsoft/recognizers/text/numberwithunit/resources/EnglishNumericWithUnit.java b/.../java/com/microsoft/recognizers/text/numberwithunit/resources/EnglishNumericWithUnit.java
@@ -235,7 +235,7 @@ public class EnglishNumericWithUnit {
         .put("Cuban convertible peso", "cuban convertible pesos|cuban convertible peso|cuc|cuba convertible pesos|cuba convertible peso")
         .put("Cuban peso", "cuban pesos|cuban peso|cup|cuba pesos|cuba peso")
         .put("Dominican peso", "dominican pesos|dominican peso|dop|dominica pesos|dominica peso")
-        .put("Mexican peso", "mexican pesos|mexican peso|mxn|mexico pesos|mexico peso")
+        .put("Mexican peso", "mexican pesos|mexican peso|mxn|mexico pesos|mexico peso|mxn$")
         .put("Philippine peso", "piso|philippine pesos|philippine peso|₱|php")
         .put("Uruguayan peso", "uruguayan pesos|uruguayan peso|uyu")
         .put("Peso", "pesos|peso")
@@ -260,7 +260,7 @@ public class EnglishNumericWithUnit {
         .put("Pence", "pence")
         .put("Shilling", "shillings|shilling|shilingi|sh")
         .put("Penny", "pennies|penny")
-        .put("United States dollar", "united states dollars|united states dollar|united states $|u.s. dollars|u.s. dollar|u s dollar|u s dollars|usd|american dollars|american dollar|us$|us dollar|us dollars|u.s dollar|u.s dollars")
+        .put("United States dollar", "united states dollars|united states dollar|united states $|u.s. dollars|u.s. dollar|u s dollar|u s dollars|usd|american dollars|american dollar|us$|us dollar|us dollars|u.s dollar|u.s dollars|usd$")
         .put("East Caribbean dollar", "east caribbean dollars|east caribbean dollar|east Caribbean $|xcd")
         .put("Australian dollar", "australian dollars|australian dollar|australian $|australian$|aud|australia dollars|australia dollar|australia $|australia$")
         .put("Bahamian dollar", "bahamian dollars|bahamian dollar|bahamian $|bahamian$|bsd|bahamia dollars|bahamia dollar|bahamia $|bahamia$")
@@ -576,8 +576,9 @@ public class EnglishNumericWithUnit {
         .put("Dobra", "db|std")
         .put("Dollar", "$")
         .put("Brazilian Real", "R$")
-        .put("United States dollar", "united states $|us$|us $|u.s. $|u.s $")
+        .put("United States dollar", "united states $|us$|us $|u.s. $|u.s $|usd$")
         .put("East Caribbean dollar", "east caribbean $")
+        .put("Mexican peso", "mxn$")
         .put("Australian dollar", "australian $|australia $")
         .put("Bahamian dollar", "bahamian $|bahamia $")
         .put("Barbadian dollar", "barbadian $|barbadin $")