From 75c369e24e79f3fdeb5075a9fe64b670c22d5c31 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Wed, 19 May 2021 19:32:52 +0800 Subject: [PATCH] fix: typo --- src/main/frontend/components/settings.cljs | 2 +- src/main/frontend/context/i18n.cljs | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/frontend/components/settings.cljs b/src/main/frontend/components/settings.cljs index 8e4967bba6e..d2fd13c6c0a 100644 --- a/src/main/frontend/components/settings.cljs +++ b/src/main/frontend/components/settings.cljs @@ -287,7 +287,7 @@ "NOW/LATER" "TODO/DOING")])]]]] - (toggle "prefered_outdenting" + (toggle "preferred_outdenting" (ui/tippy {:html (outdenting-hint) :interactive true :theme "customized"} diff --git a/src/main/frontend/context/i18n.cljs b/src/main/frontend/context/i18n.cljs index c084b3067f1..3ba2096fd40 100644 --- a/src/main/frontend/context/i18n.cljs +++ b/src/main/frontend/context/i18n.cljs @@ -6,11 +6,11 @@ [frontend.state :as state])) ;; TODO -;; - [x] Get the prefered language from state -;; - [x] Update the prefered language -;; - [x] Create t functiona which takes a keyword and returns text with the current prefered language -;; - [x] Add fetch for local browser prefered language if user has set it already -;; - [ ] Fetch prefered language from backend if user is logged in +;; - [x] Get the preferred language from state +;; - [x] Update the preferred language +;; - [x] Create t functiona which takes a keyword and returns text with the current preferred language +;; - [x] Add fetch for local browser preferred language if user has set it already +;; - [ ] Fetch preferred language from backend if user is logged in (defn fetch-local-language [] (.. js/window -navigator -language)) @@ -18,14 +18,14 @@ (rum/defcontext *tongue-context*) (rum/defc tongue-provider [children] - (let [prefered-language (keyword (state/sub :preferred-language)) + (let [preferred-language (keyword (state/sub :preferred-language)) set-preferred-language state/set-preferred-language! all-dicts (deep-merge dicts/dicts shortcut-dict/dict) - t (partial (dicts/translate all-dicts) prefered-language)] - (if (nil? prefered-language) + t (partial (dicts/translate all-dicts) preferred-language)] + (if (nil? preferred-language) (set-preferred-language (fetch-local-language)) :ok) - (rum/bind-context [*tongue-context* [t prefered-language set-preferred-language]] + (rum/bind-context [*tongue-context* [t preferred-language set-preferred-language]] children))) (rum/defc use-tongue []