diff --git a/include/lang/da.rem b/include/lang/da.rem index bbf9080f..c37f8645 100644 --- a/include/lang/da.rem +++ b/include/lang/da.rem @@ -53,6 +53,7 @@ SET $Mplu "ter" FSET subst_ampm(h) iif(h<5, " om natten", h < 12, " om formiddagen", h < 18, " om eftermiddagen", " om aftenen") FSET subst_ordinal(d) "." +FSET ordx(n) n + "." FSET subst_p(alt, d, t) iif(d==today()+1, "", "e") FSET zeropad(s, len) pad(s, "0", len) diff --git a/include/lang/de.rem b/include/lang/de.rem index 44dd2c9e..d25a9d5c 100644 --- a/include/lang/de.rem +++ b/include/lang/de.rem @@ -53,6 +53,7 @@ SET $Fromnow "von heute" FSET subst_ampm(h) iif(h<5, " nachts", h<12, " vormittags", h<=17, " nachmittags", " abends") FSET subst_ordinal(d) "." +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)) diff --git a/include/lang/fi.rem b/include/lang/fi.rem index 9ef0476e..01ddc2c4 100644 --- a/include/lang/fi.rem +++ b/include/lang/fi.rem @@ -54,6 +54,7 @@ SET $Mplu "a" FSET zeropad(s, len) pad(s, "0", len) FSET subst_ordinal(d) iif(d==1, ":senä", d==2, ":sena", (d%10)==2||(d%10)==3||(d%10)==6||(d%10)==8, ":ntena", ":ntenä") +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")) diff --git a/include/lang/fr.rem b/include/lang/fr.rem index 4817e14f..e95aa408 100644 --- a/include/lang/fr.rem +++ b/include/lang/fr.rem @@ -49,6 +49,7 @@ BANNER Rappels pour %w, %d%s %m, %y%o: # Ordinal for a day (English would be "st", "nd", "rd", "th") FSET subst_ordinal(d) iif(d == 1, "er", "") +FSET ordx(n) n + iif(n == 1, "er", "e") # "%d hours", "%d minutes", or "%d hours and %d minutes" FSET subst_tdiff(hdiff, mdiff) iif(hdiff==0&&mdiff==0, $Now, \ @@ -66,7 +67,6 @@ FSET subst_jx(alt, date, time) iif(alt, subst_j_alt(date), $On + " " + subst_j_a FSET subst_k_alt(date) wkday(date) + ", " + day(date) + subst_ordinal(day(date)) + " " + mon(date) FSET subst_kx(alt, date, time) iif(alt, subst_k_alt(date), $On + " " + subst_k_alt(date)) -FSET ordx(n) n + iif(n == 1, "er", "e") TRANSLATE "Missing ']'" "']' manquant" TRANSLATE "Missing quote" "Apostrophe manquant" diff --git a/include/lang/gr.rem b/include/lang/gr.rem index bacdbe01..78680c41 100644 --- a/include/lang/gr.rem +++ b/include/lang/gr.rem @@ -53,6 +53,7 @@ SET $Mplu "" FSET subst_bx(a, d, t) iif(d >= today(), "σε " + (d - today()) + " ημέρες", "πριν από " + (today()-d) + " ημέρες") FSET subst_ordinal(d) "." +FSET ordx(d) 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)) FSET subst_g_alt(d) wkday(d) + ", " + day(d) + ". " + mon(d) diff --git a/include/lang/no.rem b/include/lang/no.rem index 374bebbb..4efe94af 100644 --- a/include/lang/no.rem +++ b/include/lang/no.rem @@ -52,6 +52,7 @@ SET $Mplu "er" FSET subst_bx(a, d, t) iif(d >= today(), "om " + (d-today()) + " dager", "for " + (today()-d) + " dager siden") FSET subst_ordinal(d) "." +FSET ordx(n) n + "." FSET subst_ax(a, d, t) iif(a, subst_a_alt(d), $On + " " + subst_a_alt(d)) FSET subst_a_alt(d) wkday(d) + ", den " + day(d) + ". " + mon(d) + " " + year(d)