From 4b1bd3d1325b044258b1c4714fb2b4321200c0b7 Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Thu, 21 Feb 2019 15:36:50 +0100 Subject: [PATCH] :globe_with_meridians: Add translations of login/registration/... --- frontend/src/uxbox/main/locales/en.cljs | 28 ++++++++++++++++ frontend/src/uxbox/main/locales/fr.cljs | 32 +++++++++++++++++-- frontend/src/uxbox/main/ui/auth/login.cljs | 11 ++++--- frontend/src/uxbox/main/ui/auth/recovery.cljs | 7 ++-- .../uxbox/main/ui/auth/recovery_request.cljs | 7 ++-- frontend/src/uxbox/main/ui/auth/register.cljs | 19 +++++------ .../src/uxbox/main/ui/settings/profile.cljs | 26 +++++++-------- 7 files changed, 95 insertions(+), 35 deletions(-) diff --git a/frontend/src/uxbox/main/locales/en.cljs b/frontend/src/uxbox/main/locales/en.cljs index cdc1f9eae..d8a62fec5 100644 --- a/frontend/src/uxbox/main/locales/en.cljs +++ b/frontend/src/uxbox/main/locales/en.cljs @@ -89,13 +89,41 @@ "ds.user.notifications" "Notifications" "ds.user.exit" "Exit" + "auth.email-or-username" "Email or Username" + "auth.password" "Password" + "auth.signin" "Sign in" + "auth.forgot-password" "Forgot your password?" + "auth.no-account" "Don't have an account?" "auth.message.recovery-token-sent" "Password recovery link sent to your inbox." "auth.message.password-recovered" "Password successfully recovered." + "register.fullname.placeholder" "Full Name" + "register.username.placeholder" "Username" + "register.email.placeholder" "Email" + "register.password.placeholder" "Password" + "register.get-started" "Get started" + "register.already-have-account" "Already have an account?" + + "recovery-request.username-or-email.placeholder" "username or email address" + "recovery-request.recover-password" "Recover password" + "recovery-request.go-back" "Go back!" + + "recover.password.placeholder" "Password" + "recover.recover-password" "Recover password" + "recover.go-back" "Go back!" + "settings.profile" "PROFILE" "settings.password" "PASSWORD" "settings.notifications" "NOTIFICATIONS" "settings.profile-saved" "Profile saved successfully!" + "settings.name-username-email" "Name, username and email" + "settings.your-name" "Your name" + "settings.your-username" "Your username" + "settings.your-email" "Your email" + "settings.light-theme" "Light theme" + "settings.dark-theme" "Dark theme" + "settings.high-contrast-theme" "High-contrast theme" + "settings.your-avatar" "Your avatar" "settings.password-saved" "Password saved successfully!" "settings.wrong-old-password" "Wrong old password" "settings.change-password" "Change password" diff --git a/frontend/src/uxbox/main/locales/fr.cljs b/frontend/src/uxbox/main/locales/fr.cljs index 4ae63daa1..f61569d6a 100644 --- a/frontend/src/uxbox/main/locales/fr.cljs +++ b/frontend/src/uxbox/main/locales/fr.cljs @@ -89,13 +89,41 @@ "ds.user.notifications" "Notifications" "ds.user.exit" "Quitter" - "auth.message.recovery-token-sent" "Password recovery link sent to your inbox." - "auth.message.password-recovered" "Password successfully recovered." + "auth.email-or-username" "adresse email ou nom d'utilisateur" + "auth.password" "Mot de passe" + "auth.signin" "Se connecter" + "auth.forgot-password" "Mot de passe oublié ?" + "auth.no-account" "Vous n'avez pas de compte ?" + "auth.message.recovery-token-sent" "Lien de récupération de mot de passe envoyé." + "auth.message.password-recovered" "Mot de passe récupéré avec succès." + + "register.fullname.placeholder" "Nom complet" + "register.username.placeholder" "Nom d'utilisateur" + "register.email.placeholder" "Adresse email" + "register.password.placeholder" "Mot de passe" + "register.get-started" "Commencer" + "register.already-have-account" "Vous avez déjà un compte ?" + + "recovery-request.username-or-email.placeholder" "nom d'utilisateur ou adresse email" + "recovery-request.recover-password" "Récupérer le mot de passe" + "recovery-request.go-back" "Retour!" + + "recover.password.placeholder" "Mot de passe" + "recover.recover-password" "Récupérer le mot de passe" + "recover.go-back" "Retour!" "settings.profile" "PROFIL" "settings.password" "MOT DE PASSE" "settings.notifications" "NOTIFICATIONS" "settings.profile-saved" "Profil enregistré avec succès !" + "settings.name-username-email" "Nom, nom d'utilisateur et adresse email" + "settings.your-name" "Votre nom complet" + "settings.your-username" "Votre nom d'utilisateur" + "settings.your-email" "Votre adresse email" + "settings.light-theme" "Thème Jour" + "settings.dark-theme" "Thème Nuit" + "settings.high-contrast-theme" "Thème Contraste élevé" + "settings.your-avatar" "Votre avatar" "settings.password-saved" "Mot de passe enregistré avec succès !" "settings.wrong-old-password" "Ancien mot de passe incorrect" "settings.change-password" "Changement de mot de passe" diff --git a/frontend/src/uxbox/main/ui/auth/login.cljs b/frontend/src/uxbox/main/ui/auth/login.cljs index 4c05d84e1..ee1e69119 100644 --- a/frontend/src/uxbox/main/ui/auth/login.cljs +++ b/frontend/src/uxbox/main/ui/auth/login.cljs @@ -15,6 +15,7 @@ [uxbox.main.data.auth :as da] [uxbox.main.ui.messages :refer [messages-widget]] [uxbox.main.ui.navigation :as nav] + [uxbox.util.i18n :refer (tr)] [uxbox.util.dom :as dom] [uxbox.util.forms :as fm] [rumext.core :as mx :include-macros true] @@ -61,7 +62,7 @@ :ref "email" :value (:username data "") :on-change #(on-change % :username) - :placeholder "Email or Username" + :placeholder (tr "auth.email-or-username") :type "text"}] [:input.input-text {:name "password" @@ -69,22 +70,22 @@ :ref "password" :value (:password data "") :on-change #(on-change % :password) - :placeholder "Password" + :placeholder (tr "auth.password") :type "password"}] [:input.btn-primary {:name "login" :tab-index "4" :class (when-not valid? "btn-disabled") :disabled (not valid?) - :value "Sign in" + :value (tr "auth.signin") :type "submit"}] [:div.login-links [:a {:on-click #(st/emit! (rt/navigate :auth/recovery-request)) :tab-index "5"} - "Forgot your password?"] + (tr "auth.forgot-password")] [:a {:on-click #(st/emit! (rt/navigate :auth/register)) :tab-index "6"} - "Don't have an account?"]]]]))) + (tr "auth.no-account")]]]]))) (mx/defc login-page {:mixins [mx/static (fm/clear-mixin st/store :login)] diff --git a/frontend/src/uxbox/main/ui/auth/recovery.cljs b/frontend/src/uxbox/main/ui/auth/recovery.cljs index 601e41076..4c99ee248 100644 --- a/frontend/src/uxbox/main/ui/auth/recovery.cljs +++ b/frontend/src/uxbox/main/ui/auth/recovery.cljs @@ -14,6 +14,7 @@ [uxbox.main.data.auth :as uda] [uxbox.main.ui.messages :refer [messages-widget]] [uxbox.main.ui.navigation :as nav] + [uxbox.util.i18n :refer (tr)] [uxbox.util.dom :as dom] [uxbox.util.forms :as fm] [rumext.core :as mx :include-macros true] @@ -50,16 +51,16 @@ {:name "password" :value (:password data "") :on-change (partial on-change :password) - :placeholder "Password" + :placeholder (tr "recover.password.placeholder") :type "password"}] [:input.btn-primary {:name "login" :class (when-not valid? "btn-disabled") :disabled (not valid?) - :value "Recover password" + :value (tr "recover.recover-password") :type "submit"}] [:div.login-links - [:a {:on-click #(st/emit! (rt/navigate :auth/login))} "Go back!"]]]]))) + [:a {:on-click #(st/emit! (rt/navigate :auth/login))} (tr "recover.go-back")]]]]))) ;; --- Recovery Page diff --git a/frontend/src/uxbox/main/ui/auth/recovery_request.cljs b/frontend/src/uxbox/main/ui/auth/recovery_request.cljs index 1d36e913b..b6e29b66e 100644 --- a/frontend/src/uxbox/main/ui/auth/recovery_request.cljs +++ b/frontend/src/uxbox/main/ui/auth/recovery_request.cljs @@ -14,6 +14,7 @@ [uxbox.main.data.auth :as uda] [uxbox.main.ui.messages :refer [messages-widget]] [uxbox.main.ui.navigation :as nav] + [uxbox.util.i18n :refer (tr)] [uxbox.util.dom :as dom] [uxbox.util.forms :as fm] [rumext.core :as mx :include-macros true] @@ -47,16 +48,16 @@ {:name "username" :value (:username data "") :on-change on-change - :placeholder "username or email address" + :placeholder (tr "recovery-request.username-or-email.placeholder") :type "text"}] [:input.btn-primary {:name "login" :class (when-not valid? "btn-disabled") :disabled (not valid?) - :value "Recover password" + :value (tr "recovery-request.recover-password") :type "submit"}] [:div.login-links - [:a {:on-click #(st/emit! (rt/navigate :auth/login))} "Go back!"]]]]))) + [:a {:on-click #(st/emit! (rt/navigate :auth/login))} (tr "recovery-request.go-back")]]]]))) ;; --- Recovery Request Page diff --git a/frontend/src/uxbox/main/ui/auth/register.cljs b/frontend/src/uxbox/main/ui/auth/register.cljs index 08be0bf70..83a92efe7 100644 --- a/frontend/src/uxbox/main/ui/auth/register.cljs +++ b/frontend/src/uxbox/main/ui/auth/register.cljs @@ -14,6 +14,7 @@ [uxbox.main.data.auth :as uda] [uxbox.main.ui.messages :refer [messages-widget]] [uxbox.main.ui.navigation :as nav] + [uxbox.util.i18n :refer (tr)] [uxbox.util.dom :as dom] [uxbox.util.forms :as fm] [rumext.core :as mx :include-macros true] @@ -52,11 +53,11 @@ (on-error [{:keys [type code] :as payload}] (case code :uxbox.services.users/registration-disabled - (st/emit! "Registration is disabled") + (st/emit! (tr "errors.api.form.registration-disabled")) :uxbox.services.users/email-already-exists - (st/emit! (assoc-error :email "Email already exists")) + (st/emit! (assoc-error :email (tr "errors.api.form.email-already-exists")) :uxbox.services.users/username-already-exists - (st/emit! (assoc-error :username "Username already exists")))) + (st/emit! (assoc-error :username (tr "errors.api.form.username-already-exists")))) (on-submit [event] (dom/prevent-default event) (st/emit! (uda/register data on-error)))] @@ -67,7 +68,7 @@ :tab-index "2" :value (:fullname data "") :on-change (partial on-change :fullname) - :placeholder "Full Name" + :placeholder (tr "register.fullname.placeholder") :type "text"}] (fm/input-error errors :fullname) @@ -76,7 +77,7 @@ :tab-index "3" :value (:username data "") :on-change (partial on-change :username) - :placeholder "Username" + :placeholder (tr "register.username.placeholder") :type "text"}] (fm/input-error errors :username) @@ -86,7 +87,7 @@ :ref "email" :value (:email data "") :on-change (partial on-change :email) - :placeholder "Email" + :placeholder (tr "register.email.placeholder") :type "text"}] (fm/input-error errors :email) @@ -96,7 +97,7 @@ :ref "password" :value (:password data "") :on-change (partial on-change :password) - :placeholder "Password" + :placeholder (tr "register.password.placeholder") :type "password"}] (fm/input-error errors :password) @@ -105,10 +106,10 @@ :tab-index "6" :class (when-not valid? "btn-disabled") :disabled (not valid?) - :value "Get started" + :value (tr "register.get-started") :type "submit"}] [:div.login-links - [:a {:on-click #(st/emit! (rt/navigate :auth/login))} "Already have an account?"]]]]))) + [:a {:on-click #(st/emit! (rt/navigate :auth/login))} (tr "register.already-have-account")]]]]))) ;; --- Register Page diff --git a/frontend/src/uxbox/main/ui/settings/profile.cljs b/frontend/src/uxbox/main/ui/settings/profile.cljs index 0d0126ebe..46454231a 100644 --- a/frontend/src/uxbox/main/ui/settings/profile.cljs +++ b/frontend/src/uxbox/main/ui/settings/profile.cljs @@ -61,37 +61,37 @@ (on-error [{:keys [code] :as payload}] (case code :uxbox.services.users/registration-disabled - (st/emit! "Registration is disabled") + (st/emit! (tr "errors.api.form.registration-disabled")) :uxbox.services.users/email-already-exists - (st/emit! (assoc-error :email "Email already exists")) + (st/emit! (assoc-error :email (tr "errors.api.form.email-already-exists"))) :uxbox.services.users/username-already-exists - (st/emit! (assoc-error :username "Username already exists")))) + (st/emit! (assoc-error :username (tr "errors.api.form.username-already-exists"))))) (on-success [_] (st/emit! (clear-form))) (on-submit [event] (st/emit! (udu/update-profile data on-success on-error)))] [:form.profile-form - [:span.user-settings-label "Name, username and email"] + [:span.user-settings-label (tr "settings.name-username-email")] [:input.input-text {:type "text" :on-change (partial on-change :fullname) :value (:fullname data "") - :placeholder "Your name"}] + :placeholder (tr "settings.your-name")}] [:input.input-text {:type "text" :on-change (partial on-change :username) :value (:username data "") - :placeholder "Your username"}] + :placeholder (tr "settings.your-username")}] (fm/input-error errors :username) [:input.input-text {:type "email" :on-change (partial on-change :email) :value (:email data "") - :placeholder "Your email"}] + :placeholder (tr "settings.your-email")}] (fm/input-error errors :email) - #_[:span.user-settings-label "Choose a color theme"] + #_[:span.user-settings-label (tr "settings.choose-color-theme")] #_[:div.input-radio.radio-primary [:input {:type "radio" :checked (when (= theme "light") "checked") @@ -99,7 +99,7 @@ :id "light-theme" :name "theme" :value "light"}] - [:label {:for "light-theme"} "Light theme"] + [:label {:for "light-theme"} (tr "settings.light-theme")] [:input {:type "radio" :checked (when (= theme "dark") "checked") @@ -107,7 +107,7 @@ :id "dark-theme" :name "theme" :value "dark"}] - [:label {:for "dark-theme"} "Dark theme"] + [:label {:for "dark-theme"} (tr "settings.dark-theme")] [:input {:type "radio" :checked (when (= theme "high-contrast") "checked") @@ -115,14 +115,14 @@ :id "high-contrast-theme" :name "theme" :value "high-contrast"}] - [:label {:for "high-contrast-theme"} "High-contrast theme"]] + [:label {:for "high-contrast-theme"} (tr "settings.high-contrast-theme")]] [:input.btn-primary {:type "button" :class (when-not valid? "btn-disabled") :disabled (not valid?) :on-click on-submit - :value "Update settings"}]]))) + :value (tr "settings.update-settings")}]]))) ;; --- Profile Photo Form @@ -156,6 +156,6 @@ (header) [:section.dashboard-content.user-settings [:section.user-settings-content - [:span.user-settings-label "Your avatar"] + [:span.user-settings-label (tr "settings.your-avatar")] (profile-photo-form) (profile-form)]]])