Add translations for "yesterday"; update subst_bx to handle negative differences.

2026-04-17 06:48:47 +02:00 · 2025-08-11 18:05:07 -04:00
parent 76b7736266
commit f21f8ee8d0
14 changed files with 41 additions and 14 deletions
--- a/include/lang/ca.rem
+++ b/include/lang/ca.rem
@@ -28,7 +28,9 @@ SET $December "desembre"

 SET $Today "avui"
 SET $Tomorrow "demà"
-FSET subst_bx(a,d,t) iif(d==today()+2, "demà passat", "d'aquí " + (d-today()) + " dies")
+TRANSLATE "yesterday" "ahir"
+
+FSET subst_bx(a,d,t) iif(d==today()+2, "demà passat", d >= today(), "d'aquí " + (d-today()) + " dies", "fa " + (today()-d) + "dies")

 # 1 d'abril vs 1 de maig.
 FSET subst_sx(a,d,t) iif(isany(substr(mon(d), 1, 1), "a", "o") , "d'", "de")
--- a/include/lang/da.rem
+++ b/include/lang/da.rem
@@ -29,6 +29,8 @@ SET $December "December"
 SET $Today "i dag"
 SET $Tomorrow "i morgen"

+TRANSLATE "yesterday" "i går"
+
 BANNER Påmindelse for %w, %d. %m, %y%o:

 SET $Am "am"
@@ -57,7 +59,7 @@ FSET zeropad(s, len) pad(s, "0", len)
 FSET subst_a_alt(d) wkday(d) + ", den " + day(d) + ". " + mon(d) + " " + year(d)
 FSET subst_ax(alt, d, t) iif(alt, subst_a_alt(d), $On + " " + subst_a_alt(d))

-FSET subst_bx(a, d, t)   "om " + (d-today()) + " dage"
+FSET subst_bx(a, d, t)  iif(d >= today(), "om " + (d-today()) + " dage", "for " + (today()-d) + " dage siden")

 FSET subst_ex(alt, d, t) "den " + zeropad(day(d), 2) + $DateSep + zeropad(monnum(d), 2) + $DateSep + zeropad(year(d), 4)
 FSET subst_fx(alt, d, t) "den " + zeropad(monnum(d), 2) + $DateSep + zeropad(day(d), 2) + $DateSep + zeropad(year(d), 4)
--- a/include/lang/de.rem
+++ b/include/lang/de.rem
@@ -31,6 +31,8 @@ SET $December "Dezember"
 SET $Today "heute"
 SET $Tomorrow "morgen"

+TRANSLATE "yesterday" "gestern"
+
 # Banner
 BANNER Termine für %w, den %d. %m %y%o:

@@ -55,7 +57,7 @@ FSET subst_ordinal(d)   "."
 FSET subst_a_alt(d)     wkday(d) + ", den " + day(d) + ". " + mon(d) + " " + year(d)
 FSET subst_ax(alt, d, t) iif(alt, subst_a_alt(d), $On + " " + subst_a_alt(d))

-FSET subst_bx(a, d, t)   "in " + (d-today()) + " Tagen"
+FSET subst_bx(a, d, t)   iif(d >= today(), "in " + (d-today()) + " Tagen", "vor " + (today()-d) + " Tagen")

 FSET subst_g_alt(d)     wkday(d) + ", den " + day(d) + ". " + mon(d)
 FSET subst_gx(alt, d, t) iif(alt, subst_g_alt(d), $On + " " + subst_g_alt(d))
--- a/include/lang/es.rem
+++ b/include/lang/es.rem
@@ -29,6 +29,8 @@ SET $December "Diciembre"
 SET $Today "hoy"
 SET $Tomorrow "mañana"

+TRANSLATE "yesterday" "ayer"
+
 BANNER Agenda para el %w, %d%s %m, %y%o:

 SET $Am "am"
@@ -47,4 +49,4 @@ SET $And "y"
 SET $Hplu "s"
 SET $Mplu "s"

-FSET subst_bx(a, d, t) "dentro de " + (d-today()) + " días"
+FSET subst_bx(a, d, t) iif(d >= today(), "dentro de " + (d-today()) + " días", "hace " + (today()-d) + " dias")
--- a/include/lang/fi.rem
+++ b/include/lang/fi.rem
@@ -29,6 +29,8 @@ SET $December "joulukuu"
 SET $Today "tänään"
 SET $Tomorrow "huomenna"

+TRANSLATE "yesterday" "eilen"
+
 BANNER Viestit %wna %d. %mta %y%o:

 SET $Am " ap."
@@ -56,7 +58,7 @@ FSET subst_ordinal(d) iif(d==1, ":senä", d==2, ":sena", (d%10)==2||(d%10)==3||(
 FSET subst_a_alt(d, o, p) wkday(d) + o + " " + day(d) + ". " + mon(d) + p + " " + year(d)
 FSET subst_ax(a, d, t) iif(a, subst_a_alt(d, "", ""), subst_a_alt(d, $On, "ta"))

-FSET subst_bx(a, d, t) (d-today()) + " päivän kuluttua"
+FSET subst_bx(a, d, t) iif(d >= today(), (d-today()) + " päivän kuluttua", (today()-d) + " päivää sitten")
 FSET subst_cx(a, d, t) iif(a, wkday(d), wkday(d) + $On)

 FSET subst_ex(a, d, t) zeropad(day(d), 2) + $DateSep + zeropad(monnum(d), 2) + $DateSep + zeropad(year(d), 4)
--- a/include/lang/fr.rem
+++ b/include/lang/fr.rem
@@ -28,6 +28,9 @@ SET $December "décembre"

 SET $Today "aujourd'hui"
 SET $Tomorrow "demain"
+
+TRANSLATE "yesterday" "hier"
+
 SET $On "le"
 SET $At "à"
 SET $Now "maintenant"
@@ -56,7 +59,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_bx(alt, date, time) "dans " + (date-today()) + " jours"
+FSET subst_bx(alt, date, time) iif(date >= today(), "dans " + (date-today()) + " jours", "il y a " + (today()-date) + " jours")
 FSET subst_j_alt(date) wkday(date) + ", " + day(date) + subst_ordinal(day(date)) + " " + mon(date) + ", " + year(date)
 FSET subst_jx(alt, date, time) iif(alt, subst_j_alt(date), $On + " " + subst_j_alt(date))

--- a/include/lang/gr.rem
+++ b/include/lang/gr.rem
@@ -29,6 +29,8 @@ SET $December "Δεκέμβρ."
 SET $Today "σήμερα"
 SET $Tomorrow "αύριο"

+TRANSLATE "yesterday" "εχθές"
+
 BANNER Υπενθυμίσεις: %w, %d %m, %y%o:

 SET $Am "πμ"
@@ -49,7 +51,7 @@ SET $And "και"
 SET $Hplu ""
 SET $Mplu ""

-FSET subst_bx(a, d, t) "σε " + (d - today()) + " ημέρες"
+FSET subst_bx(a, d, t) iif(d >= today(), "σε " + (d - today()) + " ημέρες", "πριν από " + (today()-d) + " ημέρες")
 FSET subst_ordinal(d)   "."
 FSET subst_a_alt(d)     wkday(d) + ", " + day(d) + ". " + mon(d) + " " + year(d)
 FSET subst_ax(alt, d, t) iif(alt, subst_a_alt(d), $On + " " + subst_a_alt(d))
--- a/include/lang/is.rem
+++ b/include/lang/is.rem
@@ -29,6 +29,8 @@ SET $December "desember"
 SET $Today "í dag"
 SET $Tomorrow "á morgun"

+TRANSLATE "yesterday" "í gær"
+
 BANNER Minnisatriði: %w, %d%s %m, %y%o:

 SET $Am "fh"
@@ -49,5 +51,5 @@ SET $And "og"
 SET $Hplu "ir"
 SET $Mplu "r"

-FSET subst_bx(a, d, t) "eftir " + (d - today()) + " daga"
+FSET subst_bx(a, d, t) iif(d >= today(), "eftir " + (d - today()) + " daga", "fyrir " + (today()-d) + " dögum")
 fset subst_p(a, d, t) iif(d == today()+1, "", "a")
--- a/include/lang/it.rem
+++ b/include/lang/it.rem
@@ -29,6 +29,8 @@ SET $December "Dicembre"
 SET $Today "oggi"
 SET $Tomorrow "domani"

+TRANSLATE "yesterday" "Ieri"
+
 BANNER Promemoria per %w, %d %m %y%o:

 SET $Am "am"
@@ -48,7 +50,7 @@ SET $And "e"
 SET $Hplu "a"
 SET $Mplu "i"

-FSET subst_bx(a, d, t) "fra " + (d-today()) + " giorni"
+FSET subst_bx(a, d, t) iif(d >= today(), "fra " + (d-today()) + " giorni", (today()-d) + " giorni fa")
 FSET subst_p(a, d, t) iif(d==today()+1, "o", "i")
 FSET subst_q(a, d, t) iif(d==today()+1, "a", "e")

--- a/include/lang/nl.rem
+++ b/include/lang/nl.rem
@@ -28,6 +28,7 @@ SET $December "december"

 SET $Today "vandaag"
 SET $Tomorrow "morgen"
+TRANSLATE "yesterday" "gisteren"

 BANNER Herinneringen voor %w, %d %m, %y%o:

@@ -55,7 +56,7 @@ FSET subst_1b(hdiff, mdiff) iif(hdiff==0, subst_minutes(mdiff), mdiff==0, subst_
 FSET subst_minutes(m) iif(m==1, "1 minuut", m + " minuten")
 FSET subst_hours(h) iif(h==1, "1 uur", h + " uren")

-FSET subst_bx(a, d, t) "over " + (d-today()) + " dagen"
+FSET subst_bx(a, d, t) iif (d >= today(), "over " + (d-today()) + " dagen", (today()-d) + " dagen geleden")

 FSET subst_s(a, d, t) iif(day(d) == 1 || day(d) == 8, "e", day(d) < 20, "de", "te")
 TRANSLATE "New Moon" "Nieuwe maan"
--- a/include/lang/no.rem
+++ b/include/lang/no.rem
@@ -29,6 +29,8 @@ SET $December "Desember"
 SET $Today "i dag"
 SET $Tomorrow "i morgen"

+TRANSLATE "yesterday" "i går"
+
 BANNER Påminnelse for %w, %d. %m, %y%o:

 SET $Am "am"
@@ -48,7 +50,7 @@ SET $And "og"
 SET $Hplu "r"
 SET $Mplu "er"

-FSET subst_bx(a, d, t) "om " + (d-today()) + " dager"
+FSET subst_bx(a, d, t) iif(d >= today(), "om " + (d-today()) + " dager", "for " + (today()-d) + " dager siden")
 FSET subst_ordinal(d) "."

 FSET subst_ax(a, d, t) iif(a, subst_a_alt(d), $On + " " + subst_a_alt(d))
--- a/include/lang/pl.rem
+++ b/include/lang/pl.rem
@@ -29,6 +29,8 @@ SET $December "Grudzień"
 SET $Today "dzisiaj"
 SET $Tomorrow "jutro"

+TRANSLATE "yesterday" "wczoraj"
+
 BANNER Terminarz na %w, %d. %m %y%o:

 SET $Am "am"
@@ -53,7 +55,7 @@ FSET subst_ordinal(d) ""

 FSET subst_a_alt(d) wkday(d) + ", " + day(d) + ". " + mon(d) + " " + year(d)
 FSET subst_ax(a, d, t) iif(a, subst_a_alt(d), $On + " " + subst_a_alt(d))
-FSET subst_bx(a, d, t) "za " + (d-today()) + " dni"
+FSET subst_bx(a, d, t) iif(d >= today(), "za " + (d-today()) + " dni", (today()-d) + " dni temu")
 FSET subst_g_alt(d) wkday(d) + ", " + day(d) + ". " + mon(d)
 FSET subst_gx(a, d, t) iif(a, subst_g_alt(d), $On + " " + subst_g_alt(d))
 FSET subst_ux(a, d, t) subst_ax(a, d, t)
--- a/include/lang/pt.rem
+++ b/include/lang/pt.rem
@@ -29,6 +29,8 @@ SET $December "dezembro"
 SET $Today "hoje"
 SET $Tomorrow "amanhã"

+TRANSLATE "yesterday" "ontem"
+
 BANNER Avisos para %w, %d de %m de %y%o:

 SET $Am "am"
@@ -53,7 +55,7 @@ FSET subst_ordinal(d) ""
 FSET subst_on_wd(d) iif(wkdaynum(d) == 1 || wkdaynum(d) == 2, "no", "na")

 FSET subst_a_alt(d) wkday(d) + ", " + day(d) + " de " + mon(d) + " de " + year(d)
-FSET subst_bx(a, d, t) "em " + (d-today()) + " dias"
+FSET subst_bx(a, d, t) iif(d >= today(), "em " + (d-today()) + " dias", "há " + (today()-d) + " dias")
 FSET subst_c_alt(d) wkday(d)
 FSET subst_g_alt(d) wkday(d) + ", " + day(d) + " " + mon(d)
 FSET subst_ax(a, d, t) iif(a, subst_a_alt(d), subst_on_wd(d) + " " + subst_a_alt(d))
--- a/include/lang/ro.rem
+++ b/include/lang/ro.rem
@@ -28,6 +28,7 @@ SET $December "Decembrie"

 SET $Today "astăzi"
 SET $Tomorrow "mâine"
+TRANSLATE "yesterday" "ieri"

 BANNER Reamintiri pentru %w, %d %m %y%o:

@@ -49,7 +50,7 @@ SET $Mplu "e"
 SET $Hplu "e"
 SET $And "şi"

-FSET subst_bx(a, d, t) "peste " + (d-today()) + " zile"
+FSET subst_bx(a, d, t) iif(d >= today(), "peste " + (d-today()) + " zile", "acume " + (today()-d) + " zile")

 FSET subst_ampm(h) iif(h<4, " noaptea", h<12, " dimineaţa", h<18, " după-amiaza", " seara")
 FSET subst_ordinal(d) ""