diff --git a/VERSION b/VERSION index 42cf067..f2380cc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.15.2 +1.15.3 diff --git a/VERSIONS.md b/VERSIONS.md index 470fe10..b900ef4 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -17,6 +17,7 @@ Git tags: `vMAJOR.FEATURE.FIX` (e.g. `v1.8.0`). File `VERSION` omits the `v` pre | Tag | Date (UTC) | Notes | |-----|------------|--------| +| **v1.15.3** | 2026-07-19 | **Bugfix:** console language auto-**fr** for `*lefrancpaysan*` domains again — env `TALER_MON_LANG=en` no longer locks English; only `--lang` / `TALER_MON_LANG_SET=1` is explicit. | | **v1.15.2** | 2026-07-19 | **Bugfix:** warn/error filter — drop blank log lines from HTML; compact console (no black voids above/mid/below); context skips SUMMARY chrome & pure box frames; tighter filter-gap. | | **v1.15.1** | 2026-07-19 | **Bugfix:** mon HTML — phase `section()` boxes no longer painted as SUMMARY (were blue/green `sum-header`); only real SUMMARY rows get solid severity backgrounds (OK/WARN/ERROR/INFO). | | **v1.15.0** | 2026-07-19 | **Feature:** CHF **fake-incoming amount ladder** in `devtesting` (`DEVTESTING_LADDER=1`, default **23** log-spaced rungs **CHF:0.01 → CHF:50000**); synthetic geniban debit funds each rung; baseline plumbing probe kept. | diff --git a/i18n.sh b/i18n.sh index 5ca1d18..1b0c90d 100644 --- a/i18n.sh +++ b/i18n.sh @@ -1,23 +1,29 @@ #!/usr/bin/env bash # i18n.sh — language for taler-monitoring console + HTML chrome # -# TALER_MON_LANG=en|fr (default en) -# Auto: domains *lefrancpaysan* → fr unless TALER_MON_LANG is set explicitly. +# TALER_MON_LANG=en|fr +# TALER_MON_LANG_SET=1 → language is explicit (--lang or host-agent wrapper); do not override. +# Auto (SET≠1): domain *lefrancpaysan* / *francpaysan* → fr, else keep env or en. +# +# Important: a bare TALER_MON_LANG=en in ~/.config/taler-monitoring/env must NOT lock +# language for FP domains (that used to force English on stage.monnaie…). : "${TALER_MON_LANG:=}" : "${TALER_MON_LANG_SET:=0}" i18n_init() { - if [ -n "${TALER_MON_LANG:-}" ]; then - TALER_MON_LANG_SET=1 - fi - if [ "${TALER_MON_LANG_SET}" != "1" ]; then + # Only TALER_MON_LANG_SET=1 is "explicit". Do not promote non-empty TALER_MON_LANG + # to SET=1 — env files often ship LANG=en for the default GOA workstation. + if [ "${TALER_MON_LANG_SET:-0}" != "1" ]; then case "${TALER_DOMAIN:-}" in *lefrancpaysan*|*francpaysan*) TALER_MON_LANG=fr ;; *) - TALER_MON_LANG=en + # Non-FP: keep pre-set env value if any, else English + if [ -z "${TALER_MON_LANG:-}" ]; then + TALER_MON_LANG=en + fi ;; esac fi @@ -26,6 +32,7 @@ i18n_init() { *) TALER_MON_LANG=en ;; esac export TALER_MON_LANG + export TALER_MON_LANG_SET } i18n_tag() {