diff --git a/contrib/remind-conf-mode/remind-conf-mode.el b/contrib/remind-conf-mode/remind-conf-mode.el index 3c3ba7b7..6d45bf13 100644 --- a/contrib/remind-conf-mode/remind-conf-mode.el +++ b/contrib/remind-conf-mode/remind-conf-mode.el @@ -132,11 +132,11 @@ (defconst remind-builtin-variables (sort - (list "$Am" "$And" "$April" "$August" "$CalcUTC" "$CalMode" "$Daemon" "$DateSep" + (list "$Ago" "$Am" "$And" "$April" "$At" "$August" "$CalcUTC" "$CalMode" "$Daemon" "$DateSep" "$DateTimeSep" "$December" "$DefaultColor" "$DefaultPrio" "$DefaultTDelta" "$DeltaOffset" "$DontFork" "$DontQueue" "$DontTrigAts" "$EndSent" "$EndSentIg" "$February" "$FirstIndent" - "$FoldYear" "$FormWidth" "$Friday" "$Hour" "$Hplu" "$HushMode" "$IgnoreOnce" + "$FoldYear" "$FormWidth" "$Friday" "$Fromnow" "$Hour" "$Hplu" "$HushMode" "$IgnoreOnce" "$InfDelta" "$IntMax" "$IntMin" "$Is" "$January" "$July" "$June" "$LatDeg" "$Latitude" "$LatMin" "$LatSec" "$Location" "$LongDeg" "$Longitude" "$LongMin" "$LongSec" "$March" "$MaxSatIter" "$MaxStringLen" "$May" diff --git a/include/lang/de.rem b/include/lang/de.rem new file mode 100644 index 00000000..7ca17bb8 --- /dev/null +++ b/include/lang/de.rem @@ -0,0 +1,57 @@ +# German language file for Remind + +# Day names +SET $Sunday "Sonntag" +SET $Monday "Montag" +SET $Tuesday "Dienstag" +SET $Wednesday "Mittwoch" +SET $Thursday "Donnerstag" +SET $Friday "Freitag" +SET $Saturday "Samstag" + +# Month names +SET $January "Januar" +SET $February "Februar" +SET $March "März" +SET $April "April" +SET $May "Mai" +SET $June "Juni" +SET $July "Juli" +SET $August "August" +SET $September "September" +SET $October "Oktober" +SET $November "November" +SET $December "Dezember" + +SET $Today "heute" +SET $Tomorrow "morgen" + +# Banner +BANNER Termine für %w, den %d. %m %y%o: + +SET $Am "am" +SET $Pm "pm" +SET $On "am" +SET $Hplu "n" +SET $Mplu "n" +SET $Now "jetzt" +SET $At "um" +SET $Minute "Minute" +SET $Hour "Stunde" +SET $Is "ist" +SET $Was "war" +SET $And "und" + +FSET subst_ampm(h) iif(h<5, " nachts", h<12, " vormittags", h<=17, " nachmittags", " abends") +FSET subst_ordinal(d) "." + +FSET subst_a_alt(d) wkday(d) + ", den " + day(d) + ". " + mon(d) + " " + year(d) +FSET subst_a(alt, d, t) iif(alt, subst_a_alt(d), $On + " " + subst_a_alt(d)) + +FSET subst_b(a, d, t) iif(d==today(), $Today, d==today()+1, $Tomorrow, "in " + (d-today()) + " Tagen") + +FSET subst_g_alt(d) wkday(d) + ", den " + day(d) + ". " + mon(d) +FSET subst_g(alt, d, t) iif(alt, subst_g_alt(d), $On + " " + subst_g_alt(d)) + +FSET subst_u(alt, d, t) subst_a(alt, d, t) +FSET subst_v(alt, d, t) subst_g(alt, d, t) diff --git a/include/lang/fr.rem b/include/lang/fr.rem index df02b139..d70d3255 100644 --- a/include/lang/fr.rem +++ b/include/lang/fr.rem @@ -32,6 +32,8 @@ SET $Was "était" SET $And "et" SET $Hplu "s" SET $Mplu "s" +SET $Ago "il y a" +SET $Fromnow "dans" # Banner BANNER Rappels pour %w, %d%s %m, %y%o: @@ -48,6 +50,7 @@ FSET subst_1(alt, date, time) iif(time == now(), "maintenant", \ time > now(), "dans " + subst_tdiff((time-now())/60, (time-now())%60), \ "il y a " + subst_tdiff ((now()-time)/60, (now()-time)%60)) +FSET subst_b(alt, date, time) iif(date==today(), $Today, date==today()+1, $Tomorrow, "dans " + (date-today()) + " jours") FSET subst_j_alt(date) wkday(date) + ", " + day(date) + subst_ordinal(day(date)) + " " + mon(date) + " " + year(date) FSET subst_j(alt, date, time) iif(alt, subst_j_alt(date), $On + " " + subst_j_alt(date)) diff --git a/src/Makefile.in b/src/Makefile.in index f807f871..604698e5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -23,7 +23,7 @@ SCRIPTS= $(srcdir)/../scripts/tkremind MANS= $(srcdir)/../man/rem2ps.1 $(srcdir)/../man/remind.1 \ $(srcdir)/../man/tkremind.1 $(srcdir)/../man/rem.1 -LANGS= fr.rem +LANGS= fr.rem de.rem .SUFFIXES: .SUFFIXES: .c .o diff --git a/src/dosubst.c b/src/dosubst.c index 23ac4b74..488b74ec 100644 --- a/src/dosubst.c +++ b/src/dosubst.c @@ -88,7 +88,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *t, TimeTrig *tt, int jul, hplu = (hdiff == 1 ? "" : DynamicHplu); #endif /* L_HPLU_OVER */ - when = (tdiff < 0 ? L_AGO : L_FROMNOW); + when = (tdiff < 0) ? DynamicAgo : DynamicFromnow; h = tim / 60; min = tim % 60; diff --git a/src/globals.h b/src/globals.h index 49f095fd..83f30102 100644 --- a/src/globals.h +++ b/src/globals.h @@ -226,6 +226,11 @@ EXTERN int MonthIndex[2][12] #endif ; +EXTERN char *DynamicAgo +#ifdef MK_GLOBALS += L_AGO +#endif +; EXTERN char *DynamicAm #ifdef MK_GLOBALS = L_AM @@ -241,6 +246,11 @@ EXTERN char *DynamicAt = L_AT #endif ; +EXTERN char *DynamicFromnow +#ifdef MK_GLOBALS += L_FROMNOW +#endif +; EXTERN char *DynamicHour #ifdef MK_GLOBALS = L_HOUR diff --git a/src/var.c b/src/var.c index b4298fce..fe4d7ff1 100644 --- a/src/var.c +++ b/src/var.c @@ -775,6 +775,7 @@ typedef struct { /* All of the system variables sorted alphabetically */ static SysVar SysVarArr[] = { /* name mod type value min/mal max validate*/ + {"Ago", 1, STR_TYPE, &DynamicAgo, 0, 0, NULL }, {"Am", 1, STR_TYPE, &DynamicAm, 0, 0, NULL }, {"And", 1, STR_TYPE, &DynamicAnd, 0, 0, NULL }, {"April", 1, STR_TYPE, &DynamicMonthName[3], 0, 0, NULL }, @@ -800,6 +801,7 @@ static SysVar SysVarArr[] = { {"FoldYear", 1, INT_TYPE, &FoldYear, 0, 1, NULL }, {"FormWidth", 1, INT_TYPE, &FormWidth, 20, 500, NULL }, {"Friday", 1, STR_TYPE, &DynamicDayName[4], 0, 0, NULL }, + {"Fromnow", 1, STR_TYPE, &DynamicFromnow, 0, 0, NULL }, {"Hour", 1, STR_TYPE, &DynamicHour, 0, 0, NULL }, {"Hplu", 1, STR_TYPE, &DynamicHplu, 0, 0, NULL }, {"HushMode", 0, INT_TYPE, &Hush, 0, 0, NULL }, diff --git a/tests/test.cmp b/tests/test.cmp index 21020646..4202e146 100644 --- a/tests/test.cmp +++ b/tests/test.cmp @@ -2686,6 +2686,7 @@ a125 -1 dump $ Variable Value + $Ago "ago" $Am "am" $And "and" $April "April" @@ -2711,6 +2712,7 @@ Variable Value $FoldYear 0 [0, 1] $FormWidth 72 [20, 500] $Friday "Friday" + $Fromnow "from now" $Hour "hour" $Hplu "s" $HushMode 0