Commit 8cab1830 authored by Fam Lam's avatar Fam Lam Committed by Volker Krause
Browse files

Add Dutch month abbreviations and weekdays. Remove Ma conversion

Add Dutch month abbreviations and weekdays. Skipping Di, Do abbreviations due to conflicts with other languages. Remove conversion of Ma -> Tu as Ma is Dutch for Maandag (Monday)
parent 8da8f437
Pipeline #166528 passed with stages
in 3 minutes and 2 seconds
......@@ -327,7 +327,7 @@ private Q_SLOTS:
T2("Senin-Sabtu 09:00-16:00, Minggu 09:00-18:00", "Mo-Sa 09:00-16:00, Su 09:00-18:00");
T2("Lundi-samedi 8H00-12H00 16H00-20H00 dimanche,jours fériés 9H00-12H00 17H00-20H00", "Mo-Sa 08:00-12:00,16:00-20:00; Su,PH 09:00-12:00,17:00-20:00");
T2("De février à novembre", "Feb-Nov");
T3("Ma,Me,Je,Ve 8h-12h30, 14h-19h; Sa 8h-12h30, 14h-18h", "Tu,We,Th,Fr 08:00-12:30,14:00-19:00; Sa 08:00-12:30,14:00-18:00", "Tu-Fr 08:00-12:30,14:00-19:00; Sa 08:00-12:30,14:00-18:00");
T3("Me,Je,Ve 8h-12h30, 14h-19h; Sa 8h-12h30, 14h-18h", "We,Th,Fr 08:00-12:30,14:00-19:00; Sa 08:00-12:30,14:00-18:00", "We-Fr 08:00-12:30,14:00-19:00; Sa 08:00-12:30,14:00-18:00");
T2("Mo-Fr: 10:00-18:30 Uhr Sa: 10:00-13:30 Uhr", "Mo-Fr 10:00-18:30; Sa 10:00-13:30");
T2("Montag & Dienstag Ruhetag", "Mo,Tu closed");
T2("Понедельник - Суббота 09:00 - 21:00", "Mo-Sa 09:00-21:00");
......
......@@ -168,6 +168,10 @@ Dec\.? { yylval->num = 12; return T_MONTH; }
"Ноябрь" { yylval->num = 11; return T_MONTH; }
"Декабрь" { yylval->num = 12; return T_MONTH; }
/* Month abbreviations in Dutch */
"Mrt" { yylval->num = 3; return T_MONTH; }
"Mei" { yylval->num = 5; return T_MONTH; }
"Okt" { yylval->num = 10; return T_MONTH; }
/* different quote types are sometimes mixed and/or used nested, so this is a compromise to catch most of them */
["][^"]*["] {
......@@ -220,7 +224,6 @@ Feiertage? { return T_PH; }
/* French, Spanish, Italian */
Lu { yylval->num = 1; return T_WEEKDAY; }
Ma { yylval->num = 2; return T_WEEKDAY; }
/* French, Italian */
Me { yylval->num = 3; return T_WEEKDAY; }
/* German, Spanish, Italian */
......@@ -234,8 +237,9 @@ Ve { yylval->num = 5; return T_WEEKDAY; }
/* German */
So { yylval->num = 7; return T_WEEKDAY; }
/* "Di" conflicts between German and French...
"Do" conflicts between German and Spanish+Italian... */
/* "Ma" conflicts between Dutch and French+Spanish+Italian...
"Di" conflicts between Dutch+German and French...
"Do" conflicts between Dutch+German and Spanish+Italian... */
/* French localized day names. */
Lun(di)? { yylval->num = 1; return T_WEEKDAY; }
......@@ -301,6 +305,15 @@ Minggu { yylval->num = 7; return T_WEEKDAY; }
Суббота|Суб|Су|Сб { yylval->num = 6; return T_WEEKDAY; }
Воскресенье|Вос|Во { yylval->num = 7; return T_WEEKDAY; }
/* Dutch localized day names */
Maandag { yylval->num = 1; return T_WEEKDAY; }
Dinsdag { yylval->num = 2; return T_WEEKDAY; }
Wo(e(nsdag)?)? { yylval->num = 3; return T_WEEKDAY; }
Donderdag { yylval->num = 4; return T_WEEKDAY; }
Vr(ijdag)? { yylval->num = 5; return T_WEEKDAY; }
Za(terdag)? { yylval->num = 6; return T_WEEKDAY; }
Zo(ndag)? { yylval->num = 7; return T_WEEKDAY; }
/* creative rule separators */
、|and|et|e|y|und|& { return T_ADDITIONAL_RULE_SEPARATOR; }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment