diff --git a/include/lang/ca.rem b/include/lang/ca.rem index 8777a65d..a1126199 100644 --- a/include/lang/ca.rem +++ b/include/lang/ca.rem @@ -33,7 +33,7 @@ TRANSLATE "are" "són" TRANSLATE "were" "eren" TRANSLATE "done" "completada" -FSET - subst_bx(a,d,t) iif(d==today()+2, "demà passat", d >= today(), "d'aquí " + (d-today()) + " dies", "fa " + (today()-d) + " dies") +FSET - subst_bx(a,d,t) iif(d==$U+2, "demà passat", d >= $U, "d'aquí " + (d-$U) + " dies", "fa " + ($U-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") diff --git a/include/lang/da.rem b/include/lang/da.rem index 823554f8..f4d78ac4 100644 --- a/include/lang/da.rem +++ b/include/lang/da.rem @@ -58,12 +58,12 @@ FSET - subst_ampm(h) iif(h<5, " om natten", h < 12, " om formiddagen", h < 18, " FSET - subst_ordinal(d) "." FSET - ordx(n) n + "." -FSET - subst_p(alt, d, t) iif(d==today()+1, "", "e") +FSET - subst_p(alt, d, t) iif(d==$U+1, "", "e") 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) iif(d >= today(), "om " + (d-today()) + " dage", "for " + (today()-d) + " dage siden") +FSET - subst_bx(a, d, t) iif(d >= $U, "om " + (d-$U) + " dage", "for " + ($U-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) diff --git a/include/lang/de.rem b/include/lang/de.rem index c14ea68c..5e0f939a 100644 --- a/include/lang/de.rem +++ b/include/lang/de.rem @@ -61,14 +61,14 @@ FSET - ordx(n) n + "." 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) iif(d >= today(), "in " + (d-today()) + " Tagen", "vor " + (today()-d) + " Tagen") +FSET - subst_bx(a, d, t) iif(d >= $U, "in " + (d-$U) + " Tagen", "vor " + ($U-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)) FSET - subst_ux(alt, d, t) subst_ax(alt, d, t) FSET - subst_vx(alt, d, t) subst_gx(alt, d, t) -FSET - subst_p(alt, d, t) iif(d == today()+1, "", "en") +FSET - subst_p(alt, d, t) iif(d == $U+1, "", "en") # Localization of various astronomical events diff --git a/include/lang/es.rem b/include/lang/es.rem index cee6f5f6..14acbfba 100644 --- a/include/lang/es.rem +++ b/include/lang/es.rem @@ -52,4 +52,4 @@ SET $And "y" SET $Hplu "s" SET $Mplu "s" -FSET - subst_bx(a, d, t) iif(d >= today(), "dentro de " + (d-today()) + " días", "hace " + (today()-d) + " dias") +FSET - subst_bx(a, d, t) iif(d >= $U, "dentro de " + (d-$U) + " días", "hace " + ($U-d) + " dias") diff --git a/include/lang/fi.rem b/include/lang/fi.rem index 8f9d8095..bf8e719c 100644 --- a/include/lang/fi.rem +++ b/include/lang/fi.rem @@ -62,7 +62,7 @@ FSET - ordx(d) d + subst_ordinal(d) 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) iif(d >= today(), (d-today()) + " päivän kuluttua", (today()-d) + " päivää sitten") +FSET - subst_bx(a, d, t) iif(d >= $U, (d-$U) + " päivän kuluttua", ($U-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) @@ -81,7 +81,7 @@ FSET - subst_k_alt(d, o) wkday(d) + o + " " + mon(d) + "n " + day(d) + subst_ord FSET - subst_kx(a, d, t) iif(a, subst_k_alt(d, ""), subst_k_alt(d, $On)) FSET - subst_lx(a, d, t) zeropad(year(d), 4) + $DateSep + zeropad(monnum(d), 2) + $DateSep + zeropad(day(d), 2) -FSET - subst_p(a, d, t) iif(d==today()+1, "", "ä") +FSET - subst_p(a, d, t) iif(d==$U+1, "", "ä") FSET - subst_qx(a, d, t) "n" FSET - subst_u_alt(d, o, p) wkday(d) + o + " " + day(d) + subst_ordinal(day(d)) + " " + mon(d) + p + " " + year(d) diff --git a/include/lang/fr.rem b/include/lang/fr.rem index abba0da5..704f8264 100644 --- a/include/lang/fr.rem +++ b/include/lang/fr.rem @@ -63,7 +63,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) iif(date >= today(), "dans " + (date-today()) + " jours", "il y a " + (today()-date) + " jours") +FSET - subst_bx(alt, date, time) iif(date >= $U, "dans " + (date-$U) + " jours", "il y a " + ($U-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)) diff --git a/include/lang/gr.rem b/include/lang/gr.rem index e1c72fea..341dcd5b 100644 --- a/include/lang/gr.rem +++ b/include/lang/gr.rem @@ -54,7 +54,7 @@ SET $And "και" SET $Hplu "" SET $Mplu "" -FSET - subst_bx(a, d, t) iif(d >= today(), "σε " + (d - today()) + " ημέρες", "πριν από " + (today()-d) + " ημέρες") +FSET - subst_bx(a, d, t) iif(d >= $U, "σε " + (d - $U) + " ημέρες", "πριν από " + ($U-d) + " ημέρες") FSET - subst_ordinal(d) "." FSET - ordx(d) d + "." FSET - subst_a_alt(d) wkday(d) + ", " + day(d) + ". " + mon(d) + " " + year(d) diff --git a/include/lang/is.rem b/include/lang/is.rem index a73ac6b1..c545d880 100644 --- a/include/lang/is.rem +++ b/include/lang/is.rem @@ -54,5 +54,5 @@ SET $And "og" SET $Hplu "ir" SET $Mplu "r" -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") +FSET - subst_bx(a, d, t) iif(d >= $U, "eftir " + (d - $U) + " daga", "fyrir " + ($U-d) + " dögum") +FSET - subst_p(a, d, t) iif(d == $U+1, "", "a") diff --git a/include/lang/it.rem b/include/lang/it.rem index c3baa9ed..f74f2813 100644 --- a/include/lang/it.rem +++ b/include/lang/it.rem @@ -53,9 +53,9 @@ SET $And "e" SET $Hplu "a" SET $Mplu "i" -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") +FSET - subst_bx(a, d, t) iif(d >= $U, "fra " + (d-$U) + " giorni", ($U-d) + " giorni fa") +FSET - subst_p(a, d, t) iif(d==$U+1, "o", "i") +FSET - subst_q(a, d, t) iif(d==$U+1, "a", "e") FSET - subst_ax(a, d, t) wkday(d) + ", " + day(d) + " " + mon(d) + " " + year(d) FSET - subst_jx(a, d, t) subst_ax(a, d, t) diff --git a/include/lang/nl.rem b/include/lang/nl.rem index 3cbec386..de2ec68e 100644 --- a/include/lang/nl.rem +++ b/include/lang/nl.rem @@ -59,7 +59,7 @@ FSET - subst_1b(hdiff, mdiff) iif(hdiff==0, subst_minutes(mdiff), mdiff==0, subs 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) iif (d == today()+2, "overmorgen", d+2 == today(), "eergisteren", d >= today(), "over " + (d-today()) + " dagen", (today()-d) + " dagen geleden") +FSET - subst_bx(a, d, t) iif (d == $U+2, "overmorgen", d+2 == $U, "eergisteren", d >= $U, "over " + (d-$U) + " dagen", ($U-d) + " dagen geleden") FSET - subst_s(a, d, t) iif(day(d) == 1 || day(d) == 8, "e", day(d) < 20, "de", "te") diff --git a/include/lang/no.rem b/include/lang/no.rem index 4570e71e..ddea0b97 100644 --- a/include/lang/no.rem +++ b/include/lang/no.rem @@ -53,7 +53,7 @@ SET $And "og" SET $Hplu "r" SET $Mplu "er" -FSET - subst_bx(a, d, t) iif(d >= today(), "om " + (d-today()) + " dager", "for " + (today()-d) + " dager siden") +FSET - subst_bx(a, d, t) iif(d >= $U, "om " + (d-$U) + " dager", "for " + ($U-d) + " dager siden") FSET - subst_ordinal(d) "." FSET - ordx(n) n + "." @@ -63,4 +63,4 @@ FSET - subst_gx(a, d, t) iif(a, subst_g_alt(d), $On + " " + subst_g_alt(d)) FSET - subst_g_alt(d) wkday(d) + ", den " + day(d) + ". " + mon(d) FSET - subst_ux(a, d, t) subst_ax(a, d, t) FSET - subst_vx(a, d, t) subst_gx(a, d, t) -FSET - subst_p(a, d, t) iif(d==today()+1, "", "er") +FSET - subst_p(a, d, t) iif(d==$U+1, "", "er") diff --git a/include/lang/pl.rem b/include/lang/pl.rem index 0c8479fc..99f05629 100644 --- a/include/lang/pl.rem +++ b/include/lang/pl.rem @@ -58,7 +58,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) iif(d >= today(), "za " + (d-today()) + " dni", (today()-d) + " dni temu") +FSET - subst_bx(a, d, t) iif(d >= $U, "za " + (d-$U) + " dni", ($U-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) diff --git a/include/lang/pt.rem b/include/lang/pt.rem index a5221706..8941196c 100644 --- a/include/lang/pt.rem +++ b/include/lang/pt.rem @@ -58,7 +58,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) iif(d >= today(), "em " + (d-today()) + " dias", "há " + (today()-d) + " dias") +FSET - subst_bx(a, d, t) iif(d >= $U, "em " + (d-$U) + " dias", "há " + ($U-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)) diff --git a/include/lang/ro.rem b/include/lang/ro.rem index a0e35298..6d887d8b 100644 --- a/include/lang/ro.rem +++ b/include/lang/ro.rem @@ -53,7 +53,7 @@ SET $Mplu "e" SET $Hplu "e" SET $And "şi" -FSET - subst_bx(a, d, t) iif(d >= today(), "peste " + (d-today()) + " zile", "acume " + (today()-d) + " zile") +FSET - subst_bx(a, d, t) iif(d >= $U, "peste " + (d-$U) + " zile", "acume " + ($U-d) + " zile") FSET - subst_ampm(h) iif(h<4, " noaptea", h<12, " dimineaţa", h<18, " după-amiaza", " seara") FSET - subst_ordinal(d) "" @@ -65,7 +65,7 @@ FSET - subst_jx(a, d, t) wkday(d) + ", " + mon(d) + " " + day(d) + ", " + year(d FSET - subst_kx(a, d, t) wkday(d) + ", " + mon(d) + " " + day(d) FSET - subst_ux(a, d, t) subst_ax(a, d, t) FSET - subst_vx(a, d, t) subst_gx(a, d, t) -FSET - subst_p(a, d, t) iif(d==today()+1, "", "le") +FSET - subst_p(a, d, t) iif(d==$U+1, "", "le") FSET - subst_1(a, d, t) iif(t==now(), $Now, t