From 9bc18b4f3ded36575a27a82bb6cf5d92d71c0b81 Mon Sep 17 00:00:00 2001 From: OowhitecatoO Date: Thu, 19 Nov 2026 23:35:08 +0800 Subject: [PATCH] :bug: Fix missing date locales and stale dates after switching language (#13158) * :bug: Fix Chinese locale for dates and relative times * :bug: Add missing Hindi and Serbian date locales * :bug: Reset date locale to English for languages without one --------- Co-authored-by: Eva Marco --- common/src/app/common/time.cljc | 12 +++++++++--- common/test/common_tests/time_test.cljc | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/common/src/app/common/time.cljc b/common/src/app/common/time.cljc index 35ae519809..9e344b178d 100644 --- a/common/src/app/common/time.cljc +++ b/common/src/app/common/time.cljc @@ -31,6 +31,7 @@ ["date-fns/locale/fr-CA$default" :as dfn-fr-ca] ["date-fns/locale/gl$default" :as dfn-gl] ["date-fns/locale/he$default" :as dfn-he] + ["date-fns/locale/hi$default" :as dfn-hi] ["date-fns/locale/hr$default" :as dfn-hr] ["date-fns/locale/id$default" :as dfn-id] ["date-fns/locale/it$default" :as dfn-it] @@ -44,9 +45,11 @@ ["date-fns/locale/pt-BR$default" :as dfn-pt-br] ["date-fns/locale/ro$default" :as dfn-ro] ["date-fns/locale/ru$default" :as dfn-ru] + ["date-fns/locale/sr$default" :as dfn-sr] ["date-fns/locale/tr$default" :as dfn-tr] ["date-fns/locale/uk$default" :as dfn-uk] - ["date-fns/locale/zh-CN$default" :as dfn-zh-cn]]) + ["date-fns/locale/zh-CN$default" :as dfn-zh-cn] + ["date-fns/locale/zh-TW$default" :as dfn-zh-tw]]) [app.common.schema :as sm] [app.common.schema.generators :as sg] [app.common.schema.openapi :as-alias oapi] @@ -289,13 +292,16 @@ :fr dfn-fr :fr_ca dfn-fr-ca :he dfn-he + :hi dfn-hi :pt dfn-pt :pt_pt dfn-pt :pt_br dfn-pt-br :ro dfn-ro :ru dfn-ru + :sr dfn-sr :tr dfn-tr - :zh-cn dfn-zh-cn + :zh_cn dfn-zh-cn + :zh_hant dfn-zh-tw :nl dfn-nl :eu dfn-eu :gl dfn-gl @@ -403,7 +409,7 @@ #?(:cljs (defn set-default-locale [locale] - (when-let [locale (unchecked-get locales locale)] + (let [locale (or (unchecked-get locales locale) df-en-us)] (dfn-set-default-options #js {:locale locale})))) ;; --- HELPERS diff --git a/common/test/common_tests/time_test.cljc b/common/test/common_tests/time_test.cljc index 9b2c73a82b..74ae223790 100644 --- a/common/test/common_tests/time_test.cljc +++ b/common/test/common_tests/time_test.cljc @@ -6,6 +6,7 @@ (ns common-tests.time-test (:require + #?(:cljs ["date-fns/getDefaultOptions$default" :as dfn-get-default-options]) [app.common.time :as dt] [clojure.test :as t])) @@ -15,6 +16,23 @@ (t/is (false? (dt/is-after? dta dtb))) (t/is (true? (dt/is-before? dta dtb))))) +#?(:cljs + (t/deftest chinese-date-locales-test + (t/is (= "zh-CN" (some-> (unchecked-get dt/locales "zh_cn") .-code))) + (t/is (= "zh-TW" (some-> (unchecked-get dt/locales "zh_hant") .-code))))) + +#?(:cljs + (t/deftest hindi-and-serbian-date-locales-test + (t/is (= "hi" (some-> (unchecked-get dt/locales "hi") .-code))) + (t/is (= "sr" (some-> (unchecked-get dt/locales "sr") .-code))))) + +#?(:cljs + (t/deftest unmapped-locale-resets-date-locale-test + (dt/set-default-locale "ja") + (dt/set-default-locale "ha") + (t/is (= "en-US" (.-code (.-locale (dfn-get-default-options))))) + (dt/set-default-locale "en"))) + #?(:clj (t/deftest parse-duration-test (t/is (dt/duration? (dt/parse-duration "10m")))