🌐 History, icons and messages i18n

Signed-off-by: mathieu.brunot <mathieu.brunot@monogramm.io>
This commit is contained in:
mathieu.brunot 2019-08-10 21:55:56 +02:00
parent 1d5bfd33d4
commit 5c12bd988d
No known key found for this signature in database
GPG key ID: 81584BEAF692D7E0
5 changed files with 30 additions and 18 deletions

View file

@ -78,19 +78,23 @@
"ds.height" "Height" "ds.height" "Height"
"ds.go" "Go go go!" "ds.go" "Go go go!"
"ds.accept" "Accept"
"ds.cancel" "Cancel"
"ds.icons" "Icons"
"ds.element-options" "Element options" "ds.element-options" "Element options"
"ds.draw-tools" "Draw tools" "ds.draw-tools" "Draw tools"
"ds.sitemap" "Sitemap" "ds.sitemap" "Sitemap"
"ds.layers" "Layers" "ds.layers" "Layers"
"ds.document-history" "Document history" "ds.document-history" "Document history"
"ds.project.placeholder" "New project name"
"ds.project.new" "New project"
"ds.page.placeholder" "Page name" "ds.page.placeholder" "Page name"
"ds.page.new" "New page" "ds.page.new" "New page"
"ds.page.edit" "Edit page" "ds.page.edit" "Edit page"
"ds.history-versions" "History"
"ds.pinned-version" "Pinned"
"ds.help.rect" "Box (Ctrl + B)" "ds.help.rect" "Box (Ctrl + B)"
"ds.help.circle" "Circle (Ctrl + E)" "ds.help.circle" "Circle (Ctrl + E)"
"ds.help.line" "Line (Ctrl + L)" "ds.help.line" "Line (Ctrl + L)"
@ -162,6 +166,7 @@
"settings.update-settings" "Update settings" "settings.update-settings" "Update settings"
"history.alert-message" "You are seeing version %s" "history.alert-message" "You are seeing version %s"
"errors.api.form.old-password-not-match" "Incorrect old password" "errors.api.form.old-password-not-match" "Incorrect old password"
"errors.api.form.registration-disabled" "The registration is currently disabled." "errors.api.form.registration-disabled" "The registration is currently disabled."
"errors.api.form.email-already-exists" "The email is already in use by another user." "errors.api.form.email-already-exists" "The email is already in use by another user."

View file

@ -78,18 +78,22 @@
"ds.height" "Hauteur" "ds.height" "Hauteur"
"ds.go" "Go go go!" "ds.go" "Go go go!"
"ds.accept" "Accepter"
"ds.cancel" "Annuler"
"ds.icons" "Icônes"
"ds.element-options" "Options d'élément" "ds.element-options" "Options d'élément"
"ds.draw-tools" "Outils de dessin" "ds.draw-tools" "Outils de dessin"
"ds.sitemap" "Plan du site" "ds.sitemap" "Plan du site"
"ds.layers" "Couches" "ds.layers" "Couches"
"ds.document-history" "Historique du document" "ds.document-history" "Historique du document"
"ds.project.placeholder" "New project name" "ds.page.placeholder" "Nom de la page"
"ds.project.new" "New project" "ds.page.new" "Nouvelle page"
"ds.page.edit" "Éditer la page"
"ds.page.placeholder" "Page name" "ds.history-versions" "Historique"
"ds.page.new" "New page" "ds.pinned-version" "Épinglés"
"ds.page.edit" "Edit page"
"ds.help.rect" "Boîte (Ctrl + B)" "ds.help.rect" "Boîte (Ctrl + B)"
"ds.help.circle" "Cercle (Ctrl + E)" "ds.help.circle" "Cercle (Ctrl + E)"
@ -162,6 +166,7 @@
"settings.update-settings" "Mettre à jour les paramètres" "settings.update-settings" "Mettre à jour les paramètres"
"history.alert-message" "Vous voyez la version %s" "history.alert-message" "Vous voyez la version %s"
"errors.api.form.old-password-not-match" "Ancien mot de passe incorrect" "errors.api.form.old-password-not-match" "Ancien mot de passe incorrect"
"errors.api.form.registration-disabled" "L'enregistrement est actuellement désactivé." "errors.api.form.registration-disabled" "L'enregistrement est actuellement désactivé."
"errors.api.form.email-already-exists" "L'email est déjà utilisé par un autre utilisateur." "errors.api.form.email-already-exists" "L'email est déjà utilisé par un autre utilisateur."
@ -184,4 +189,4 @@
"errors.generic" "Quelque chose c'est mal passé." "errors.generic" "Quelque chose c'est mal passé."
"errors.conflict" "Conflit sur la sauvegarde des données, actualisez et réessayez." "errors.conflict" "Conflit sur la sauvegarde des données, actualisez et réessayez."
}) })

