More work on making run-time language module match compile-time module.

This commit is contained in:
Dianne Skoll
2022-03-23 11:47:00 -04:00
parent 0653b9420a
commit 4fdf7b706b
3 changed files with 13 additions and 7 deletions
+4 -4
View File
@@ -52,8 +52,8 @@ FSET subst_1(alt, date, time) iif(time == now(), "maintenant", \
"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))
FSET subst_j_alt(date) iif(date==today(), $Today, date==today()+1, $Tomorrow, wkday(date) + ", " + day(date) + subst_ordinal(day(date)) + " " + mon(date) + ", " + year(date))
FSET subst_j(alt, date, time) iif(date==today(), $Today, date==today()+1, $Tomorrow, alt, subst_j_alt(date), $On + " " + subst_j_alt(date))
FSET subst_k_alt(date) wkday(date) + ", " + day(date) + subst_ordinal(day(date)) + " " + mon(date)
FSET subst_k(alt, date, time) iif(alt, subst_k_alt(date), $On + " " + subst_k_alt(date))
FSET subst_k_alt(date) iif(date==today(), $Today, date==today()+1, $Tomorrow, wkday(date) + ", " + day(date) + subst_ordinal(day(date)) + " " + mon(date))
FSET subst_k(alt, date, time) iif(date==today(), $Today, date==today()+1, $Tomorrow, alt, subst_k_alt(date), $On + " " + subst_k_alt(date))