diff --git a/src/dorem.c b/src/dorem.c index 9be33915..e7fd8037 100644 --- a/src/dorem.c +++ b/src/dorem.c @@ -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")); + } } } } diff --git a/tests/test.cmp b/tests/test.cmp index add7e666..b61a98ef 100644 --- a/tests/test.cmp +++ b/tests/test.cmp @@ -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" ""