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

Improve dutch #539

Merged
merged 9 commits into from
Nov 23, 2023
Merged

Improve dutch #539

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0d645a0
allow both komend and volgend in Dutch
HendrikJan Nov 13, 2023
d455ecc
allow both komend and volgend in Dutch
HendrikJan Nov 13, 2023
c5261fd
shorten regexp and add aankomende
HendrikJan Nov 13, 2023
179ffcd
make NLTimeUnitCasualRelativeFormatParser more line with NLRelativeDa…
HendrikJan Nov 13, 2023
5abd265
improve code formatting for better readable PR
HendrikJan Nov 13, 2023
4e37147
more code formatting for better readable PR
HendrikJan Nov 13, 2023
ac55a87
use non-capturing group in regex
HendrikJan Nov 20, 2023
767fba5
also use non-capturing group in the other parser
HendrikJan Nov 20, 2023
2c2d8af
split up 'next month' in two ways to say it in Dutch
HendrikJan Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/locales/nl/parsers/NLRelativeDateFormatParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/
import { matchAnyPattern } from "../../../utils/pattern";

const PATTERN = new RegExp(
`(dit|deze|komende|volgend|volgende|afgelopen|vorige)\\s*(${matchAnyPattern(TIME_UNIT_DICTIONARY)})(?=\\s*)` +
"(?=\\W|$)",
`(dit|deze|(aan)?komend|volgend|afgelopen|vorig)e?\\s*(${matchAnyPattern(TIME_UNIT_DICTIONARY)})(?=\\s*)` +
HendrikJan marked this conversation as resolved.
Show resolved Hide resolved
"(?=\\W|$)",
"i"
);

const MODIFIER_WORD_GROUP = 1;
const RELATIVE_WORD_GROUP = 2;
const RELATIVE_WORD_GROUP = 3;

export default class NLRelativeDateFormatParser extends AbstractParserWithWordBoundaryChecking {
innerPattern(): RegExp {
Expand All @@ -24,13 +24,13 @@ export default class NLRelativeDateFormatParser extends AbstractParserWithWordBo
const unitWord = match[RELATIVE_WORD_GROUP].toLowerCase();
const timeunit = TIME_UNIT_DICTIONARY[unitWord];

if (modifier == "volgend" || modifier == "volgende" || modifier == "komende") {
if (modifier == "volgend" || modifier == "komend" || modifier == "aankomend") {
const timeUnits = {};
timeUnits[timeunit] = 1;
return ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
}

if (modifier == "afgelopen" || modifier == "vorige") {
if (modifier == "afgelopen" || modifier == "vorig") {
const timeUnits = {};
timeUnits[timeunit] = -1;
return ParsingComponents.createRelativeFromReference(context.reference, timeUnits);
Expand Down
11 changes: 7 additions & 4 deletions src/locales/nl/parsers/NLTimeUnitCasualRelativeFormatParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,21 @@ import { ParsingComponents } from "../../../results";
import { AbstractParserWithWordBoundaryChecking } from "../../../common/parsers/AbstractParserWithWordBoundary";
import { reverseTimeUnits } from "../../../utils/timeunits";

const PATTERN = new RegExp(`(deze|vorige|afgelopen|komende|over|\\+|-)\\s*(${TIME_UNITS_PATTERN})(?=\\W|$)`, "i");
const PATTERN = new RegExp(`(dit|deze|vorig|afgelopen|(aan)?komend|over|\\+|-)e?\\s*(${TIME_UNITS_PATTERN})(?=\\W|$)`, "i");
HendrikJan marked this conversation as resolved.
Show resolved Hide resolved

const PREFIX_WORD_GROUP = 1;
const TIME_UNIT_WORD_GROUP = 3;

export default class NLTimeUnitCasualRelativeFormatParser extends AbstractParserWithWordBoundaryChecking {
innerPattern(): RegExp {
return PATTERN;
}

innerExtract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents {
const prefix = match[1].toLowerCase();
let timeUnits = parseTimeUnits(match[2]);
const prefix = match[PREFIX_WORD_GROUP].toLowerCase();
let timeUnits = parseTimeUnits(match[TIME_UNIT_WORD_GROUP]);
switch (prefix) {
case "vorige":
case "vorig":
case "afgelopen":
case "-":
timeUnits = reverseTimeUnits(timeUnits);
Expand Down
6 changes: 3 additions & 3 deletions test/nl/nl_relative.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ test("Test - Past relative expressions", () => {

test("Test - Future relative expressions", () => {
// next hour
testSingleCase(chrono.nl, "komende uur", new Date(2016, 10 - 1, 1, 12), (result, text) => {
HendrikJan marked this conversation as resolved.
Show resolved Hide resolved
testSingleCase(chrono.nl, "komend uur", new Date(2016, 10 - 1, 1, 12), (result, text) => {
expect(result.text).toBe(text);
expect(result.start.get("year")).toBe(2016);
expect(result.start.get("month")).toBe(10);
Expand All @@ -98,7 +98,7 @@ test("Test - Future relative expressions", () => {
});

// next month
testSingleCase(chrono.nl, "volgende maand", new Date(2016, 10 - 1, 1, 12), (result, text) => {
testSingleCase(chrono.nl, "aankomende maand", new Date(2016, 10 - 1, 1, 12), (result, text) => {
expect(result.text).toBe(text);
expect(result.start.get("year")).toBe(2016);
expect(result.start.get("month")).toBe(11);
Expand Down Expand Up @@ -137,7 +137,7 @@ test("Test - Relative date components' certainty", () => {
const refDate = new Date(2016, 10 - 1, 7, 12);

// next hour
testSingleCase(chrono.nl, "komende uur", refDate, (result, text) => {
testSingleCase(chrono.nl, "komend uur", refDate, (result, text) => {
expect(result.text).toBe(text);
expect(result.start.get("year")).toBe(2016);
expect(result.start.get("month")).toBe(10);
Expand Down