felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-16 06:18:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Give more specific ADDOMIT advice.

Browse Source
This commit is contained in:
Dianne Skoll
2025-09-29 14:22:10 -04:00
parent 01461929d7
commit 26ec92675c
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dorem.c
View File

@@ -1222,7 +1222,13 @@ int ParseRem(ParsePtr s, Trigger *trig, TimeTrig *tim)
if (trig->addomit) {
if (trig->y == NO_YR || trig->m == NO_MON || trig->d == NO_DAY || trig->rep != NO_REP) {
if (trig->scanfrom == NO_SCANFROM) {
Wprint(tr("Warning: Consider using SCANFROM with recurring ADDOMIT"));
if (trig->y == NO_YR && trig->m != NO_MON && trig->d != NO_DAY) {
Wprint(tr("Warning: Consider using SCANFROM -28 with recurring ADDOMIT"));
} else if (trig->m == NO_MON && trig->d != NO_DAY) {
Wprint(tr("Warning: Consider using SCANFROM -7 with recurring ADDOMIT"));
} else {
Wprint(tr("Warning: Consider using SCANFROM with recurring ADDOMIT"));
}
}
}
}

4
tests/test.cmp
View File

@@ -857,7 +857,7 @@ The tags are:
# Test ADDOMIT
REM Mon 15 Feb ADDOMIT MSG Family Day
../tests/test.rem(254): Warning: Consider using SCANFROM with recurring ADDOMIT
../tests/test.rem(254): Warning: Consider using SCANFROM -28 with recurring ADDOMIT
../tests/test.rem(254): Trig = Monday, 18 February, 1991
REM Feb 18 AFTER MSG Should trigger on Feb 19
../tests/test.rem(255): Trig = Tuesday, 19 February, 1991
@@ -25119,6 +25119,8 @@ TRANSLATE "Unmatched PUSH-VARS at %s(%d)" ""
TRANSLATE "Unrecognized command; interpreting as REM" ""
TRANSLATE "User function `%s' defined in non-constant context makes expression non-constant" ""
TRANSLATE "Variable assignment considered non-constant because of context" ""
TRANSLATE "Warning: Consider using SCANFROM -28 with recurring ADDOMIT" ""
TRANSLATE "Warning: Consider using SCANFROM -7 with recurring ADDOMIT" ""
TRANSLATE "Warning: Consider using SCANFROM with recurring ADDOMIT" ""
TRANSLATE "Warning: Function name `%s...' truncated to `%s'" ""
TRANSLATE "Warning: OMIT is ignored if you use OMITFUNC" ""