Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Java][Number] Decrease end property of ModelResult by 1 #2461

Merged
merged 4 commits into from
Feb 5, 2021
Merged

[Java][Number] Decrease end property of ModelResult by 1 #2461

merged 4 commits into from
Feb 5, 2021

Conversation

Batta32
Copy link
Contributor

@Batta32 Batta32 commented Feb 2, 2021

Fixes #2254

Description

There is a disparity on the generation of the ModelResult, specifically the end property, which needs to be decreased by 1. See C# and Java. Also, JavaScript follows the behavior of C#.

Specific Changes

  • Decrease the end property of ModelResult by 1

Testing

These changes were validated using the PR #2439.

Parity of ModelResult
image

Test passing correctly using Java 8/11/15
image

tellarin
tellarin requested changes Feb 3, 2021
View reviewed changes
...t-number/src/main/java/com/microsoft/recognizers/text/number/models/AbstractNumberModel.java
@@ -54,7 +54,7 @@ protected AbstractNumberModel(IParser parser, IExtractor extractor) {
return new ModelResult(
o.getText(),
o.getStart(),
o.getStart() + o.getLength(),
o.getStart() + o.getLength() - 1,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a code comment before to return to specify this is to keep behaviour consistent with the other platforms?
Also, how did the *Model.json unit tests pass if this was incorrect?
Can you fix whatever issue there is there in this PR too? Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @tellarin, we already added the code comment before to return as requested.

Also, we noticed that the start and end were not validated and that's why the tests were passing with/without these changes. We updated the NumberTest following C# and JavaScript in order to validate the necessary properties divided in each type of Recognizer.

We confirmed that all the tests are correctly passing 😊.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I'll review soon. Are the other models correct? DateTime, Units, ...?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tellarin, all the models are validating the typeName, text and Resolution properties of the specs.

If you are okay, we can create an issue improving this behavior for all the models apart from this PR/issue in order to have this PR reviewed/merged as soon as possible 😊.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please create the issue and a new PR. 😊

@tellarin tellarin merged commit 0ad214f into microsoft:master Feb 5, 2021
@Batta32 Batta32 deleted the feature/southworks/java/fix-modelresult-disparity branch February 5, 2021 11:58
@Batta32 Batta32 mentioned this pull request Feb 5, 2021
Closed
This was referenced Feb 25, 2021
Closed
Merged
pete1854 added a commit to pete1854/Recognizers-Text that referenced this pull request Oct 6, 2021
@pete1854
Squashed commit of the following:
60992aa 
commit cd7f53e67aac91ca27b20dd070fcd630cfb495a2
Merge: afb5ff6d bf8eb3c7
Author: Peter Rundqvist <[email protected]>
Date:   Fri Oct 1 15:30:13 2021 +0200

    Merge branch 'microsoft:master' into master

commit bf8eb3c78146e4559e1b3189073691dab897cda8
Author: Ahmed Leithy <[email protected]>
Date:   Mon Sep 27 04:45:57 2021 +0200

    [.NET] Add workaround for USD$/MXN$ empty resolution issue (#2721)

commit 41d66c64067e49478488941958661117ee1e61b8
Author: Ahmed Leithy <[email protected]>
Date:   Wed Sep 15 03:13:38 2021 +0200

    Added fünfzehn w/ umlaut to German numbers (#2712)

commit 34643228bf91175faeab636f43cb8c4d45c75ff9
Author: LionbridgeCSII <[email protected]>
Date:   Mon Jul 26 13:41:29 2021 +0700

    [.NET] Japanese DateParser support (#2653)

    * Refined Japanese DateParser support

    * Deleted duplicate test cases

    * Apply review feedback: simplified regex, move MonthValidDays to DateObjectExtension, add normalization to BaseCJKDateExtractor, clean YAML, update specs

    * Re-adding BOM in DateObjectExtension.cs

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit ed9547c78907260694c1f9bc732ad63c3569fd68
Author: Börje Karlsson <[email protected]>
Date:   Sat Jul 24 16:40:17 2021 +0800

    [Java] Validate the properties of each model in the unit tests to be in parity with C# (#2682)

    * Update AbstractTest to validate common props (typename, text, start, end, keys)

    * Unify models to consume the AbstractTest validation

    * Override/Validate current properties in DateTime model

    * Fix issue to generate new ExtractResult in BaseMergedDateTimeParser

    * Complete the validation of the properties for each Java Model

    * Improve the validation of specs properties in the Choice model

    * Apply review feedback

    * Improve the validation in the NumberWithUnit model

    * Final improvements in the model validation

    * Fix NumberWithUnit unit tests

    * Apply code review feedback

    * Improve the validation in the Number model

    * Add java as supported type for ignored NumberRangeModels

    * Accept TwoNumClosed type

    * Support for RangeNumberExperimentalMode

    * Separate call methods depending on NumberOptions type

    * Remove Unit validation and use getKeysToTest methods

    * Set NumberOptions.None for PercentModel type tests

    * Improve parity against C#

    * Improve the validation in the Sequence model

    * Fix sequence unit tests

    * Improve the validation in the dateTime model

    * Add an override of assertResolutionKeys and remove the validation of extractor and parser specs

    * Add declaration of SourceEntity

    * Improve validation of specific properties in each spec and fix imports

    * Apply PR review feedback

    * Set the correct order for AM/PM resolve method

    * Improve operator for key validation

    * Fix Java CheckStyle errors

    * Remove redudant code

    * Avoid unecessary changes in NumberWithUnitTests

    Co-authored-by: Martin Battaglino <[email protected]>
    Co-authored-by: Federico Bernal <[email protected]>
    Co-authored-by: Franco Alvarez <[email protected]>
    Co-authored-by: Franco Alvarez <[email protected]>

commit 68493380bbe9e210cd188a14a502ce87a656dc74
Author: Börje Karlsson <[email protected]>
Date:   Thu Jul 22 13:52:13 2021 +0800

    [.NET] Enable C# 9 and minor .NET code cleanup (#2679)

    Co-authored-by: Jason Nelson <[email protected]>

commit eda70eb70e984c0a97619251814f04868d459af5
Author: Börje Karlsson <[email protected]>
Date:   Mon Jul 19 12:11:55 2021 +0800

    Adding missing headers and minor fixes (#2676)

    * Modifying base time of day resolution code to improve re-use and facilitate changing policy.

    * Adding spec for reported misspelt English number case.

    * Adding holiday variations in German.

    * Add missing code file headers across platforms.

    * Fixing Flake8 failures.

    * Removing null-coalescing assignment operator due to issue with .Net Core 2.1.

commit 14aca909da82c25d1a6ee44b1680f0841509dae4
Author: Börje Karlsson <[email protected]>
Date:   Thu Jul 15 08:15:14 2021 +0800

    Multiple simple fixes for unsuppoted cases and false positive filters (#2675)

    * Support for "current date" in ranges and additional false positive filter in EN.

    * Fix for "hasta"/"até" not supported as range modifier in ES (#2665) and PT respectively.

    * Adding ambiguity filter in Sequence/PhoneNumber.

    * Standardize code prefix and dependencies in Java resource generation.

    * Adding false positive filter rules (fixes #2671, #2672, #2673, #2674).

    * Re-generate resources across platforms.

commit d85f61785214549a24233e47d2380efcf0c333be
Author: LionbridgeCSII <[email protected]>
Date:   Fri Jul 2 12:00:53 2021 +0700

    [FR DateTimeV2] Fixed weekday + time-range construction producing an invalid range (#2488) (#2510)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit f2d23184eb8da7098ece20d677299f089a3316d3
Author: LionbridgeCSII <[email protected]>
Date:   Fri Jul 2 08:40:03 2021 +0700

    [.NET] Dutch DateTimeModel refinements (#2659)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 71e4d294544f9fb527ac1d474b56daa33ce3a7dc
Author: LionbridgeCSII <[email protected]>
Date:   Thu Jul 1 13:52:55 2021 +0700

    [DE DateTimeV2] Fixed mentions like "immer sonnabends" not recognized as Set (#2658) (#2661)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit ac973fae6e38c07e980373188c01d2b7e54f1c3f
Author: LionbridgeCSII <[email protected]>
Date:   Wed Jun 30 14:11:28 2021 +0700

    [.NET] Japanese TimePeriod support (#2654)

    * [.NET] Japanese TimePeriod support

    * Removed 0H from range timex, moved time of day begin/end hours to Constants, acorrding to review

    * Fixed timex also in JavaScript and Python

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit f59d8e5006851c669bb0b0b89cdeea351a2af0e3
Author: LionbridgeCSII <[email protected]>
Date:   Thu Jun 24 15:10:15 2021 +0700

    [* DateTimeV2] Fixed duration entities with modifiers should not always be merged (#2628) (#2631)

    * Fixed duration entities with modifiers should not always be merged (#2628)

    * Modified code to handle non-contiguous extractions; added test cases in German, Italian, Spanish

    * Modified German test case to have contiguous durations

    * Removed unnecessary list from base code, added comments and test cases

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 8717a44fd48a2969b00bbb59ed3bf6eee068d233
Author: LionbridgeCSII <[email protected]>
Date:   Thu Jun 24 07:09:46 2021 +0700

    [ZH DateTimeV2] Fixed time entities after noon returning inconsistent extra resolution as if ambiguous (#2647) (#2650)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 4f0c47bae54de10fa9cbac8234c145e60b956ae3
Author: LionbridgeCSII <[email protected]>
Date:   Wed Jun 23 09:30:37 2021 +0700

    [.NET] Korean DatePeriod support (#2648)

    * [.NET] Korean DatePeriod support

    * Removed duplicate test cases

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit d1f2628fee76d686ece6ee88ad7ee78ca169e97b
Author: LionbridgeCSII <[email protected]>
Date:   Wed Jun 23 09:28:32 2021 +0700

    [.NET] Dutch new DateTimeV2 specs (#2649)

    * Dutch new DateTimeV2 specs for parity with English

    * Enabled passing test cases as requested in review

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit b74b1217292d06bb146730a991dcb59c9b221afd
Author: LionbridgeCSII <[email protected]>
Date:   Tue Jun 22 10:44:41 2021 +0700

    [* DateTimeV2] Fixed reference year incorrectly assigned to Timex in DatePeriod patterns (#2586) (#2646)

    * Fixed reference year incorrectly assigned to Timex in DatePeriod patterns (#2586)

    * Refactor timex generation according to review

    * Update affected Dutch test cases

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 9587d5fa12b6151290eb05693c573f0f43785613
Author: Mick Vleeshouwer <[email protected]>
Date:   Mon Jun 21 00:51:28 2021 -0700

    [.NET] Extended  support for Islamic Holidays (#2638)

    * Improving support for Islamic Holidays

    * Add and fix specs

    * Fix HolidayParser NL specs

    * Improve test coverage for EN

    * Sync Dutch definitions with English

    * Fix HolidayParser definition

    * Manually re-gen Dutch DateTime resources and re-gen English resources across platforms.

commit e7b9592349b85301a9fd58e5e9c974cd0a42b9d5
Author: LionbridgeCSII <[email protected]>
Date:   Mon Jun 21 13:27:27 2021 +0700

    [DE DateTimeV2] Fixed "Jahr" + year number not properly recognized (#2641) (#2642)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit b8bee1194facf2e05e013c2eafabf430fe865952
Author: Börje Karlsson <[email protected]>
Date:   Mon Jun 21 13:07:17 2021 +0800

    [DE DateTimeV2] German datetime refinements for holidays and time-of-day (#2644)

    - Fix a couple localization warnings in TimexLib;
    - Add language variations in German for "Saturday" and time-of-day mentions;
    - Bug fix for "midnight" in German;
    - Improve coverage of German Holidays;
    - Re-generate resources across platforms.

commit 186a5ad7ce9995405d52df3ecf3b31d806d153e8
Author: LionbridgeCSII <[email protected]>
Date:   Thu Jun 17 12:08:22 2021 +0700

    [* DateTimeV2] Fixed misinterpretation of a relative duration if prefixed by a number (#2632) (#2634)

    * Fixed misinterpretation of a relative duration if prefixed by a number (#2632)

    * Added test cases in French, Portuguese, and Spanish

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit cd38cebe5701c8b0dda3bb4f9ed0843f71217bc4
Author: Börje Karlsson <[email protected]>
Date:   Wed Jun 16 13:07:39 2021 +0800

    Updating entity support table

commit 2baccc5c4032fe5328eeb31bb1c25c389989b843
Author: LionbridgeCSII <[email protected]>
Date:   Fri Jun 11 16:10:01 2021 +0700

    [.NET] Dutch DateTimeModel initial support (#2637)

    * Dutch DateTimeModel initial support

    * Removed duplicated specs

    * Fixed extraction of ambiguous weekdays abbreviations according to review, added test cases

    * Fixed wrong decade parsing in base code and wrong handling of times of day in Dutch, updated affected test cases

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 4ba1df6054d4b97700f6c2f44df33cd2ff53ea98
Author: LionbridgeCSII <[email protected]>
Date:   Thu Jun 10 18:01:55 2021 +0700

    [DE DateTimeV2] Fixed time + weekday range behaviour is inconsistent with English (#2636) (#2640)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 3c22cefb762e61a3391986c0a5cfa90868c74bf0
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Jun 10 13:15:10 2021 +0800

    Bump normalize-url from 4.3.0 to 4.5.1 in /JavaScript (#2639)

    Bumps [normalize-url](https://github.com/sindresorhus/normalize-url) from 4.3.0 to 4.5.1.
    - [Release notes](https://github.com/sindresorhus/normalize-url/releases)
    - [Commits](https://github.com/sindresorhus/normalize-url/commits)

    ---
    updated-dependencies:
    - dependency-name: normalize-url
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 5829aad8b133c67cadabf8acd89a15e952d38ef4
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Jun 7 07:46:24 2021 +0800

    Bump snakeyaml from 1.20 to 1.26 in /Java/libraries/resource-generator (#2633)

    Bumps [snakeyaml](https://bitbucket.org/asomov/snakeyaml) from 1.20 to 1.26.
    - [Commits](https://bitbucket.org/asomov/snakeyaml/branches/compare/snakeyaml-1.26..snakeyaml-1.20)

    ---
    updated-dependencies:
    - dependency-name: org.yaml:snakeyaml
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <[email protected]>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit c8f05e3ef89dc9bec2c91e706c91d3d7c65a39ee
Author: LionbridgeCSII <[email protected]>
Date:   Wed Jun 2 18:24:49 2021 +0700

    [EN DateTimeV2] Fixed "in the daytime" extracted but not resolved (#2625) (#2629)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 2db3786c04e5cdea3f1bb6c6b7c252b5fabebd9d
Author: LionbridgeCSII <[email protected]>
Date:   Wed Jun 2 14:47:22 2021 +0700

    [* DateTimeV2] Fixed duration patterns wrongly normalized/resolved when number is missing (#2617) (#2627)

    * Fixed duration patterns wrongly normalized/resolved when number is missing (#2617)

    * Updated test cases in Dutch and English

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit ecf60a0b858c9b1b514f3e4fe5d4563ec2cbf5e3
Author: LionbridgeCSII <[email protected]>
Date:   Wed Jun 2 12:55:36 2021 +0700

    [.NET] Dutch Merged support (#2589)

    * [.NET] Dutch Merged support

    * Removed duplicate test cases and fixed indentation in json specs

    * Enabled skipped cases, added suggested new cases

    * Added holidays and test cases according to review

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 8fd5cea628ebf5934e8f7064279cef02a326974c
Author: LionbridgeCSII <[email protected]>
Date:   Wed Jun 2 12:27:11 2021 +0700

    [ES DateTimeV2] Improved handling of "in" vs "within" (#2401) (#2419)

    * Improved handling of "in" vs "within" in Spanish/Portuguese (#2401)

    * Added test case specs according to review

    * Fixed timex issue pointed in review

    * Added WithinNextPrefixRegex in PT and refactored regex ordering

    * Rebuilt definitions and resolve merge conflicts

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 777c42ccf6ed646d4bcea3d3becffbe4d1e6b1b7
Author: LionbridgeCSII <[email protected]>
Date:   Mon May 31 17:28:18 2021 +0700

    [ES/FR DateTimeV2] Fixed "ago" not recognized correctly (#2478) (#2621)

    * Fixed "ago" not recognized correctly (#2478)

    * Added extra test cases according to review

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 5694194ec380745f174df2c12b0dc38df6d2f21c
Author: LionbridgeCSII <[email protected]>
Date:   Mon May 31 15:17:35 2021 +0700

    [.NET] Japanese Time support (#2624)

    * Japanese Time support

    * Refactored regexes, fixed wrong parsing, added test cases, according to review

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 4201b79119fb2b9b994f68b82dddea134a0708c6
Author: Börje Karlsson <[email protected]>
Date:   Sat May 29 15:45:32 2021 +0800

    Improvements to handling multiple number formats (#2623)

    * Recognize "hundert" and "tausend" by themselves as numbers in German.

    * FP filter for year in float number.

    * Adding sample lists of variant cultures that differ from default in handling number separators.

    * Cleanup of multi decimal separators code.

    * Fixing bug in assigning subtype for numbers like "1.2b".

    * Exposing Spanish.Mexican as culture as workaround before refactoring of model config for culture/requestedCulture.

    * Extra separator variant support and test cases in es-MX.

    * Re-gen resources across platforms.

commit 22ed45110d0f15f912335debda9b500dac350c4b
Author: LionbridgeCSII <[email protected]>
Date:   Fri May 28 13:22:12 2021 +0700

    [.NET] Arabic DatePeriod support (#2622)

    * Arabic DatePeriod support

    * Reverted unintentional changes to reference dates in specs

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit da228872de58dde454ce122506d3dc921f57d96d
Author: LionbridgeCSII <[email protected]>
Date:   Thu May 27 10:16:12 2021 +0700

    [.NET] Adding Korean Date support (#2619)

    * Korean Date support

    * Removed duplicate test specs

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 56e869cdd5434e80d07d60449dda6b4ae04011ae
Author: LionbridgeCSII <[email protected]>
Date:   Thu May 27 06:30:02 2021 +0700

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

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit e2d7f6300c1f724e36f93b0ed14a637fe509474e
Author: LionbridgeCSII <[email protected]>
Date:   Wed May 26 14:17:43 2021 +0700

    [.NET] Korean Duration support (#2618)

    * Korean Duration support

    * Add code comments according to review

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 83f3cd80922457b125310137c2ca48005034eaf4
Author: LionbridgeCSII <[email protected]>
Date:   Wed May 26 08:26:36 2021 +0700

    [PT/ES DateTimeV2] Fixed time of day entities are identified but not always resolved correctly (#2472) (#2614)

    * Fix time of day entities identified but not always resolved correctly (#2472)

    * Remove unnecessary timeregex, added EarlyMorningStartEndRegex, added test case variations, added midearlymorning time, according to review

    * Add "madrugada" and "meio da madrugada" in Portuguese

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 19c04905601fe6516fdd1f8e86ef75b94aebf31f
Author: LionbridgeCSII <[email protected]>
Date:   Fri May 21 14:10:46 2021 +0700

    [PT, FR DateTimeV2] Fixed incorrectly splitting weekday from date (#2605) (#2613)

    * [PT, FR DateTimeV2] Fixed incorrectly splitting weekday from date (#2605)

    * Add test case for "terça-feira 25"

    * Regex changes according to review

    * Fix Spanish behaviour to match other languages

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit ad31d5eabfdb25b8e1f1f3703792e445103145b5
Author: LionbridgeCSII <[email protected]>
Date:   Thu May 20 16:46:50 2021 +0700

    [FR, IT DateTimeV2] Fixed dates with slashes resolved incorrectly following a weekday (#2604) (#2612)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit e9c4507ce30c99ea0427cf3b3c8fb979e5a5aac9
Author: Börje Karlsson <[email protected]>
Date:   Thu May 20 15:26:57 2021 +0800

    [EN DateTimeV2] Add/extend support for durations (#2611)

    * Fix implicit duration issues (#2610).

    * Add QuotedText recognizer in samples.

    * Add specs and fix 2W calculation.

    * Re-generate resources across other platforms.

commit a8f3ed5be810060a240078004b6d2a9e4c29dfce
Author: LionbridgeCSII <[email protected]>
Date:   Wed May 19 17:16:39 2021 +0700

    [DE DateTimeV2] Fixed ignoring the date in a weekday-date construction (#2606) (#2609)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 3e7333a1af0bebaf8b05ba551a89270e1363bdcd
Author: LionbridgeCSII <[email protected]>
Date:   Wed May 19 15:36:41 2021 +0700

    [PT DateTimeV2] Fixed 'dia' followed by digits is resolved incorrectly (#2601) (#2608)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 625534b8f1ff0e46e9b005503297f33571ee31d8
Author: LionbridgeCSII <[email protected]>
Date:   Wed May 19 15:36:05 2021 +0700

    [ES DateTimeV2] Fixed 'mi próximo' incorrecly resolves to a date (#2597) (#2607)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 51ee58ab19624a6bf431fcdccc3779743b506d0f
Author: LionbridgeCSII <[email protected]>
Date:   Fri May 14 19:18:33 2021 +0700

    [DE DateTimeV2] Added support for early/late modifiers as suffixes in DatePeriod expressions (#2582) (#2594)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit c082d2d4d870c2f1730dd09960f3a44c080f95ba
Author: LionbridgeCSII <[email protected]>
Date:   Thu May 13 19:09:20 2021 +0700

    [.NET] Arabic TimePeriod support (#2590)

    * Arabic TimePeriod support

    * Fixed wrong indentation in spec files

    * Fix spec format and remove duplicate case

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 9a5e664d94329b7aae6917b2f0913020283b30ea
Author: LionbridgeCSII <[email protected]>
Date:   Thu May 13 10:00:58 2021 +0700

    [JavaScript | * DateTimeV2] Added missing filter methods (#2509) (#2592)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 51e518b8b5eaa16cba11b386462a453ab9971c92
Author: Börje Karlsson <[email protected]>
Date:   Thu May 13 10:26:07 2021 +0800

    Timezone resource updates and resource re-gen accross platforms (#2591)

commit 9f4ac7cd4170fe39e48ccf52c028877e7c421e60
Author: LionbridgeCSII <[email protected]>
Date:   Mon May 10 19:30:40 2021 +0700

    [.NET|JavaScript | EN DateTimeV2] Add support to expressions indicating the present moment (#2563) (#2587)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit b2b7b391c3d2ce82ffdec3464a5317d2aa1b7897
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon May 10 14:24:14 2021 +0800

    Bump hosted-git-info from 2.6.0 to 2.8.9 in /JavaScript (#2588)

    Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.6.0 to 2.8.9.
    - [Release notes](https://github.com/npm/hosted-git-info/releases)
    - [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
    - [Commits](https://github.com/npm/hosted-git-info/compare/v2.6.0...v2.8.9)

    Signed-off-by: dependabot[bot] <[email protected]>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit f7bf3b9cbd6b2cc4ab5e066c33f88e7c823afec7
Author: LionbridgeCSII <[email protected]>
Date:   Fri May 7 08:19:08 2021 +0700

    [EN DateTimeV2] Fix to dates not properly extracted (#2568) (#2584)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 9ad8110090a0c5cfba0ad0fa85c8e623c41e6da8
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri May 7 09:17:53 2021 +0800

    Bump lodash from 4.17.14 to 4.17.21 in /JavaScript (#2585)

    Bumps [lodash](https://github.com/lodash/lodash) from 4.17.14 to 4.17.21.
    - [Release notes](https://github.com/lodash/lodash/releases)
    - [Commits](https://github.com/lodash/lodash/compare/4.17.14...4.17.21)

    Signed-off-by: dependabot[bot] <[email protected]>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit dea50271b20cec37df9b7a3f39ab64eb2c975e7c
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri May 7 09:17:24 2021 +0800

    Bump handlebars from 4.7.3 to 4.7.7 in /JavaScript (#2583)

    Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.7.3 to 4.7.7.
    - [Release notes](https://github.com/wycats/handlebars.js/releases)
    - [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md)
    - [Commits](https://github.com/wycats/handlebars.js/compare/v4.7.3...v4.7.7)

    Signed-off-by: dependabot[bot] <[email protected]>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 71a73d5fb6f35eabf0355543caa11e1c11d2ad2e
Author: wumingxuanceline <[email protected]>
Date:   Thu May 6 19:37:34 2021 +0800

    [FR Number|DateTime] Additonal French Specs in improving language coverage (#2523)

    * Add 143 new French specs for DateExtractor

    * Add 127new French specs for DateParser

    * Add 139 new French specs for DateExtractor

    * Add 121 new French specs for DateParser

    * Auto fixing entity start indices and lengths with validation tool

    * Fixing bug in Java tester failing to parse spec files with a UTF-8 BOM.

    * Fixing indentation in specs.

    * More correct UTF-8 BOM workaround and re-gen Java resources.

    * Add 352 new French specs for DatePeriodExtractor

    * Add 244 new French specs for DatePeriodParser

    * Add 81 new French specs for DateTimeExtractor

    * Add 711 new French specs for DateTimeModel

    * Add 64 new French specs for DateTimeParser

    * Add 95 new French specs for DateTimePeriodExtractor

    * Add 97 new French specs for DateTimePeriodParser

    * Add 62 new French specs for DurationExtractor

    * Add 22 new French specs for HolidayParser

    * Add 99 new French specs for MergedExtractor

    * Add 162 new French specs for MergedParser

    * Add 31 new French specs for SetExtractor

    * Add 31 new French specs for SetParser

    * Add 91 new French specs for TimeExtractor

    * Removing duplicate French specs breaking build

    * Add 86 new French specs for TimeParser

    * Add 64 new French specs for TimePeriodExtractor

    * Add 65 new French specs for TimePeriodParser

    * Add 176 new French specs for NumberModel

    * Add 40 new French specs for OrdinalModel

    * Add 17 new French specs for PercentModel

    * Create NumberModelPercentMode specs

    * Add 85 specs for French NumberRangeModel

    * Create NumberRangeModelExperimentalMode specs

    * Create OrdinalModelSuppressExtendedTypes specs

    * Create DateTimeModelCalendarMode specs

    * Re-adding French specs in clear branch and removing duplicate spec cases

    * Create DateTimeModelComplexCalendar specs

    * Create DateTimeModelExperimentalMode specs

    * Create DateTimeModelExtendedTypes specs

    * Create DateTimeModelSplitDateAndTime specs

    * Create TimeZoneExtractor and TimeZoneParser specs

    * Remove duplicates in DatePeriodExtractor specs

    * Remove duplicates fin NumberModel

    * Correct EOF error in spec files

    * Remove duplicates specs across types

    * Fix spec name files according to review

    * Fixing multiple spec cases according to review

    * Update NumberRangeModel.json to fix incorrect grammar according to review

    * Update DateTimeModel.jsonto to fix incorrect grammar and spec format according to review

    * Update DateTimeModel.json to recover corrupted spec cases

    * Fixing DateTimeModel.json in French that's blocking build and merge.

commit f820d764f296888e5c8477d4940435b0b50a179c
Author: coldplaying42 <[email protected]>
Date:   Thu May 6 19:04:07 2021 +0800

    Porting quoted text recognizer into project - v0 (#2528)

    * Add QuotedText recognizer skeleton

    * Add structure to support multi-language

    * Add English and Chinese quoted recognizer

    * Add initial test spec cases

    * Refinements according to code review

    * Add NotSupportedByDesign annotations to test specs

    * Update text model and fix code style issues

    * Add multi-language quoted text recognizers

    * Update QuotedText recognizer to expose models

    * Filter French frequent false positive in Currency

    * Fix build break

    * Add NotSupportedByDesign attributes in specs for all non-dotnet platforms

    Co-authored-by: Tom Laird-McConnell <[email protected]>

commit 90030083ab2bf5ce8bc9782b8df1b680f7f82399
Author: LionbridgeCSII <[email protected]>
Date:   Thu May 6 10:05:05 2021 +0700

    [DE DateTimeV2] Improvements to Holiday coverage in German (#2573) (#2581)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 3cf716efb342b9d0fdbef4701a205ca2b1a13615
Author: LionbridgeCSII <[email protected]>
Date:   Fri Apr 30 15:56:22 2021 +0700

    [.NET] Japanese CJK configuration + DateExtractor refinements (#2575)

    * Japanese CJK configuration + DateExtractor support

    * Fixed named group in JavaScript

    * Localized example comments in Korean config files

    * Removed duplicate test cases

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 9778199a6b6d9fbc8f731457009a11db836e6039
Author: LionbridgeCSII <[email protected]>
Date:   Thu Apr 29 21:16:24 2021 +0700

    [.NET] Arabic Time support (#2570)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 9a579a8221a5be58bc3fd8708e8ede0931ab79c4
Author: LionbridgeCSII <[email protected]>
Date:   Thu Apr 29 18:45:17 2021 +0700

    [.NET] Arabic Date support (#2569)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 3517ce0029386cfadf15d016eb403d8bcc378ff0
Author: LionbridgeCSII <[email protected]>
Date:   Thu Apr 29 18:42:37 2021 +0700

    [.NET] Korean DateTime code skeleton (CJK) + Holiday support (#2566)

    * Korean DateTime code skeleton (CJK) + Holiday support

    * Renamed Chinese regexes in javascript and python config files

    * Moved named groups to Constants

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 134dd74d4114d45b58415f3447319b8394945051
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Apr 27 09:11:06 2021 +0800

    Bump commons-io from 2.6 to 2.7 in /Java/tests (#2572)

    Bumps commons-io from 2.6 to 2.7.

    Signed-off-by: dependabot[bot] <[email protected]>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 56860fff726c4339706412681f11a0c299986325
Author: LionbridgeCSII <[email protected]>
Date:   Wed Apr 21 15:58:39 2021 +0700

    [FR DateTimeV2] Fixed ignored minutes in "past" and "before" time forms (#2490) (#2514)

    * Fixed ignored minutes in "past" and "before" time forms (#2490)

    * Disabled test cases in Java

    * Added spec case and relative support

    * Modified minutes regexes and added test cases according to review

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 441cf9d85a30674f78181926986746c23500dddd
Author: LionbridgeCSII <[email protected]>
Date:   Wed Apr 21 14:27:14 2021 +0700

    [.NET DateTime] Added base CJK Extractors and Parsers (#2529)

    * Add base CJK Extractors and Parsers

    * Small fixes and added comments according to review

    * Changes based on latest code review

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 51467a175441ce8bc7849f4392dfa13083dbd83e
Author: Börje Karlsson <[email protected]>
Date:   Tue Apr 20 19:27:15 2021 +0800

    Updating entity table with Korean Unit support

commit 4e4282c69da1a46ece19657fa43fb536f8cbcd11
Author: LionbridgeCSII <[email protected]>
Date:   Tue Apr 20 10:07:16 2021 +0700

    [.NET] Korean NumberWithUnit partial support (#2538)

    * Add Korean NumberWithUnit partial support

    * Small fixes to spec files

    * Small fixes and added comments to failing test cases according to code review

    * Re-introduced test cases with ambiguous units as requesed in review

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 923c4c8702545ff32835df598974a9f836f18b36
Author: LionbridgeCSII <[email protected]>
Date:   Mon Apr 19 16:49:02 2021 +0700

    [EN DateTimeV2] Support timezone resolution for TimeOfDay + Time patterns (#2550) (#2561)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 759ae4e50de6d9ef31333b8ea4a2b8c0cdfa0f0a
Author: LionbridgeCSII <[email protected]>
Date:   Mon Apr 19 15:21:27 2021 +0700

    [* Currency] Added support for compound Currency entities in French, German, Italian (#2479) (#2560)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 946ee5bafd5b3caf768402ccc4e05010112bd5b4
Author: Omid Jafari (Moller) <[email protected]>
Date:   Thu Apr 15 21:56:00 2021 -0600

    [Python] TimexHelpers duration resolution bugfix (#2559)

commit 8a5c650ab0a2e217af29836ca05d7e88682194ef
Author: LionbridgeCSII <[email protected]>
Date:   Wed Apr 14 18:21:45 2021 +0700

    [EN DateTimeV2] Fixed not combining date and time, over parsing in some instances (#2552) (#2555)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 4108664bab6bc2c221dbd6713a6253894a88f66a
Author: LionbridgeCSII <[email protected]>
Date:   Wed Apr 14 16:27:59 2021 +0700

    [PT|ES Currency] Added support for compound Currency entities in Portuguese and Spanish (#2479) (#2551)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 96e85f2b835bca41027a6454b1acb449e698ed54
Author: Börje Karlsson <[email protected]>
Date:   Wed Apr 14 15:07:39 2021 +0800

    Adding NumberRange in French and German (#2554)

    * Initial version of French NumberRange;

    * Refactor French number classes to follow structure from other languages;

    * Fix dimension ambiguity lists to avoid false positives with unit only for each subtype;

    * Workaround for Unicode issue affecting timezone extraction;

    * Minor review of Chinese Numbers YAML;

    * Adding culture attribute at Model level;

    * Reducing globalisation warnings;

    * Modifying German number classes to follow framework in other languages;

    * Add initial support for NumberRange in German;

    * Add support for request non-standard speed units in English;

    * Re-gen resources across cultures.

commit b65e6144a280bd6cf713cb7a7150f33f5bb3b510
Author: LionbridgeCSII <[email protected]>
Date:   Tue Apr 13 14:43:28 2021 +0700

    [FR DateTimeV2] Fixed inconsistency between French and English in extracting time+date entities (#2486) (#2530)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit bbce6803501a556e75e90d16e1bb07d71932952d
Author: Martin Battaglino <[email protected]>
Date:   Mon Apr 12 01:34:11 2021 -0300

    Replace HashMap to LinkedHashMap (#2549)

    Co-authored-by: matiasroldan6 <[email protected]>

commit b496f911a066010dea470a8475bbe0caccfdee48
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Apr 12 12:33:25 2021 +0800

    Bump y18n from 3.2.1 to 3.2.2 in /JavaScript (#2536)

    Bumps [y18n](https://github.com/yargs/y18n) from 3.2.1 to 3.2.2.
    - [Release notes](https://github.com/yargs/y18n/releases)
    - [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/yargs/y18n/commits)

    Signed-off-by: dependabot[bot] <[email protected]>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 9877252ff9644ad4a9b2846e23c4e57d60daa8f7
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Apr 6 20:01:10 2021 +0800

    Bump elliptic from 6.5.3 to 6.5.4 in /JavaScript (#2518)

    Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.3 to 6.5.4.
    - [Release notes](https://github.com/indutny/elliptic/releases)
    - [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4)

    Signed-off-by: dependabot[bot] <[email protected]>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 5b8126acb496c348a4202123bc2d8a87aa4042be
Author: LionbridgeCSII <[email protected]>
Date:   Tue Apr 6 17:59:54 2021 +0700

    [EN DateTimeV2] Fixed false positives detecting abbreviated month name (#2527) (#2534)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 205d8919f448686fd8f8e445b857488ad0ded9f3
Author: LionbridgeCSII <[email protected]>
Date:   Tue Apr 6 15:03:01 2021 +0700

    [* DateTimeV2] Improving resolution of 2-digit year mentions (#2493) (#2531)

    * Improved resolution of 2-digit year mentions (#2493)

    * Moved timex modification to TimexUtility and added constants per review

    * Modified regexes in other languages

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 8033d0cc4c818271569e2d111b7ca333da1901d0
Author: LionbridgeCSII <[email protected]>
Date:   Tue Apr 6 14:34:26 2021 +0700

    [AR Numbers] Fixed Arabic number recognizer not handling decimal numbers correctly

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 08b488ae1c83127eb93b26d381b8d668b548a620
Author: LionbridgeCSII <[email protected]>
Date:   Sat Apr 3 13:59:27 2021 +0700

    [.NET] Dutch DateTime Set support (#2533)

    * Dutch DateTime Set support

    * Added comments and refinements to YAML according to feedback

    * Added new suggested test cases

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 81754d885e26992e6c16ea63c1ada56a32d6db07
Author: LionbridgeCSII <[email protected]>
Date:   Fri Apr 2 17:17:15 2021 +0700

    [DE Unit/Currency] Support for hyphen-connected unit expressions (#2494) (#2544)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit ccd295046823910078d9eb63b6f7c6e85c38da3e
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Apr 1 08:44:27 2021 +0800

    Bump guava in /Java/libraries/recognizers-text-number-with-unit (#2542)

    Bumps [guava](https://github.com/google/guava) from 24.1.1-jre to 29.0-jre.
    - [Release notes](https://github.com/google/guava/releases)
    - [Commits](https://github.com/google/guava/commits)

    Signed-off-by: dependabot[bot] <[email protected]>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 37a496bbe9cdb810f11fa60d17c54098227055fa
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Apr 1 08:44:10 2021 +0800

    Bump guava in /Java/libraries/resource-generator (#2541)

    Bumps [guava](https://github.com/google/guava) from 24.1.1-jre to 29.0-jre.
    - [Release notes](https://github.com/google/guava/releases)
    - [Commits](https://github.com/google/guava/commits)

    Signed-off-by: dependabot[bot] <[email protected]>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 09b9662a6f7beae1b9a132790825e8035d14ab23
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Apr 1 08:43:49 2021 +0800

    Bump guava in /Java/libraries/recognizers-text-number (#2540)

    Bumps [guava](https://github.com/google/guava) from 24.1.1-jre to 29.0-jre.
    - [Release notes](https://github.com/google/guava/releases)
    - [Commits](https://github.com/google/guava/commits)

    Signed-off-by: dependabot[bot] <[email protected]>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit c0ef9236aa388f0ee573f0c058741dd42cba45f2
Author: LionbridgeCSII <[email protected]>
Date:   Tue Mar 30 09:50:43 2021 +0700

    [.NET] Arabic Duration support (#2535)

    * [Arabic Duration Extractor support

    * Enabled resolution on supported cases

    * Removed reintroduced duplicates

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit bf338972a20628a8008154b88fbff13135b9bdde
Author: LionbridgeCSII <[email protected]>
Date:   Mon Mar 29 12:42:58 2021 +0700

    [.NET] Arabic DateTime code skeleton + Holiday support (#2525)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 5021f80b08ce469a7060cb8010cf08928c38fdd3
Author: LionbridgeCSII <[email protected]>
Date:   Mon Mar 29 12:27:08 2021 +0700

    [JA DateTimeV2] Holiday parser refinements (#2532)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit c70ff6f03ba8fbb8fc3a8e32c52455fc84b0e5f6
Author: Börje Karlsson <[email protected]>
Date:   Tue Mar 16 00:19:53 2021 +0800

    Maintenance update of auto-gen resources and minor changes (#2524)

    * - Removed unnecessary half-width digits in ZH and JA regexes;
    - Fix merge issue in FR/ES/PT for time-of-day + time (additional cases for #2482);
    - Add NumberRange patterns to be localized in French YAML;
    - Re-gen resources.

    * - Fixing incorrect ET timezone offset;
    - Adding non-standard speed units;
    - Add bitcoin and its Unicode symbol as currency unit;
    - Breaking clustered units into separate entries;
    - Fixing incorrect French timezone spec file name;
    - Re-gen resources across platforms.

    * - Adding specs;
    - Adding more verbosity to assert failure in Python DateTime test code;
    - Re-gen resources across platforms.

    * Disabling unicode fraction case in javascript units.

commit ca59ab07586487ab4f8cf880328e89044429c0d0
Author: wumingxuanceline <[email protected]>
Date:   Mon Mar 15 10:58:45 2021 +0800

    [FR DateTimeV2] Add new French specs for DurationParser (#2463)

    * Add 56 new French specs for DurationParser

commit 95fb9861257defb732af2c22f33c0b6913137ab3
Author: LionbridgeCSII <[email protected]>
Date:   Tue Mar 9 19:13:07 2021 +0700

    [PT DateTimeV2] Fixed weekday + date + time not resolved correctly (#2482) (#2517)

commit eec07b1d57a72a65b79a4f42d31387739f12369a
Author: LionbridgeCSII <[email protected]>
Date:   Mon Mar 8 15:35:54 2021 +0700

    [PT DateTimeV2] Fixed "dia" breaking recognition of a full date value (#2481) (#2516)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit ea6ef7b24fd7ff9b879b417c502e50b48926e8a7
Author: LionbridgeCSII <[email protected]>
Date:   Fri Mar 5 12:23:31 2021 +0700

    [* DateTimeV2] Extended support for unambiguous date formats (#2423) (#2438)

    * Extended support for unambiguous date formats (#2423)

    * Merged new patterns with existing regexes in EN and ES

    * Added patterns to other languages

    * Removed patterns with space and enabled test cases in all platforms

    * Disabled failing test cases in French in Java and Python (not supported yet)

    * Fixes after rebase

commit 8e13e6d59cc2bcf81e820051d61dab2cc6e2e357
Author: LionbridgeCSII <[email protected]>
Date:   Thu Mar 4 16:09:49 2021 +0700

    [EN DateTimeV2] Fixed hour incorrectly extracted from float number (#2453) (#2502)

    * [Fixed hour incorrectly extracted from float number (#2453)

    * Moved solution to base resources

    * Improve fix to handle extra cases

commit 34d79f5d72378b6de4c91a3b2f90e412920a5276
Author: LionbridgeCSII <[email protected]>
Date:   Thu Mar 4 13:12:56 2021 +0700

    [ES DateTimeV2] Fixed issues with time of day modifiers in Spanish like "de la mañana" vs. "am" (#2477) (#2504)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 0a39209f3afb294163dd444b8adf3d4b5b3e9d03
Author: LionbridgeCSII <[email protected]>
Date:   Thu Mar 4 13:00:44 2021 +0700

    [FR DateTimeV2] Fixed time resolved as datetime with time of day modifier (#2489) (#2511)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit c95397d55354d5a8c01a0cc00256335d4824fd5a
Author: LionbridgeCSII <[email protected]>
Date:   Thu Feb 25 13:05:01 2021 +0700

    [JA DateTimeV2] Holiday extractor refinements (#2507)

commit 41fa534cfa6f1823a5f03145ec4b63c4d9640e90
Author: Martin Battaglino <[email protected]>
Date:   Wed Feb 24 23:32:13 2021 -0300

    [Java] Add TimexResolver Library Unit Tests (#2459)

    * Add TestTime unit tests

    * Add TestTimex unit tests

    * Add TestTimexConvert unit tests

    * Add TestTimexCreator unit tests

    * Add TestTimexDateHelpers unit tests

    * Add TestTimexFormat unit tests

    * Add TestTimexHelpers unit tests

    * Add TestTimexParsing unit tests

    * Add TestTimexRangeResolve unit tests

    * Add TestTimexRelativeConvert unit tests

    * Add TestTimexResolver unit tests

    * Add requested changes in remaining classes

    * Add changes from code review

    * Fix lint issues

    * Add fixes for unit tests

    * Add changes from 2455 to Timex unit tests

    * Fix linter issues

    * Migrate changes implemented in PR#2457

    * Apply feedback from review

    * Rename method

    * Rename TestTimexRangeResolver in Java and C#

    Co-authored-by: MatR <[email protected]>
    Co-authored-by: Federico Bernal <[email protected]>
    Co-authored-by: Martin Battaglino <[email protected]>

commit 0d48b7091d300daf1478bec92c65a01711055381
Author: Huiqiang Jiang <[email protected]>
Date:   Wed Feb 24 14:32:50 2021 +0800

    [JA Number] Improvement for extractor timeout in long number input (#2506)

    * Partial mitigation in JA Number Extractor

    * Add additional specs

commit 97a4047d058bbed8911697f6ce400ba1af68d2f0
Author: LionbridgeCSII <[email protected]>
Date:   Mon Feb 22 16:58:29 2021 +0700

    [ES DateTimeV2] Refactor "anoche" fix (#2473) (#2503)

commit 604e1f97d45346d0663a7f610e6a46a801ccc816
Author: Börje Karlsson <[email protected]>
Date:   Mon Feb 22 16:28:31 2021 +0800

    Maintenance update of auto-gen resources and reducing verbosity of .NET build (#2505)

    * Support informal million/billion/trillion abbreviations in English

    * Reduce verbosity of unit test output in .NET to shorten build log

    * Fix "anoche" issue in Spanish (#2473)

    * Add rupee plural in DE and FR (#2495)

     * Re-gen resources across platforms

commit d0646b961f357fbda56679d59e38cb0730819340
Author: Martin Battaglino <[email protected]>
Date:   Wed Feb 17 02:59:49 2021 -0300

    [Java | * Sequence] Add Sequence Recognizer Unit Tests (#2466)

commit 541bdfbb848b1aa41a0d66c2e1a801609dd349b4
Author: Martin Battaglino <[email protected]>
Date:   Wed Feb 17 02:55:10 2021 -0300

    [Java] Add DataType Timex Resolver Library (#2458)

    * Add Timex pom

    * Migrate English folder

    * Migrate root files

    * Add timex as recognizers module in Java

    * Support merged timex of duration/datetimerange like "PT1H30M" (#1515, #1530, #1923, #2110)

    * Add constants and helpers

    * Set static constants to uppercase underscore

    * Add requested changes in remaining classes

    * Add changes from code review

    * Fix lint issues

    * Add fixes for unit tests

    * Migrate changes implemented in PR#2457

    * Apply code review feedback

    * Cleanup TimexHelpers

    * Rename method

    Co-authored-by: matiasroldan6 <[email protected]>
    Co-authored-by: Martin Battaglino <[email protected]>
    Co-authored-by: Federico Bernal <[email protected]>

commit 01daf2c4b27420c6224faad60ab2971494dfa223
Author: Martin Battaglino <[email protected]>
Date:   Wed Feb 10 05:54:54 2021 -0300

    [Java] Add Sequence Recognizer (#2465)

    * Main Sequence structure in Java

    * Add autogenerated resource classes

    * Migrate config folder

    * Migrate English extractors and parsers

    * Migrate Models folder

    * Integrate Sequence in Java simple console project

    * Overload trimStart of StringUtility

    * Catch infinite values

    * Add sequence recognizer to generate automatic resources

    * Fixes according to review

    * Update console to use sequence methods with default parameters as others

    * Add TODO comment for EmailRegex2

commit cd523204e5cf1dccb804808c893bba1269ab0e15
Author: Yiying Wu <[email protected]>
Date:   Tue Feb 9 09:37:31 2021 +0800

    [EN DateTimeV2] Support for mispelt ordinals in dates (#2470)

commit 78b829d54f55a86c16d4df609bba1dc77ebc4039
Author: Yiying Wu <[email protected]>
Date:   Mon Feb 8 12:42:34 2021 +0800

    [TimexExpression] Fix timex resolution for weeks in TimexHelper (#2469)

commit c6bc7e6ab5e8052610b7604eb93607cf6939b228
Author: Martin Battaglino <[email protected]>
Date:   Sun Feb 7 00:07:58 2021 -0300

    [Java] Unify bindLookbehind fallback behaviour for all JDKs (#2439)

    * Add maven-artifact

    * Unify default fallback method for JDKs

    * Apply getSafeLookbehindRegexp method where it's needed

commit f051d2b10833e9fbd350ca581d4ef548a46dadf5
Author: Yiying Wu <[email protected]>
Date:   Fri Feb 5 15:17:33 2021 +0800

    [TimexExpression] Fix timex without specified year/month like "XXXX-XX-06" (#2457)

    * Fix timexes without specified year/month

    * Support week-related timex

    * Refactorings according to review

commit ff219e8b2615633dfde587027ef5a0d3119fa81f
Author: wumingxuanceline <[email protected]>
Date:   Fri Feb 5 14:43:04 2021 +0800

    [FR DateTimeV2] Add new French specs for DatePeriodExtractor/Parser and TimeZoneParser (#2462)

commit 0ad214fae10c6e47b8817d8872f3f7c44092798b
Author: Martin Battaglino <[email protected]>
Date:   Thu Feb 4 22:41:01 2021 -0300

    [Java | Number] Fix "end" property mismatch to other platforms in ModelResult (#2461)

commit 53fc3a380ae9706a6b8e183ad6c797278b5825d4
Author: Yiying Wu <[email protected]>
Date:   Wed Feb 3 15:32:07 2021 +0800

    [TimexExpression] Support merged timex of duration/datetimerange like "PT1H30M" (#1515, #1530, #1923, #2110) (#2455)

commit 580521efa11d84c67846afa9c582bc634b250ba9
Author: Martin Battaglino <[email protected]>
Date:   Tue Feb 2 03:16:32 2021 -0300

    Add Recognizers dependencies in the Java's README (#2460)

commit d4029c39f31ae20320550433a57c4b5f4a087aa5
Author: Yiying Wu <[email protected]>
Date:   Mon Feb 1 16:09:17 2021 +0800

    [Choice] Add support for emoji skin tone modifiers across cultures (#2454)

commit 2af748d822057184dc8d8188a452116676c35ea5
Author: Yiying Wu <[email protected]>
Date:   Tue Jan 26 17:54:18 2021 +0800

    [TimexExpression] Fix parsing Timex in different cultures in TimexResolover (#1528) (#2452)

commit 4914c595b55ab2e4f89ef9c593046f055388a700
Author: Josef Hölzl <[email protected]>
Date:   Tue Jan 26 09:19:37 2021 +0100

    [Python] Add German support for recognizers-text-number (#2198)

    * Add intial files for German culture support in Number

    * Mark cases in German DateTime specs as NotSupported for python

    * Fix some regexes in German

    * Merging resource changes to the right place in the YAML file

    * Disabling German number model registration

    * Disabling German test run for now

commit 50f1ff3253c6d4b60d28dbc77e356e28975150d3
Author: Börje Karlsson <[email protected]>
Date:   Mon Jan 25 18:11:50 2021 +0800

    [Java] Fix build process to fail unit tests on unexpected model exceptions (#2451)

    * Fixing Java build process so internal model issues are not skipped and break build in unit tests

    * Standardizing on NotSupportedException for not yet implemented pieces

    * Enforcing file format consistency in ValidationTool output

    * Suppressing lint error affecting regex lib

commit bc93a497288524672a118a6f056633860838b86b
Author: Yiying Wu <[email protected]>
Date:   Mon Jan 25 17:20:43 2021 +0800

    [Java | FR DateTimeV2] Correct regex definition in YAML and add ambiguity filter (#2447)

commit 697240791b86cf411e92524f73542cbae341957e
Author: Yiying Wu <[email protected]>
Date:   Mon Jan 25 16:21:10 2021 +0800

    [Python] Fixing emoji package dependency after breaking change in v1.0 (#2450)

commit c581ff0e8a8fdd7602cfd0b73d0c813a54dd192f
Author: Börje Karlsson <[email protected]>
Date:   Fri Jan 22 17:27:50 2021 +0800

    Maintenance update of auto-gen resources and reducing verbosity of Java build (#2446)

    * Re-gen resources across platforms

    * Adding support for extra terms for 'now' and 'today' in .NET

    * Minor clean-up and renames in ValidationTool

    * Less verbose Java build log

commit 710e1753290f7aa3117a24706609568bf49737ed
Author: wumingxuanceline <[email protected]>
Date:   Fri Jan 22 14:08:54 2021 +0800

    [FR DateTimeV2] Add new French specs for DateExtractor/Parser (#2430)

commit 2e961cd8e6406ea1daf18f6209e1369f64a90313
Author: Yiying Wu <[email protected]>
Date:   Fri Jan 22 13:34:20 2021 +0800

    [Java | DateTimeV2] Fixed resolution of invalid dates like "2/29/2019" and similar across cultures (#2444)

commit 0753d65cf62edcd9ae4cdbc0f6b69b02127e43b7
Author: Börje Karlsson <[email protected]>
Date:   Thu Jan 21 16:20:56 2021 +0800

    Add ValidationTool binaries to repo for use in build (#2443)

commit a66fa22c94c0d78778dea0240675ae87a9d61f9a
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Jan 21 15:00:59 2021 +0800

    Bump jackson-databind from 2.9.10.5 to 2.9.10.7 in /Java/tests (#2441)

    Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.9.10.5 to 2.9.10.7.
    - [Release notes](https://github.com/FasterXML/jackson/releases)
    - [Commits](https://github.com/FasterXML/jackson/commits)

    Signed-off-by: dependabot[bot] <[email protected]>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 783a0ff8edf81bacf710c85886d0b8f2a1c39470
Author: Yiying Wu <[email protected]>
Date:   Thu Jan 21 14:59:38 2021 +0800

    [JavaScript | DateTimeV2] Fixed resolution of invalid dates like "2/29/2019" and similar across cultures (#2442)

commit 90a17c4059409e5da9b7d666871018b8ac96b6e0
Author: Yiying Wu <[email protected]>
Date:   Thu Jan 21 03:38:06 2021 +0800

    [Python | DateTimeV2] Fixed resolution of invalid dates like "2/29/2019" and similar across cultures  (#2440)

commit 0dab55c8d88c6e7f19d1e4ec00b57643898f72b8
Author: Yiying Wu <[email protected]>
Date:   Tue Jan 19 20:20:47 2021 +0800

    [.NET | DateTimeV2] Fixed output of invalid dates like "2/29/2019" and similar across languages (#2437)

commit 64b9b03eb333c33e66b2685c8a01d011e7f56328
Author: Yiying Wu <[email protected]>
Date:   Fri Jan 15 12:31:24 2021 +0800

    [Tools] Improving logs in validation tool output

commit 30ce26eafa5c18147e465dc31ee1bf2eec499657
Author: Yiying Wu <[email protected]>
Date:   Thu Jan 14 12:48:07 2021 +0800

    [Tools] Spec validation tool v2 (#2432)

commit 1277475622a643f3ac06c78f2ea0528ef0139033
Author: Hilton Giesenow <[email protected]>
Date:   Thu Jan 7 11:29:53 2021 +0200

    [TimexResolver] Bug fix in numbered week resolution (e.g., 2021-W02) (#2431)

commit 0aec1e82fd5db843663d0d472bf3f595059d4f0a
Author: Yiying Wu <[email protected]>
Date:   Thu Jan 7 16:51:00 2021 +0800

    [ZH DateTime V2] Fix the output when invalid dates like "2/29/2019" or "2/30" are present (#2421)

    * Filter "not resolved" datetime results due to leap year

    * Fix resolution of 2/29 with unspecied year

    * Refactor GetFuturePastDate logic in DateParser

    * Add comments and rename methods according to review feedback

    * Sync JavaScript generateDates

    * Support for Chinese DatePeriod containing Feb 29th

    * Refactor DoubleTimex & invalid period change to PXD

    * Refactor timex generation

commit c6e5114e9615a98b474bbad2cb77e7b3ab161b7e
Author: Yiying Wu <[email protected]>
Date:   Wed Jan 6 18:47:45 2021 +0800

    [ZH NumberRange] Fix to deal with hash order and collisions (#2365) (#2429)

commit b531199b8723e8e8f9ab1b8d301c8a3b465358ad
Author: Yiying Wu <[email protected]>
Date:   Wed Dec 23 16:37:19 2020 +0800

    [ZH DateTimeV2] Fixed recognizing "年代" year-range/decade in Python/JavaScript (#742) (#2418)

commit c72db4095d56468fcfdde8b3d76e7b8d1b68850f
Author: LionbridgeCSII <[email protected]>
Date:   Tue Dec 22 11:18:00 2020 +0700

    [ES DateTimeV2] Fix date periods/ranges inconsistently recognized (#2400) (#2414)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 0d8b135de615c8182d17f41aa455aa2739760be4
Author: LionbridgeCSII <[email protected]>
Date:   Fri Dec 18 15:50:14 2020 +0700

    [ES DateTimeV2] Fix mention formats previously not well supported (#2371) (#2383)

    * Fix mention formats not supported (#2371)

    * Fixes to missed FORMAT cases.

    * Changes based on code review

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit af69c83d07139b8d98bb71862ebdad4b8ece7bea
Author: Yiying Wu <[email protected]>
Date:   Fri Dec 18 16:21:13 2020 +0800

    [Tools] Spec validation tool v1 (#2394)

commit 06ce659017df88b444d620e1571998657b757293
Author: Yiying Wu <[email protected]>
Date:   Thu Dec 17 09:16:50 2020 +0800

    [ZH DateTimeV2] Date regression fix due to side-effect of previous Range change (#2375) (#2411)

commit ff3cd7c633a5bc5ae5e8ade39cca9dc7eaabc927
Author: David Lee <[email protected]>
Date:   Thu Dec 17 09:07:45 2020 +0800

    [Python] Improve convenience of ModelResult for visualization and dict results (#2402)

commit c9a2c6394cdf68e3e78bbbd3a660e977fc1c3347
Author: XiaoxiaoMa0815 <[email protected]>
Date:   Wed Dec 16 12:54:21 2020 +0800

    [FR DateTimeV2] Add new French specs for HolidayExtractor (#2409)

    * Add new French specs for HolidayExtractor.json

    * Add missing NotSupported annotations for each new case as per review

commit 5cae2ea495be6d29adf444d34b6e4a8977cddbea
Author: XiaoxiaoMa0815 <[email protected]>
Date:   Mon Dec 14 10:22:16 2020 +0800

    [FR DateTimeV2] Add new French specs for MergedExtractorSkipFromTo (#2408)

    * Update French MergedExtractorSkipFromTo.json

    * Add annotations and delete duplicate cases

commit ad5780aa082b5e36d8a7468016bc75d0897c40a7
Author: XiaoxiaoMa0815 <[email protected]>
Date:   Fri Dec 11 17:35:25 2020 +0800

    [FR Percent] Create specs for PercentModelPercentMode (#2407)

commit 071ab7665899f9c3ceae39bad8a564eaae8bec33
Author: LionbridgeCSII <[email protected]>
Date:   Fri Dec 4 16:08:32 2020 +0700

    [ES Ordinal] Fix ordinal ranges incorrectly resolved (#2368) (#2390)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit ae4593b735140eaaae9b6b8e7299abcb8573d5b9
Author: LionbridgeCSII <[email protected]>
Date:   Fri Dec 4 10:34:23 2020 +0700

    [DE DateTimeV2] Fix recognition of relative year mentions (last/this/etc.) (#2374) (#2388)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 8c3cd661ca5b85dec36de92bbda85c13cd3f9156
Author: Yiying Wu <[email protected]>
Date:   Fri Dec 4 11:27:19 2020 +0800

    [ZH DateTimeV2] Supported recognition of combined durations like "8天20小时"(#2384 ) (#2385)

commit 3855747e7f3d0042d78d10532293a3ee0bf3361c
Author: LionbridgeCSII <[email protected]>
Date:   Fri Dec 4 09:55:43 2020 +0700

    [EN DateTimeV2] Fixed "end of" by itself incorrectly extracted as entity (#2367) (#2387)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit ed73b6604ea7140799831f73d6e31f764629bafe
Author: Yiying Wu <[email protected]>
Date:   Mon Nov 30 14:12:31 2020 +0800

    [ZH DateTimeV2] Support dynasties and fix recognizing dates like “三十日” (#2248 #2381) (#2382)

    * Support dynasties in Chinese Date & DateRange

    * Fix issue with 日 in Chinese Date

    * Add spec cases

    * Restructure dynasty code & simplify DayRegexNumInChinese

commit 9ad227581eb6697f7583c73d639cdf2e4c3344c7
Author: Yiying Wu <[email protected]>
Date:   Thu Nov 26 10:00:38 2020 +0800

    [ZH Dimension|Number] Handle ambiguity caused by "两" (#2324) (#2377)

    * Fix Liang Unit issue in Chinese

    * Simplify AllIntRegex

    * Add special test cases of Liang

    * Add comment about ContinuouslyNumberRegex and SingleLiangRegex in YAML file

commit 175de3c3aa4f39f4a0fca045d13decdf366ff276
Author: Yiying Wu <[email protected]>
Date:   Wed Nov 25 13:18:01 2020 +0800

    [ZH NumberRange] Added support for number pattern "万多亿" (#2365) (#2380)

    * Added support for number pattern "万多亿"

    * Refactor UnitMap sort logic to happen only at init, as per code review

commit 44d9ad07d6e0e1a4e56cbcff1533048b42f74afb
Author: LionbridgeCSII <[email protected]>
Date:   Tue Nov 24 15:38:51 2020 +0700

    [ES NumberRange] Fixed model failures when multiple ranges are present in input (#2369) (#2379)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit a45db0a9cb2e783054b872909ba108be12db096d
Author: LionbridgeCSII <[email protected]>
Date:   Tue Nov 24 15:37:26 2020 +0700

    [ES DateTimeV2] Fixed Spanish DateRange extraction issues (#2372) (#2378)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit a2533e0e2a9032022ff6f87da0df09f6a9e68322
Author: LionbridgeCSII <[email protected]>
Date:   Wed Nov 18 06:47:19 2020 +0700

    [EN DateTime V2] Fixed missing resolution for years spelled out as words in JS/Py (#2332) (#2373)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit dbfef621dc65798987859cf8acf3ae577b4053d0
Author: Yiying Wu <[email protected]>
Date:   Mon Nov 16 07:08:08 2020 +0800

    [EN Age] Add prefix list support (#2366)

commit f49d81cd6060435fce55f8474313f94f5697f896
Author: Börje Karlsson <[email protected]>
Date:   Sun Nov 15 13:40:59 2020 +0800

    Supported entities now include Units in Swedish

commit b10385e0f9d1d73b93e01b1cacd6e38a73aff055
Author: Yiying Wu <[email protected]>
Date:   Sun Nov 15 13:37:25 2020 +0800

    [ZH Number | Dimension] Fixed extraction for cases like "12千米", "2.3千克" (#2270) (#2359)

commit 8f1df8e1f4f6a1c4124c34dced56398a2c614042
Author: LionbridgeCSII <[email protected]>
Date:   Sun Nov 15 12:34:52 2020 +0700

    [EN DateTimeV2] Added support for relative calculations for Holidays (#2295) (#2344)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit afb5ff6df5ab0990ec5ee6c3dad0a4afc13c93c8
Merge: b25c4f55 d3eb105e
Author: Peter Rundqvist <[email protected]>
Date:   Sun Nov 15 00:15:59 2020 +0100

    Merge branch 'master' of https://github.com/pete1854/Recognizers-Text

commit b300be237eff02f199c825cd00e1a03815d205b2
Author: Peter Rundqvist <[email protected]>
Date:   Sat Nov 14 16:44:26 2020 +0100

    [SV Number] Performance upgrade (cache implementation) (#2362)

commit 5448e85f926e94c82c44f3cb69ba2a11b0201870
Author: LionbridgeCSII <[email protected]>
Date:   Sat Nov 14 20:17:41 2020 +0700

    [.NET SimpleConsole] Added support for extra encoding, especially in .NET Core (#2361) (#2364)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit 47b3178352cf392d8f07b68aaf2fc6ae3aa69406
Author: LionbridgeCSII <[email protected]>
Date:   Sat Nov 14 20:12:56 2020 +0700

    [ES DateTimeV2] Added support for expressions like "el año anterior" (#2323) (#2329)

    Co-authored-by: LionbridgeCS2 <[email protected]>

commit f632c62b9e8dfabe498052d498ad7b5af42a39de
Author: LionbridgeCSII <[email protected]>
Date:   Sat Nov 14 15:59:27 2020 +0700

    [EN DateTimeV2] Fixed datetimerange start range ignoring pm in Python/.NET (#2330) (#2363)

    * Fixed datetimerange start range ignorin…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tellarin tellarin tellarin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Java | EN Ordinal] Parse returns a different ModelResult.end value than .NET (off by one)
2 participants
@Batta32 @tellarin