diff --git a/.NET/Microsoft.Recognizers.Definitions.Common/French/DateTimeDefinitions.cs b/.NET/Microsoft.Recognizers.Definitions.Common/French/DateTimeDefinitions.cs index d596ecc47d..fd9d483e02 100644 --- 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 = @"(?matin([ée]e)?)"; public const string AfternoonRegex = @"(?(d'|l')?apr[eè]s(-|\s*)midi)"; public static readonly string MidmorningRegex = $@"(?milieu\s*d[ue]\s*{MorningRegex})"; - public const string MiddayRegex = @"(?milieu(\s*|-)d[eu]\s*(jour|midi)|apr[eè]s(-|\s*)midi)"; + public const string MiddayRegex = @"(?milieu(\s*|-)d[eu]\s*(jour|midi)|apr[eè]s(-|\s*)midi|(?<=\bà\s+)midi)"; public static readonly string MidafternoonRegex = $@"(?milieu\s*d'+{AfternoonRegex})"; public static readonly string MidTimeRegex = $@"(?({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 index ad390dc302..4fddaaf687 100644 --- a/Patterns/French/French-DateTime.yaml +++ b/Patterns/French/French-DateTime.yaml @@ -243,7 +243,7 @@ MidmorningRegex: !nestedRegex def: (?milieu\s*d[ue]\s*{MorningRegex}) references: [ MorningRegex ] MiddayRegex: !simpleRegex - def: (?milieu(\s*|-)d[eu]\s*(jour|midi)|apr[eè]s(-|\s*)midi) + def: (?milieu(\s*|-)d[eu]\s*(jour|midi)|apr[eè]s(-|\s*)midi|(?<=\bà\s+)midi) MidafternoonRegex: !nestedRegex def: (?milieu\s*d'+{AfternoonRegex}) references: [ AfternoonRegex ] diff --git a/Specs/DateTime/French/DateTimeModel.json b/Specs/DateTime/French/DateTimeModel.json index 25cf61e7a6..a0ae069e97 100644 --- 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 + } + ] } ] \ No newline at end of file