[FR DateTimeV2] Fixed "à midi" not recognized as a time (#2602) (#2620)

Co-authored-by: LionbridgeCS2 <[email protected]>
microsoft · May 26, 2021 · 56e869c · 56e869c
1 parent e2d7f63
commit 56e869c
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 4 deletions.
diff --git a/.NET/Microsoft.Recognizers.Definitions.Common/French/DateTimeDefinitions.cs b/.NET/Microsoft.Recognizers.Definitions.Common/French/DateTimeDefinitions.cs
@@ -115,7 +115,7 @@ public static class DateTimeDefinitions
       public const string MorningRegex = @"(?<morning>matin([ée]e)?)";
       public const string AfternoonRegex = @"(?<afternoon>(d'|l')?apr[eè]s(-|\s*)midi)";
       public static readonly string MidmorningRegex = $@"(?<midmorning>milieu\s*d[ue]\s*{MorningRegex})";
-      public const string MiddayRegex = @"(?<midday>milieu(\s*|-)d[eu]\s*(jour|midi)|apr[eè]s(-|\s*)midi)";
+      public const string MiddayRegex = @"(?<midday>milieu(\s*|-)d[eu]\s*(jour|midi)|apr[eè]s(-|\s*)midi|(?<=\bà\s+)midi)";
       public static readonly string MidafternoonRegex = $@"(?<midafternoon>milieu\s*d'+{AfternoonRegex})";
       public static readonly string MidTimeRegex = $@"(?<mid>({MidnightRegex}|{MidmorningRegex}|{MidafternoonRegex}|{MiddayRegex}))";
       public static readonly string AtRegex = $@"\b(((?<=\b[àa]\s+)({WrittenTimeRegex}|{HourNumRegex}|{BaseDateTime.HourRegex}|{MidTimeRegex}))|{MidTimeRegex})\b";

diff --git a/Patterns/French/French-DateTime.yaml b/Patterns/French/French-DateTime.yaml
@@ -243,7 +243,7 @@ MidmorningRegex: !nestedRegex
   def: (?<midmorning>milieu\s*d[ue]\s*{MorningRegex})
   references: [ MorningRegex ]
 MiddayRegex: !simpleRegex
-  def: (?<midday>milieu(\s*|-)d[eu]\s*(jour|midi)|apr[eè]s(-|\s*)midi)
+  def: (?<midday>milieu(\s*|-)d[eu]\s*(jour|midi)|apr[eè]s(-|\s*)midi|(?<=\bà\s+)midi)
 MidafternoonRegex: !nestedRegex
   def: (?<midafternoon>milieu\s*d'+{AfternoonRegex})
   references: [ AfternoonRegex ]

diff --git a/Specs/DateTime/French/DateTimeModel.json b/Specs/DateTime/French/DateTimeModel.json
@@ -5097,12 +5097,12 @@
   },
   {
     "Input": "Je retournerair à midi",
-    "NotSupported": "dotnet, javascript, python, java",
+    "NotSupported": "javascript",
     "Results": [
       {
         "Text": "midi",
         "Start": 18,
-        "End": 22,
+        "End": 21,
         "TypeName": "datetimeV2.time",
         "Resolution": {
           "values": [
@@ -20849,5 +20849,58 @@
         }
       }
     ]
+  },
+  {
+    "Input": "le déjeuner sera prêt à midi",
+    "Context": {
+      "ReferenceDateTime": "2016-11-07T00:00:00"
+    },
+    "NotSupported": "javascript",
+    "Results": [
+      {
+        "Text": "midi",
+        "TypeName": "datetimeV2.time",
+        "Resolution": {
+          "values": [
+            {
+              "timex": "T12",
+              "type": "time",
+              "value": "12:00:00"
+            }
+          ]
+        },
+        "Start": 24,
+        "End": 27
+      }
+    ]
+  },
+  {
+    "Input": "Il y a une fête programmée pour Vendredi à midi.",
+    "Context": {
+      "ReferenceDateTime": "2016-11-07T00:00:00"
+    },
+    "NotSupported": "javascript",
+    "Results": [
+      {
+        "Text": "vendredi à midi",
+        "TypeName": "datetimeV2.datetime",
+        "Resolution": {
+          "values": [
+            {
+              "timex": "XXXX-WXX-5T12",
+              "type": "datetime",
+              "value": "2016-11-04 12:00:00"
+            },
+            {
+              "timex": "XXXX-WXX-5T12",
+              "type": "datetime",
+              "value": "2016-11-11 12:00:00"
+            }
+          ]
+        },
+        "Start": 32,
+        "End": 46
+      }
+    ]
   }
 ]