View file

@ -108,10 +108,10 @@
[:ul.history-tabs {} [:ul.history-tabs {}
[:li {:on-click show-main [:li {:on-click show-main
:class (when main? "selected")} :class (when main? "selected")}
"History"] (tr "ds.history-versions")]
[:li {:on-click show-pinned [:li {:on-click show-pinned
:class (when pinned? "selected")} :class (when pinned? "selected")}
"Pinned"]] (tr "ds.pinned-version")]]
(if (= section :pinned) (if (= section :pinned)
(history-pinned-list history) (history-pinned-list history)
(history-list history))]]))) (history-list history))]])))
@ -131,5 +131,5 @@
{:class (when (:deselecting history) "hide-message")} {:class (when (:deselecting history) "hide-message")}
[:span {} (tr "history.alert-message" (or version "00")) [:span {} (tr "history.alert-message" (or version "00"))
[:div.message-action {} [:div.message-action {}
[:a.btn-transparent {:on-click on-accept} "Accept"] [:a.btn-transparent {:on-click on-accept} (tr "ds.accept")]
[:a.btn-transparent {:on-click on-cancel} "Cancel"]]]])))) [:a.btn-transparent {:on-click on-cancel} (tr "ds.cancel")]]]]))))

View file

@ -19,7 +19,8 @@
[uxbox.builtins.icons :as i] [uxbox.builtins.icons :as i]
[rumext.core :as mx :include-macros true] [rumext.core :as mx :include-macros true]
[uxbox.util.dom :as dom] [uxbox.util.dom :as dom]
[uxbox.util.data :refer (read-string)])) [uxbox.util.data :refer (read-string)]
[uxbox.util.i18n :refer [tr]]))
;; --- Refs ;; --- Refs
@ -70,7 +71,7 @@
[:div#form-figures.tool-window [:div#form-figures.tool-window
[:div.tool-window-bar [:div.tool-window-bar
[:div.tool-window-icon i/icon-set] [:div.tool-window-icon i/icon-set]
[:span "Icons"] [:span (tr "ds.icons")]
[:div.tool-window-close {:on-click on-close} i/close]] [:div.tool-window-close {:on-click on-close} i/close]]
[:div.tool-window-content [:div.tool-window-content
[:div.figures-catalog [:div.figures-catalog

View file

@ -14,7 +14,8 @@
[uxbox.util.timers :as ts] [uxbox.util.timers :as ts]
[rumext.core :as mx :include-macros true] [rumext.core :as mx :include-macros true]
[uxbox.util.data :refer [classnames]] [uxbox.util.data :refer [classnames]]
[uxbox.util.dom :as dom])) [uxbox.util.dom :as dom]
[uxbox.util.i18n :refer [tr]]))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Data Events ;; Data Events
@ -135,10 +136,10 @@
[:div.message-action [:div.message-action
[:a.btn-transparent.btn-small [:a.btn-transparent.btn-small
{:on-click accept} {:on-click accept}
"Accept"] (tr "ds.accept")]
[:a.btn-transparent.btn-small [:a.btn-transparent.btn-small
{:on-click cancel} {:on-click cancel}
"Cancel"]]]]))) (tr "ds.cancel")]]]])))
;; --- Main Component (entry point) ;; --- Main Component (entry point)