Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
616 commits
Select commit Hold shift + click to select a range
16e2ad6
Merge pull request #106 from purecloudlabs/bug/NLU-3882
samhickey25 Nov 22, 2023
699d232
Fix Catalan "Right Now"
samhickey25 Nov 22, 2023
e468018
unskip tests.....again
samhickey25 Nov 22, 2023
3bc5e7a
Release Version
samhickey25 Nov 22, 2023
2717812
Merge pull request #107 from purecloudlabs/NLU-3883
samhickey25 Nov 22, 2023
5237274
-- fixed 'un quart de 14:00' bug and "un quart d'una" bug
BobbyMartins5 Nov 27, 2023
57098c9
-- removed 'un quart' check and replaced it with 'quart de', added su…
BobbyMartins5 Nov 28, 2023
211de2b
-- removed 'un quart' check and replaced it with 'quart de', added su…
BobbyMartins5 Nov 28, 2023
21e38a2
-- updated package versions
BobbyMartins5 Nov 28, 2023
62b8e63
** fixed test length assertion
BobbyMartins5 Nov 28, 2023
a258119
++ added quarter to tests in TimeParser.json
BobbyMartins5 Nov 29, 2023
5be5b2a
[NLU-3957] - Catalan builtin:amountOfMoney Fix for Compound number wi…
Conor-Keaney Nov 30, 2023
a22d5af
** removed unnecessary check in time_parser_config.py, also added ext…
BobbyMartins5 Dec 1, 2023
8d59624
** update to release version
BobbyMartins5 Dec 1, 2023
af141d9
Merge branch 'develop' into bug/NLU-3940
BobbyMartins5 Dec 1, 2023
d96fb79
Merge pull request #108 from purecloudlabs/bug/NLU-3940
BobbyMartins5 Dec 1, 2023
5f3b75f
** update to new release version d
BobbyMartins5 Dec 1, 2023
c7dbc22
fix for de in catalan
samhickey25 Dec 4, 2023
ca9c848
** fixed catalan "quarter to" regression bugs, modified tests, update…
BobbyMartins5 Dec 7, 2023
1654c70
** fixed package versions
BobbyMartins5 Dec 7, 2023
37084c9
** fixed test lengths
BobbyMartins5 Dec 7, 2023
7bb69cf
Release Version
samhickey25 Dec 7, 2023
a34afd9
Merge pull request #110 from purecloudlabs/NLU-3938
samhickey25 Dec 7, 2023
8d29d7e
++ changed resolution of quarter to, modified tests and modified regex
BobbyMartins5 Dec 11, 2023
9f4c078
++ updated package versions
BobbyMartins5 Dec 11, 2023
6ec6055
++ fixed 'menys quart' issue and test issue
BobbyMartins5 Dec 11, 2023
ef30590
++ changed time_parser_config.py to now consider fractional times as …
BobbyMartins5 Dec 12, 2023
137b393
++ minor changes
BobbyMartins5 Dec 12, 2023
aa51030
Merge branch 'develop' into NLU-3981
BobbyMartins5 Dec 12, 2023
9a16df7
[NLU-3966] Catalan: Times expressed as “a” + TIME (#112)
andrew-gradinari Dec 13, 2023
eb5b375
++ added support for 1/4,1/2,etc time telling, also added relevant tests
BobbyMartins5 Dec 13, 2023
8e35201
++ updated versions
BobbyMartins5 Dec 13, 2023
3d4607a
Merge branch 'develop' into NLU-3981
BobbyMartins5 Dec 13, 2023
a6daab2
++ updated versions
BobbyMartins5 Dec 13, 2023
5e088cc
++ release version
BobbyMartins5 Dec 14, 2023
2787da6
Merge pull request #111 from purecloudlabs/NLU-3981
BobbyMartins5 Dec 14, 2023
b977679
++ added fraction support for catalan numbers
BobbyMartins5 Dec 22, 2023
9263244
-- removed redundant condition in normalize_token_set method.
BobbyMartins5 Dec 22, 2023
c6a94b5
-- fixes to regex and parsing
BobbyMartins5 Dec 22, 2023
b7577d6
** clarified regexes and normalize_token_set function
BobbyMartins5 Jan 2, 2024
67826ce
** fixed normalise_token_set and removed resolve_composite_number fro…
BobbyMartins5 Jan 2, 2024
2c0bb52
** release versions
BobbyMartins5 Jan 4, 2024
0aac4c1
Merge pull request #113 from purecloudlabs/NLU-3937
BobbyMartins5 Jan 4, 2024
aa0dadf
[NLU-4000] Arabic Number: Comma-Decimal bug (#114)
andrew-gradinari Jan 12, 2024
7c01184
[NLU-4016] Arabic Date bugs (#116)
andrew-gradinari Jan 16, 2024
da35ce6
[NLU-4008] [Part-I] Numeral words resolved incorrectly (#115)
KanchanKumar12 Jan 16, 2024
3b7bbf2
NLU-4012: Updates to allow for 'returned on 23' or 'returned on 23/4'
kevinwalshgen Jan 17, 2024
9d1d9e8
NLU-4012: 1.0.94a0 <= version update
kevinwalshgen Jan 18, 2024
784a1d4
[NLU-4008] [Part-II] Arabic numerals are recognized but not resolved …
KanchanKumar12 Jan 18, 2024
18fb36a
NLU-4012: 1.0.94a1 <= version update
kevinwalshgen Jan 22, 2024
8ca9976
Merge branch 'develop' into NLU-4012
kevinwalshgen Jan 23, 2024
ea9d945
NLU-4012: 1.0.94a2 <= version update
kevinwalshgen Jan 23, 2024
f3a525b
[NLU-3965] - Catalan N of N dates (#119)
Conor-Keaney Jan 23, 2024
e99bafa
Merge branch 'develop' into NLU-4012
kevinwalshgen Jan 24, 2024
53df86e
NLU-4012: 1.0.94a3 <= version update
kevinwalshgen Jan 24, 2024
44fb6c4
NLU-4012: update based on PR comments
kevinwalshgen Jan 25, 2024
33ac035
NLU-4012: final version update 1.0.94
kevinwalshgen Jan 25, 2024
bf7f355
Merge pull request #118 from purecloudlabs/NLU-4012
kevinwalshgen Jan 25, 2024
97dced9
[NLU-4014] Arabic Date: <monthame> DD not resolving in context (#121)
andrew-gradinari Jan 25, 2024
a43a773
[NLU-4003] “mig milió d'euros” (half a million euros) - doesn't resol…
KanchanKumar12 Jan 29, 2024
ccb51a7
** Fix for dates with hyphen not working and added tests
BobbyMartins5 Jan 31, 2024
67666d4
++ release versions
BobbyMartins5 Feb 1, 2024
e08cc71
++ changed conditional
BobbyMartins5 Feb 1, 2024
6f17432
++ package versions
BobbyMartins5 Feb 1, 2024
309c3cf
++ release versions again
BobbyMartins5 Feb 1, 2024
08f3976
Merge pull request #123 from purecloudlabs/NLU-4047
BobbyMartins5 Feb 1, 2024
3bf55c3
NLU-4051 - Fixing Failing Arabic amountOfMoney Regression tests (#122)
Conor-Keaney Feb 2, 2024
9277437
[NLU-3911] Arabic Time: Offsets from hours (#124)
andrew-gradinari Feb 7, 2024
d1e99f0
[NLU-4064] - Arabic time - Fix for alternative noon from native speak…
Conor-Keaney Feb 8, 2024
f5da802
++ fix for ordinals between 0 - 21 (month = may)
BobbyMartins5 Feb 8, 2024
5c6c141
bugfix/NLU-4049 - Add ISO codes to currency prefix (#126)
KanchanKumar12 Feb 9, 2024
9c1ee6f
++ fix for remaining ordinals and added tests
BobbyMartins5 Feb 12, 2024
32170e1
++ package versions
BobbyMartins5 Feb 12, 2024
419b1fa
Merge branch 'develop' into NLU-4025
BobbyMartins5 Feb 13, 2024
f6e260b
++ updated package versions
BobbyMartins5 Feb 13, 2024
d15329e
[NLU-4070] Part-II Unskip Currency tests in python (#129)
KanchanKumar12 Feb 13, 2024
981ee5f
[NLU-4070] Part-I Unskip passing tests for numbers (#128)
KanchanKumar12 Feb 13, 2024
1b18820
Merge branch 'develop' into NLU-4025
BobbyMartins5 Feb 13, 2024
c97a90a
++ changed position of non-capturing group symbol
BobbyMartins5 Feb 13, 2024
dec5da4
++ package versions
BobbyMartins5 Feb 13, 2024
b1f080b
++ release versions
BobbyMartins5 Feb 14, 2024
1179fd3
Merge pull request #127 from purecloudlabs/NLU-4025
BobbyMartins5 Feb 14, 2024
67998c5
[NLU-4070] Unskip Date Time tests - 5 languages (#130)
KanchanKumar12 Feb 15, 2024
e40a221
Fix for arabic this <weekday>
samhickey25 Feb 15, 2024
f480164
Merge branch 'develop' into NLU-4080
samhickey25 Feb 15, 2024
3df541f
Merge master
samhickey25 Feb 15, 2024
7509053
update package versions
samhickey25 Feb 15, 2024
2f036a2
Release version
samhickey25 Feb 16, 2024
84e8ed3
Merge pull request #131 from purecloudlabs/NLU-4080
samhickey25 Feb 16, 2024
98cb760
++ fixes and added tests
BobbyMartins5 Feb 21, 2024
5b1ab33
++ removed duplicate entries from regex file.
BobbyMartins5 Feb 22, 2024
3a470d1
[NLU-4079] Fix for text numerals with "point" and "x billions and y m…
KanchanKumar12 Feb 23, 2024
9d628f0
Merge branch 'develop' into NLU-4091
BobbyMartins5 Feb 23, 2024
f8cffb1
[NLU-4077] Fix for "26 million" (#133)
KanchanKumar12 Feb 23, 2024
b2d2ce7
Merge branch 'develop' into NLU-4091
BobbyMartins5 Feb 23, 2024
6b3c34b
[NLU-4096] Arabic Date: Written year not resolving correctly (#137)
andrew-gradinari Feb 23, 2024
ca2929d
Merge branch 'develop' into NLU-4091
BobbyMartins5 Feb 23, 2024
d416ad7
++ release versions
BobbyMartins5 Feb 23, 2024
6a00916
Merge remote-tracking branch 'origin/NLU-4091' into NLU-4091
BobbyMartins5 Feb 23, 2024
b4c22da
Merge pull request #135 from purecloudlabs/NLU-4091
BobbyMartins5 Feb 23, 2024
b2e1976
[NLU-4109] Speed up Recognizers test suite (#138)
andrew-gradinari Feb 26, 2024
425281e
Updated regex to accept do entity
CiaraCrowe Feb 27, 2024
794fe8f
Merge branch 'develop' into NLU-3225
CiaraCrowe Feb 27, 2024
42cfbf5
fix 9876
KanchanKumar12 Feb 27, 2024
4070f07
[NLU-4115] Revert an inadvertent push to develop branch (#139)
KanchanKumar12 Feb 27, 2024
9e4cad9
[NLU-4115] Fix Arabic regression test for 9876 (#140)
KanchanKumar12 Feb 27, 2024
213469a
Package version update
CiaraCrowe Feb 27, 2024
081d74f
NLU-4078: fix for 'half a milion'
kevinwalshgen Feb 20, 2024
5aaa946
NLU-4078: added tests
kevinwalshgen Feb 20, 2024
a9e3f9d
NLU-4078: updates based on PR comments
kevinwalshgen Feb 23, 2024
84a48ba
NLU-4078: fix and remove duplicates
kevinwalshgen Feb 27, 2024
4af9399
NLU-4078: 1.1.20 <= version number update
kevinwalshgen Feb 27, 2024
954d17b
Merge pull request #134 from purecloudlabs/NLU-4078
kevinwalshgen Feb 27, 2024
0512edb
Package version update
CiaraCrowe Feb 28, 2024
ce1171a
Merge branch 'develop' into NLU-3225
CiaraCrowe Feb 28, 2024
737d766
Package version update
CiaraCrowe Feb 28, 2024
0ca0f3b
Package version update
CiaraCrowe Feb 28, 2024
9487e0c
Merge pull request #141 from purecloudlabs/NLU-3225
CiaraCrowe Feb 28, 2024
cd4b628
Package version update
CiaraCrowe Feb 29, 2024
415d37d
Merge pull request #142 from purecloudlabs/NLU-3225
CiaraCrowe Feb 29, 2024
1caf4c0
[NLU-4111] Arabic Number: spelled out numbers not resolving correctly…
andrew-gradinari Mar 4, 2024
70e8800
++ fix for eastern digits + extra tests
BobbyMartins5 Mar 4, 2024
86a32d4
++ removed backslashes from parenthesised ```.``` and also package ve…
BobbyMartins5 Mar 4, 2024
69ed9af
++ cleaned up regex
BobbyMartins5 Mar 5, 2024
571a290
++ fixed incorrect resolution
BobbyMartins5 Mar 5, 2024
c3d8827
release versions
BobbyMartins5 Mar 5, 2024
ee14083
Merge pull request #145 from purecloudlabs/NLU-3225_2
BobbyMartins5 Mar 5, 2024
9defc7a
Merge branch 'develop' into NLU-4110
BobbyMartins5 Mar 6, 2024
9c3364d
release versions
BobbyMartins5 Mar 6, 2024
9dfee6f
Merge pull request #144 from purecloudlabs/NLU-4110
BobbyMartins5 Mar 6, 2024
77808f5
Resolved the word 'du', resolved for tuesday the 13th of the 6th mon…
CiaraCrowe Mar 11, 2024
8468c0d
Updated versions
CiaraCrowe Mar 12, 2024
2da3f85
Updated versions
CiaraCrowe Mar 12, 2024
2dd8a4e
Updated versions, got rid of alpha
CiaraCrowe Mar 12, 2024
e317c62
Merge pull request #146 from purecloudlabs/NLU-3217
CiaraCrowe Mar 12, 2024
aa30599
fix for quarter past and half past time offsets
BobbyMartins5 Mar 13, 2024
c8882cd
fix for quarter past and half past time offsets, updated tests
BobbyMartins5 Mar 21, 2024
b365120
Merge branch 'develop' into NLU-4082
BobbyMartins5 Mar 21, 2024
739cec7
removed duplicate entry in HourNumRegex
BobbyMartins5 Mar 22, 2024
d43e857
reverted change to time_parser_config.py, modified deltaminnum regex …
BobbyMartins5 Mar 22, 2024
28b7ef0
added more number alternatives and removed minus
BobbyMartins5 Mar 22, 2024
ad7e280
versions
BobbyMartins5 Mar 22, 2024
ad5d89a
fixed incorrect test date
BobbyMartins5 Mar 22, 2024
d871f72
fix for 1-3 minute cases and cleanup
BobbyMartins5 Mar 25, 2024
de2b364
cleanup again
BobbyMartins5 Mar 25, 2024
b8410c9
release versions
BobbyMartins5 Mar 25, 2024
48d243a
correct release versions
BobbyMartins5 Mar 25, 2024
3bc9ff2
Merge pull request #147 from purecloudlabs/NLU-4082
BobbyMartins5 Mar 25, 2024
63a78a1
Currency resolving for EGP and SAR
CiaraCrowe Mar 27, 2024
16a73aa
Updated correct translation of arabic words
CiaraCrowe Mar 27, 2024
181674c
Updated dependencies
CiaraCrowe Mar 29, 2024
dbb5e86
Merge pull request #148 from purecloudlabs/NLU-4112
CiaraCrowe Mar 29, 2024
6c77e16
Update min/max two digit year
samhickey25 Apr 3, 2024
0cbcf8f
Update package version
samhickey25 Apr 3, 2024
19e2bf7
Merge pull request #149 from purecloudlabs/NLU-4177
samhickey25 Apr 4, 2024
a4c8ab1
fix for incorrect start index and modified tests
BobbyMartins5 Apr 4, 2024
f035f43
removed strip() from negative number resolution
BobbyMartins5 Apr 4, 2024
1c66328
removed strip() from BasePercentageExtractor
BobbyMartins5 Apr 4, 2024
f0cf6ed
release versions
BobbyMartins5 Apr 5, 2024
f864814
Merge pull request #150 from purecloudlabs/NLU-4161
BobbyMartins5 Apr 5, 2024
2592b70
Remove timezone
andrew-gradinari Apr 8, 2024
f13dc84
Increase regex cache
andrew-gradinari Apr 8, 2024
312df4d
Skip tests that are marked as NotSupported
andrew-gradinari Apr 8, 2024
9fa08bd
Remove number_with_unit: Age, Dimension, Temperature recognizers
andrew-gradinari Apr 8, 2024
9c5901c
recognizers-number-with-unit: flake8 and isort
andrew-gradinari Apr 8, 2024
c9b935c
Fix DeprecationWarning: invalid escape sequence
andrew-gradinari Apr 8, 2024
2ad3818
recognizers-date-time: remove set
andrew-gradinari Apr 8, 2024
8eb6984
recognizers-number: remove recognize_percentage
andrew-gradinari Apr 8, 2024
c0881ff
Release version
andrew-gradinari Apr 9, 2024
5ee590c
Merge pull request #151 from purecloudlabs/NLU-4132_I
andrew-gradinari Apr 9, 2024
a83ac82
Resolved for word 'barra'
CiaraCrowe Apr 11, 2024
16c96ad
updated dependencies
CiaraCrowe Apr 11, 2024
f069ad6
Merge pull request #152 from purecloudlabs/NLU-3216
CiaraCrowe Apr 11, 2024
8d69a91
NLU-4235 - ES-ES Date - fix for 'barra' word date seperator not resol…
Conor-Keaney Apr 18, 2024
78085a2
Refactor recognizers-number-with-unit: configuration classes
andrew-gradinari May 3, 2024
50df5d7
Refactor recognizers-number-with-unit: simplify file structure
andrew-gradinari May 3, 2024
3c7c993
Refactor recognizers-number
andrew-gradinari May 3, 2024
3dae242
Refactor recognizers-date-time: DateTimeUtilityConfiguration and Date…
andrew-gradinari May 3, 2024
071b86c
Refactor recognizers-date-time: DatePeriodExtractorConfiguration
andrew-gradinari May 3, 2024
eda1d79
Refactor recognizers-date-time: DateExtractorConfiguration
andrew-gradinari May 3, 2024
4e6f295
Add pre-commit configs
andrew-gradinari May 3, 2024
a893310
Linter fixes
andrew-gradinari May 3, 2024
a80f77c
isort fixes
andrew-gradinari May 3, 2024
b491c22
black fixes
andrew-gradinari May 3, 2024
b8bde4a
Remove comments
andrew-gradinari May 9, 2024
998af37
Remove duplicate DateTimeUtilityConfiguration
andrew-gradinari May 10, 2024
6338fc9
Release versions
andrew-gradinari May 13, 2024
0951ebe
Merge pull request #154 from purecloudlabs/NLU-4132_II
andrew-gradinari May 13, 2024
36f0b6f
NLU-4429 - Update French Numbers to support French Belgium (#155)
Conor-Keaney Aug 8, 2024
77fb41c
[NLU-4487] -FR Date - Fix for written years in 19XX (#156)
Conor-Keaney Sep 3, 2024
fb07249
Updated chinese to recognise next next week
CiaraCrowe Nov 20, 2024
bf49814
Updates
CiaraCrowe Nov 22, 2024
a087655
Updates
CiaraCrowe Nov 22, 2024
6d9f0c7
Update tests
CiaraCrowe Nov 27, 2024
9e0f6bc
Updates
CiaraCrowe Nov 27, 2024
c622652
Updated requirements
CiaraCrowe Nov 28, 2024
2a6497e
Final Updates.
CiaraCrowe Nov 29, 2024
cc952a3
Updated requirement
CiaraCrowe Dec 4, 2024
afa57e1
Updated requirement
CiaraCrowe Dec 4, 2024
8ce8baa
Merge pull request #157 from purecloudlabs/NLU-4509
CiaraCrowe Dec 4, 2024
00e5f9e
une heure d'arrive is no longer picked up
CiaraCrowe Jan 2, 2025
201f4b0
Requirements
CiaraCrowe Jan 2, 2025
0a00afe
Added test case for une heure du matin
CiaraCrowe Jan 2, 2025
5e46691
As of now excluded python from this test case
CiaraCrowe Jan 14, 2025
1f63b4d
Updated regex
CiaraCrowe Jan 15, 2025
99ad243
oops
CiaraCrowe Jan 15, 2025
af958aa
chnage
CiaraCrowe Jan 15, 2025
ef2a5b9
updates
CiaraCrowe Jan 15, 2025
353278e
requirements
CiaraCrowe Jan 15, 2025
5310778
Merge pull request #158 from purecloudlabs/NLU-3950
CiaraCrowe Jan 15, 2025
0cd3af5
[NLU-4799] Number parser: fix for zero base with exponent (#159)
andrew-gradinari Jan 17, 2025
5edb52e
[NLU-4815] - Fix for thousand seperators "1000,50" resolving as 1000,…
Conor-Keaney Feb 11, 2025
b5a739d
keep changes
danielvgenesys Mar 6, 2025
4676d25
keep changes
danielvgenesys Mar 6, 2025
2f1127a
updated regex and moved test from datetime extractor to time extractor
danielvgenesys Mar 6, 2025
0bc408c
updated regex and moved test from datetime extractor to time extractor
danielvgenesys Mar 6, 2025
f13bd07
update dependencies
danielvgenesys Mar 6, 2025
7c2a5fc
updated dependency for nlu-service pr
danielvgenesys Mar 7, 2025
d5cab84
final update of dependencies
danielvgenesys Mar 11, 2025
0f13c67
Merge pull request #162 from purecloudlabs/NLU-4774_2
danielvgenesys Mar 11, 2025
4e8d8fd
update arabic swift function
danielvgenesys Jul 1, 2025
adfb8b3
update arabic swift function
danielvgenesys Jul 1, 2025
d52b58e
update arabic swift function
danielvgenesys Jul 1, 2025
e5a779d
bump version
danielvgenesys Jul 2, 2025
4eca97e
revert
danielvgenesys Jul 2, 2025
84e394e
undo revert
danielvgenesys Jul 2, 2025
a864d28
update arabic
danielvgenesys Jul 2, 2025
8055157
update arabic regexs
danielvgenesys Jul 3, 2025
f1ba352
update arabic regexs
danielvgenesys Jul 3, 2025
7c964b7
test
danielvgenesys Jul 4, 2025
d153037
test
danielvgenesys Jul 4, 2025
2194999
add relative date regex
danielvgenesys Jul 7, 2025
1402778
small changes
danielvgenesys Jul 7, 2025
0f05743
after two days fix
danielvgenesys Jul 8, 2025
d6e7234
white space and version
danielvgenesys Jul 8, 2025
9fe6995
minimalise changes
danielvgenesys Jul 8, 2025
4760982
bump version
danielvgenesys Jul 8, 2025
e8f7b6a
revert
danielvgenesys Jul 8, 2025
35a3d58
in / after changes + tests
danielvgenesys Jul 9, 2025
379946e
date -> datetime and test
danielvgenesys Jul 9, 2025
b42facf
date -> datetime
danielvgenesys Jul 9, 2025
546dd27
date -> datetime
danielvgenesys Jul 9, 2025
d51d2ee
test
danielvgenesys Jul 9, 2025
bb57a0c
test
danielvgenesys Jul 9, 2025
bdde255
test no in changes
danielvgenesys Jul 9, 2025
a3141af
test
danielvgenesys Jul 10, 2025
f80ddea
test
danielvgenesys Jul 10, 2025
0d295b1
final bump to 1.1.43
danielvgenesys Jul 15, 2025
a08cdb6
Merge pull request #165 from purecloudlabs/NLU-5190
danielvgenesys Jul 15, 2025
36557a2
fix for Pence and penny
CiaraCrowe Feb 26, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ public static class NumbersDefinitions
public static readonly string TwoNumberRangeRegex3 = $@"({OneNumberRangeLessRegex1}|{OneNumberRangeLessRegex2})\s*(،)?\s*((أ|ا)?و|لكن|,)\s*({OneNumberRangeMoreRegex1}|{OneNumberRangeMoreRegex2})";
public static readonly string TwoNumberRangeRegex4 = $@"((من\s)(?<number1>({NumberSplitMark}(?!\bمن\b).)+)\s*{TillRegex}\s*(ال\s+)?(?<number2>({NumberSplitMark}.)+))|((من\s)?(?<number1>({NumberSplitMark}(?!\bمن\b).)+)\s*{TillRegex}\s*(ال\s+)?(?<number2>({NumberSplitMark}.)+))";
public const string AmbiguousFractionConnectorsRegex = @"(\bمن|بين|من|بين\b)";
public const char DecimalSeparatorChar = ',';
public const char DecimalSeparatorChar = '.';
public const string FractionMarkerToken = @"أكثر";
public const char NonDecimalSeparatorChar = '،';
public const char NonDecimalSeparatorChar = ',';
public const string HalfADozenText = @"ستة";
public const string WordSeparatorToken = @"و";
public static readonly string[] WrittenDecimalSeparatorTexts = { @"نقطة | فاصلة" };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public static class DateTimeDefinitions
public static readonly string MonthFrontSimpleCasesRegex = $@"\b({RangePrefixRegex}\s+)?(({MonthSuffixRegex}\s+((van)\s+)?({DayRegex})|({DayRegex})\s+((van)\s+)?{MonthSuffixRegex})\s*{TillRegex}\s*({DayRegex})|(op\s+)?({DayRegex})\s*{TillRegex}\s*({DayRegex})\s+{MonthSuffixRegex})((\s+|\s*,\s*){YearRegex})?\b";
public static readonly string MonthFrontBetweenRegex = $@"\b{MonthSuffixRegex}\s+(tussen\s+)({DayRegex})\s*{RangeConnectorRegex}\s*({DayRegex})((\s+|\s*,\s*){YearRegex})?\b";
public static readonly string BetweenRegex = $@"\b(tussen\s+)({DayRegex})\s*{RangeConnectorRegex}\s*({DayRegex})\s+{MonthSuffixRegex}((\s+|\s*,\s*){YearRegex})?\b";
public static readonly string RelativeYearRegex = $@"({YearRegex}|(?<order>volgende?|komende?|aanstaande?|aankomende?|huidige?|vorige?|afgelopen|dit)\s+jaar)";
public static readonly string RelativeYearRegex = $@"({YearRegex}|{TwoDigitYearRegex}|(?<order>volgende?|komende?|aanstaande?|aankomende?|huidige?|vorige?|afgelopen|dit)\s+jaar)";
public static readonly string MonthWithYear = $@"\b(({WrittenMonthRegex}(\.)?(\s*)[/\\\-\.,]?(\s+(van|over|in))?(\s*){RelativeYearRegex})|({RelativeYearRegex}(\s*),?(\s*){WrittenMonthRegex}))\b";
public static readonly string OneWordPeriodRegex = $@"\b((((de\s+)?maand\s+(van\s+)?)?({StrictRelativeRegex}\s+)?(?<month>januari|februari|maart|april|mei|juni|juli|augustus|september|oktober|november|december|jan\.?|feb\.?|mar\.?|mrt\.?|apr\.?|jun\.?|jul\.?|aug\.?|sep\.?|sept\.?|oct\.?|okt\.?|nov\.?|dec\.?))|(maand|jaar)\s+tot(\s+op)?\s+heden|(({RelativeRegex}\s+)(mijn\s+)?(weekend|(?<business>werkweek)|week|maand|jaar(?!\s+hoger dan))|({RelativeRegex}\s+)?(mijn\s+)(weekend|(?<business>werkweek)|week|maand|jaar))(?!((\s+van)?\s+\d+|\s+tot(\s+op)?\s+heden|nu))(\s+{AfterNextSuffixRegex})?)\b";
public static readonly string MonthNumWithYear = $@"\b(({BaseDateTime.FourDigitYearRegex}(\s*)[/\-\.](\s*){MonthNumRegex})|({MonthNumRegex}(\s*)[/\-](\s*){BaseDateTime.FourDigitYearRegex}))\b";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public static class DateTimeDefinitions
public static readonly string MonthFrontSimpleCasesRegex = $@"\b({RangePrefixRegex}\s+)?{MonthSuffixRegex}\s+((from)\s+)?({DayRegex}|{WrittenOrdinalDayRegex})\s*{TillRegex}\s*({DayRegex}|{WrittenOrdinalDayRegex})((\s+|\s*,\s*){YearRegex})?\b";
public static readonly string MonthFrontBetweenRegex = $@"\b{MonthSuffixRegex}\s+(between\s+)({DayRegex}|{WrittenOrdinalDayRegex})\s*{RangeConnectorRegex}\s*({DayRegex}|{WrittenOrdinalDayRegex})((\s+|\s*,\s*){YearRegex})?\b";
public static readonly string BetweenRegex = $@"\b(between\s+)({DayRegex}|{WrittenOrdinalDayRegex})\s*{RangeConnectorRegex}\s*({DayRegex}|{WrittenOrdinalDayRegex})\s+{MonthSuffixRegex}((\s+|\s*,\s*){YearRegex})?\b";
public static readonly string MonthWithYear = $@"\b((({WrittenMonthRegex}[\.]?|((the\s+)?(?<cardinal>first|1st|second|2nd|third|3rd|fourth|4th|fifth|5th|sixth|6th|seventh|7th|eighth|8th|ninth|9th|tenth|10th|eleventh|11th|twelfth|12th|last)\s+month(?=\s+(of|in))))((\s*)[/\\\-\.,]?(\s+(of|in))?(\s*)({YearRegex}|(?<order>following|next|last|this)\s+year)|\s+(of|in)\s+{TwoDigitYearRegex}))|(({YearRegex}|(?<order>following|next|last|this)\s+year)(\s*),?(\s*){WrittenMonthRegex}))\b";
public static readonly string MonthWithYear = $@"\b((({WrittenMonthRegex}[\.]?|((the\s+)?(?<cardinal>first|1st|second|2nd|third|3rd|fourth|4th|fifth|5th|sixth|6th|seventh|7th|eighth|8th|ninth|9th|tenth|10th|eleventh|11th|twelfth|12th|last)\s+month(?=\s+(of|in))))((\s*)[/\\\-\.,]?(\s+(of|in))?(\s*)({YearRegex}|{TwoDigitYearRegex}|(?<order>following|next|last|this)\s+year)|\s+(of|in)\s+{TwoDigitYearRegex}))|(({YearRegex}|(?<order>following|next|last|this)\s+year)(\s*),?(\s*){WrittenMonthRegex}))\b";
public const string SpecialYearPrefixes = @"(calendar|(?<special>fiscal|school))";
public static readonly string OneWordPeriodRegex = $@"\b((((the\s+)?month of\s+)?({StrictRelativeRegex}\s+)?{MonthRegex})|(month|year) to date|(?<toDate>((un)?till?|to)\s+date)|({RelativeRegex}\s+)?(my\s+)?((?<business>working\s+week|workweek)|week(end)?|month|fortnight|(({SpecialYearPrefixes}\s+)?year))(?!((\s+of)?\s+\d+(?!({BaseDateTime.BaseAmDescRegex}|{BaseDateTime.BasePmDescRegex}))|\s+to\s+date))(\s+{AfterNextSuffixRegex})?)\b";
public static readonly string MonthNumWithYear = $@"\b(({BaseDateTime.FourDigitYearRegex}(\s*)[/\-\.](\s*){MonthNumRegex})|({MonthNumRegex}(\s*)[/\-](\s*){BaseDateTime.FourDigitYearRegex}))\b";
Expand Down Expand Up @@ -139,8 +139,8 @@ public static class DateTimeDefinitions
public static readonly string DateExtractor4 = $@"\b{MonthNumRegex}\s*[/\\\-]\s*{DayRegex}[\.]?\s*[/\\\-]\s*{DateYearRegex}";
public static readonly string DateExtractor5 = $@"\b({DayPrefix}(\s*,)?\s+)?{DayRegex}\s*[/\\\-\.]\s*({MonthNumRegex}|{MonthRegex})\s*[/\\\-\.]\s*{DateYearRegex}(?!\s*[/\\\-\.]\s*\d+)";
public static readonly string DateExtractor6 = $@"(?<={DatePreposition}\s+)({StrictRelativeRegex}\s+)?({DayPrefix}\s+)?{MonthNumRegex}[\-\.]{DayRegex}(?![%]){BaseDateTime.CheckDecimalRegex}\b";
public static readonly string DateExtractor7L = $@"\b({DayPrefix}(\s*,)?\s+)?{MonthNumRegex}\s*/\s*{DayRegex}{DateExtractorYearTermRegex}(?![%])\b";
public static readonly string DateExtractor7S = $@"\b({DayPrefix}(\s*,)?\s+)?{MonthNumRegex}\s*/\s*{DayRegex}(?![%]){BaseDateTime.CheckDecimalRegex}\b";
public static readonly string DateExtractor7L = $@"\b({DayPrefix}(\s*,)?\s+)?(the\s+)?{MonthNumRegex}\s*/\s*{DayRegex}{DateExtractorYearTermRegex}(?![%])\b";
public static readonly string DateExtractor7S = $@"\b({DayPrefix}(\s*,)?\s+)?(the\s+)?{MonthNumRegex}\s*/\s*{DayRegex}(?![%]){BaseDateTime.CheckDecimalRegex}\b";
public static readonly string DateExtractor8 = $@"(?<={DatePreposition}\s+)({StrictRelativeRegex}\s+)?({DayPrefix}\s+)?{DayRegex}[\\\-]{MonthNumRegex}(?![%]){BaseDateTime.CheckDecimalRegex}\b";
public static readonly string DateExtractor9L = $@"\b({DayPrefix}(\s*,)?\s+)?{DayRegex}\s*/\s*{MonthNumRegex}{DateExtractorYearTermRegex}(?![%])\b";
public static readonly string DateExtractor9S = $@"\b({DayPrefix}(\s*,)?\s+)?{DayRegex}\s*/\s*{MonthNumRegex}{BaseDateTime.CheckDecimalRegex}(?![%])\b";
Expand All @@ -160,7 +160,7 @@ public static class DateTimeDefinitions
public const string LunchRegex = @"\blunchtime\b";
public const string NightRegex = @"\b(mid)?night\b";
public const string CommonDatePrefixRegex = @"^[\.]";
public static readonly string LessThanOneHour = $@"(?<lth>(a\s+)?quarter|three quarter(s)?|half( an hour)?|{BaseDateTime.DeltaMinuteRegex}(\s+(minutes?|mins?))|{DeltaMinuteNumRegex}(\s+(minutes?|mins?)))";
public static readonly string LessThanOneHour = $@"(?<lth>(a\s+)?quarter|three quarter(s)?|half( an hour)?|{BaseDateTime.DeltaMinuteRegex}(\s+(minutes?|mins?)|(?=\s+past))|{DeltaMinuteNumRegex}(\s+(minutes?|mins?)|(?=\s+past)))";
public static readonly string WrittenTimeRegex = $@"(?<writtentime>{HourNumRegex}\s+{MinuteNumRegex}(\s+(minutes?|mins?))?)";
public static readonly string TimePrefix = $@"(?<prefix>{LessThanOneHour}\s+(past|to))";
public static readonly string TimeSuffix = $@"(?<suffix>{AmRegex}|{PmRegex}|{OclockRegex})";
Expand Down Expand Up @@ -924,4 +924,4 @@ public static class DateTimeDefinitions
public const string QuarterTypeRegex = @"(quarter(s|ly)?)$";
public const string YearTypeRegex = @"((years?|annual)(ly)?)$";
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public static class DateTimeDefinitions
public static readonly string MonthFrontSimpleCasesRegex = $@"((vom|zwischen)\s*)?{MonthSuffixRegex}\s*((vom|zwischen)\s*)?({DayRegex})\s*{TillRegex}\s*({DayRegex})((\s+|\s*,\s*){YearRegex})?";
public static readonly string MonthFrontBetweenRegex = $@"({MonthSuffixRegex}\s+(zwischen\s+)({DayRegex})\s*{RangeConnectorRegex}\s*({DayRegex})((\s+|\s*,\s*){YearRegex})?)";
public static readonly string BetweenRegex = $@"((zwischen\s+)({DayRegex})(\s+{MonthSuffixRegex})?\s*{RangeConnectorRegex}\s*({DayRegex})(\s+{MonthSuffixRegex})((\s+|\s*,\s*){YearRegex})?|(zwischen\s+)({DayRegex})(\s+{MonthSuffixRegex})?\s*{RangeConnectorRegex}\s*({DayRegex})(\s+{MonthSuffixRegex})?((\s+|\s*,\s*){YearRegex})?)";
public static readonly string MonthWithYear = $@"\b((?<month>apr(il|\.)|aug(ust|\.)|dez(ember|\.)|feb(ruar|ber|\.)|januar|j[äa]n(ner|\.)|jul(e?i|l\.)|jun([io]|\.)|märz|mai|nov(ember|\.)|okt(ober|\.)|sept?(ember|\.))(\s*),?(\s+des)?(\s*)({YearRegex}|(?<order>nächste[mn]|letzte[mn]|diese(s|n))\s+jahres))";
public static readonly string MonthWithYear = $@"\b((?<month>apr(il|\.)|aug(ust|\.)|dez(ember|\.)|feb(ruar|ber|\.)|januar|j[äa]n(ner|\.)|jul(e?i|l\.)|jun([io]|\.)|märz|mai|nov(ember|\.)|okt(ober|\.)|sept?(ember|\.))(\s*),?(\s+des)?(\s*)({YearRegex}|{TwoDigitYearRegex}|(?<order>nächste[mn]|letzte[mn]|diese(s|n))\s+jahres))";
public static readonly string OneWordPeriodRegex = $@"\b((((im\s+)?monat\s+)?({RelativeRegex}\s*(jahr\s*(im\s*)?)?)?(?<month>apr(il|\.)|aug(ust|\.)|dez(ember|\.)|feb(ruar|ber|\.)|j[äa]n(uar|ner|\.)|jul(e?i|l\.)|jun([io]|\.)|märz|mai|nov(ember|\.)|okt(ober|\.)|sept?(ember|\.)))|(?<business>unter\s+der\s+woche)|({RelativeRegex}\s+)?((?<business>werktags|arbeitswoche)|woche(nende)?|monat(s)?|jahr|jahres)(?!(\s+\d+(?!({BaseDateTime.BaseAmDescRegex}|{BaseDateTime.BasePmDescRegex}))|\s+bis\s+heute)))\b";
public static readonly string MonthNumWithYear = $@"({YearRegex}(\s*)[/\-\.](\s*){MonthNumRegex})|({MonthNumRegex}(\s*)[/\-\.](\s*){YearRegex})";
public static readonly string WeekOfMonthRegex = $@"(?<wom>((die|der)\s+)(?<cardinal>erste[rns]?|1\.|zweite[rns]?|2\.|dritte[rns]?|3\.|vierte[rns]?|4\.|fünfte[rns]?|5\.|letzte[rmns]?)\s+woche\s+(des|diese(s|n)|im)\s+({MonthSuffixRegex}|monat(s)?))";
Expand Down Expand Up @@ -98,13 +98,13 @@ public static class DateTimeDefinitions
public static readonly string WeekDayOfMonthRegex = $@"\b(?<wom>((an( dem)?|de[rs]|am)\s+)?(?<cardinal>erste[rns]?|1\.|zweite[rns]?|2\.|dritte[rns]?|3\.|vierte[rns]?|4\.|fünfte[rns]?|5\.|letzte[rmns]?)\s+{WeekDayRegex}\s+{MonthSuffixRegex})\b";
public static readonly string RelativeWeekDayRegex = $@"\b({WrittenNumRegex}\s+{WeekDayRegex}e\s+(von\s+jetzt|später))\b";
public static readonly string SpecialDate = $@"(?=\b(an( dem)?|am)\s+){DayRegex}\b";
public static readonly string DateExtractor1 = $@"\b(({WeekDayRegex})(\s+|\s*,\s*))?({DayRegex}\s*[/\\.,\- ]\s*{MonthRegex}(\s*[/\\.,\- ]\s*{DateYearRegex})?|{BaseDateTime.FourDigitYearRegex}\s*[/\\.,\- ]\s*{DayRegex}\s*[/\\.,\- ]\s*{MonthRegex})\b";
public static readonly string DateExtractor1 = $@"\b(({WeekDayRegex})(\s+|\s*,\s*))?({DayRegex}\s*[/\\.,\- ]\s*({MonthNumRegex}|{MonthRegex})(\s*[/\\.,\- ]\s*{DateYearRegex})?|{BaseDateTime.FourDigitYearRegex}\s*[/\\.,\- ]\s*{DayRegex}\s*[/\\.,\- ]\s*{MonthRegex})\b";
public static readonly string DateExtractor2 = $@"\b({MonthRegex}\s*[/\\.,\- ]\s*{DayRegex}(?!\s*\-\s*\d{{2}}\b)(\s*[/\\.,\- ]\s*{DateYearRegex})?)\b";
public static readonly string DateExtractor3 = $@"\b({DayRegex}{MonthRegex})";
public static readonly string DateExtractor4 = $@"\b({DayRegex}\s*{MonthNumRegex}\s*{DateYearRegex})\b";
public static readonly string DateExtractor5 = $@"\b(({WeekDayRegex})(\s+|\s*,\s*))?({DayRegex}\s*[/\\\-\.]\s*({MonthNumRegex}|{MonthRegex})\s*[/\\\-\.]\s*{DateYearRegex})\b(?!\s*[/\\\-\.]\s*\d+)";
public static readonly string DateExtractor6 = $@"^[.]";
public static readonly string DateExtractor7 = $@"({DayRegex}\s*[\.]\s*{MonthNumRegex}[\.]){BaseDateTime.CheckDecimalRegex}";
public static readonly string DateExtractor7 = $@"\b({DayRegex}\s*[\.]\s*{MonthNumRegex}[\.]){BaseDateTime.CheckDecimalRegex}";
public static readonly string DateExtractor8 = $@"(?<=\b(am)\s+){DayRegex}[/\\\.]{MonthNumRegex}([/\\\.]{DateYearRegex})?{BaseDateTime.CheckDecimalRegex}\b";
public static readonly string DateExtractor9 = $@"\b({DayRegex}\s*/\s*{MonthNumRegex}((\s+|\s*,\s*){DateYearRegex})?){BaseDateTime.CheckDecimalRegex}\b";
public static readonly string DateExtractor10 = $@"^[.]";
Expand All @@ -125,7 +125,7 @@ public static class DateTimeDefinitions
public const string NightRegex = @"\b(mitternacht|(nachts?|primetime|abends?))\b";
public const string AmPmPrefixRegex = @"\b((((um|gegen)\s*)?(?<suffix>(((?<am>am morgen)|((früh|spät)\s*)?morgens|früh|(vor|nach)mittags?)|(?<pm>((früh|spät)\s*)?(nachmittags?|abends?)|mitternachts?))|(in der\s*)?(?<pm>nachts?)))\s*(um|gegen|von)\s*)";
public const string CommonDatePrefixRegex = @"^[\.]";
public static readonly string LessThanOneHour = $@"\b(?<lth>(ein(er?)?\s+)?((drei)?viertel|halb(en?)?)(\s*stunden?)?)|{BaseDateTime.DeltaMinuteRegex}(\s+(min(uten?)?))|{DeltaMinuteNumRegex}(\s+(min(uten?)?))";
public static readonly string LessThanOneHour = $@"\b(?<lth>(ein(er?)?\s+)?((drei)?viertel|halb(en?)?)(\s*stunden?)?)|{BaseDateTime.DeltaMinuteRegex}(\s+(min(uten?)?)|(?=\s+(nach|vor)))|{DeltaMinuteNumRegex}(\s+(min(uten?)?)|(?=\s+(nach|vor)))";
public static readonly string WrittenTimeRegex = $@"(um\s*)?(?<writtentime>{HourNumRegex}(\s*{OclockRegex}\s*)({MinuteNumRegex}|{MinuteNumRegex}und(?<tens>zwanzig|dreißig|vierzig|fünfzig)))";
public static readonly string TimePrefix = $@"(?<prefix>({LessThanOneHour})(\s*(vor(\W)?|nach(\W)?))?)";
public static readonly string TimeSuffix = $@"(?<suffix>{AmRegex}|{PmRegex}|{OclockRegex})";
Expand Down Expand Up @@ -936,4 +936,4 @@ public static class DateTimeDefinitions
@"year to date"
};
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public static class DateTimeDefinitions
public static readonly string MonthFrontBetweenRegex = $@"\b{MonthSuffixRegex}\s+([tf]ra\s+)({DayRegex})\s*{RangeConnectorRegex}\s*({DayRegex})((\s+|\s*,\s*){YearRegex})?\b";
public static readonly string BetweenRegex = $@"\b([tf]ra\s+)({DayRegex})\s*{RangeConnectorRegex}\s*({DayRegex})\s+{MonthSuffixRegex}((\s+|\s*,\s*){YearRegex})?\b";
public const string YearWordRegex = @"\b(?<year>l'anno)\b";
public static readonly string MonthWithYear = $@"\b({MonthRegex}(\.)?(\s*)[/\\\-\.,]?(((\s+del)?\s+{YearRegex})|((\s+(del|di|il))?\s+(?<order>prossim['o]|passato|quest['o])\s*anno)|((\s+(del)?l')anno\s+(?<order>prossimo|passato))))";
public static readonly string MonthWithYear = $@"\b({MonthRegex}(\.)?(\s*)[/\\\-\.,]?(((\s+del)?\s+{YearRegex}|{TwoDigitYearRegex})|((\s+(del|di|il))?\s+(?<order>prossim['o]|passato|quest['o])\s*anno)|((\s+(del)?l')anno\s+(?<order>prossimo|passato))))";
public const string SpecialYearPrefixes = @"(?<special>fiscale|scolastico)";
public static readonly string OneWordPeriodRegex = $@"\b((((il|l[o'])\s*)?((mese di\s+)|({RelativeRegex}\s*))?{MonthRegex}(\s+{RelativeRegex})?)|dall'inizio\s+del(l')\s*(mese|anno)|({RelativeRegex}\s*)?(mi[ao]\s+)?(weekend|finesettimana|settimana|mese|anno)(\s+{RelativeRegex})?(?!((\s+di|del)?\s+\d+))(\s+{AfterNextSuffixRegex})?)\b";
public static readonly string MonthNumWithYear = $@"({YearRegex}[/\-\.]{MonthNumRegex})|({MonthNumRegex}[/\-]{YearRegex})";
Expand Down Expand Up @@ -139,9 +139,9 @@ public static class DateTimeDefinitions
public const string AmRegex = @"\b(?<am>((((la|alla|verso|per|della|di|in)\s+(la\s+)?)?(mattinata|mattina))|(((il|al|verso|per|del|di)\s+(il\s+)?)?(mattino))))\b";
public const string LunchRegex = @"\b(ora di pranzo)\b";
public const string NightRegex = @"\b(mezzanotte|notte)\b";
public static readonly string LessThanOneHour = $@"(?<lth>(un\s+quarto|tre quarti?|mezz[oa]|mezz'ora|{BaseDateTime.DeltaMinuteRegex}(\s+(minut[oi]|min))?|{DeltaMinuteNumRegex}(\s+(minut[oi]|min))|(?<=(e|meno)\s+){DeltaMinuteNumRegex}))";
public static readonly string LessThanOneHour = $@"(?<lth>(un\s+quarto|tre quarti?|mezz[oa]|mezz'ora|{BaseDateTime.DeltaMinuteRegex}|{DeltaMinuteNumRegex}))";
public static readonly string EngTimeRegex = $@"(?<engtime>{HourNumRegex}\s+e\s+({MinuteNumRegex}|(?<tens>venti?|trenta?|quaranta?|cinquanta?){MinuteNumRegex}))";
public static readonly string TimePrefix = $@"(?<prefix>(e\s+{LessThanOneHour}|{LessThanOneHour}\s+(minut[oi]|min)\s+all[e']|meno {LessThanOneHour}))";
public static readonly string TimePrefix = $@"(?<prefix>((e|meno)\s+{LessThanOneHour}(\s+(minut[oi]|min))?|{LessThanOneHour}\s+(minut[oi]|min)\s+all[e']))";
public static readonly string TimeSuffix = $@"(?<suffix>{AmRegex}|{PmRegex}|{OclockRegex})";
public static readonly string BasicTime = $@"\b(?<basictime>{EngTimeRegex}|{HourNumRegex}|{BaseDateTime.HourRegex}:{BaseDateTime.MinuteRegex}(:{BaseDateTime.SecondRegex})?|{BaseDateTime.HourRegex})";
public const string MidnightRegex = @"(?<midnight>mezzanotte|mezza notte)";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ public static class NumbersWithUnitDefinitions
public const string CompoundUnitConnectorRegex = @"(?<spacer>e)";
public static readonly Dictionary<string, string> CurrencyPrefixList = new Dictionary<string, string>
{
{ @"Dollar", @"$" },
{ @"Dollar", @"$|dollari" },
{ @"United States dollar", @"$ stati uniti|us$|us $|u.s. $|u.s $" },
{ @"East Caribbean dollar", @"east caribbean $" },
{ @"Australian dollar", @"$ australiano|$ australia" },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,13 @@ public void AdjustByPrefix(string prefix, ref int hour, ref int min, ref bool ha
minStr = match.Groups["deltaminnum"].Value;
deltaMin = Numbers[minStr];
}
}

// @TODO move hardcoded values to resources file
// @TODO move hardcoded values to resources file

if (trimmedPrefix.EndsWith("zum", StringComparison.Ordinal))
{
deltaMin = -deltaMin;
if (trimmedPrefix.EndsWith("vor", StringComparison.Ordinal))
{
deltaMin = -deltaMin;
}
}

min += deltaMin;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ public void AdjustByPrefix(string prefix, ref int hour, ref int min, ref bool ha
}

// 'to' i.e 'one to five'
if (trimmedPrefix.StartsWith("meno", StringComparison.Ordinal))
if (trimmedPrefix.StartsWith("meno", StringComparison.Ordinal) ||
trimmedPrefix.EndsWith("alle", StringComparison.Ordinal))
{
deltaMin = -deltaMin;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,9 @@ public PrefixAdjustResult adjustByPrefix(String prefix, int hour, int min, boole
minStr = match.get().getGroup("deltaminnum").value;
deltaMin = numbers.getOrDefault(minStr, 0);
}
}

if (trimmedPrefix.endsWith("zum")) {
deltaMin = -deltaMin;
if (trimmedPrefix.endsWith("vor")) {
deltaMin = -deltaMin;
}
}

min += deltaMin;
Expand Down
Loading