From 5858f3f180a4466cc37955fe55d46af0a3a4f2d4 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 11 Feb 2021 13:36:46 +0100 Subject: [PATCH 01/90] :sparkles: Improve auth module. --- backend/src/app/http.clj | 4 - backend/src/app/http/auth.clj | 31 ----- backend/src/app/http/auth/github.clj | 120 ++++++++--------- backend/src/app/http/auth/gitlab.clj | 126 ++++++++---------- backend/src/app/http/auth/google.clj | 29 ++-- backend/src/app/http/auth/ldap.clj | 11 +- backend/src/app/http/session.clj | 41 ++++-- backend/src/app/rpc/mutations/profile.clj | 34 ++--- .../src/app/rpc/mutations/verify_token.clj | 20 +-- .../tests/app/tests/test_services_profile.clj | 91 +++++++++++++ frontend/src/app/main/repo.cljs | 12 -- frontend/src/app/main/ui/auth/login.cljs | 4 +- 12 files changed, 269 insertions(+), 254 deletions(-) delete mode 100644 backend/src/app/http/auth.clj diff --git a/backend/src/app/http.clj b/backend/src/app/http.clj index ab267e36b..ffe534971 100644 --- a/backend/src/app/http.clj +++ b/backend/src/app/http.clj @@ -12,7 +12,6 @@ [app.common.data :as d] [app.common.spec :as us] [app.config :as cfg] - [app.http.auth :as auth] [app.http.errors :as errors] [app.http.middleware :as middleware] [app.metrics :as mtx] @@ -147,9 +146,6 @@ ["/github" {:post (:auth-handler github-auth)}] ["/github/callback" {:get (:callback-handler github-auth)}]] - ["/login" {:post #(auth/login-handler cfg %)}] - ["/logout" {:post #(auth/logout-handler cfg %)}] - ["/login-ldap" {:post ldap-auth}] ["/rpc" {:middleware [(:middleware session)]} diff --git a/backend/src/app/http/auth.clj b/backend/src/app/http/auth.clj deleted file mode 100644 index 4dec0d3b4..000000000 --- a/backend/src/app/http/auth.clj +++ /dev/null @@ -1,31 +0,0 @@ -;; This Source Code Form is subject to the terms of the Mozilla Public -;; License, v. 2.0. If a copy of the MPL was not distributed with this -;; file, You can obtain one at http://mozilla.org/MPL/2.0/. -;; -;; This Source Code Form is "Incompatible With Secondary Licenses", as -;; defined by the Mozilla Public License, v. 2.0. -;; -;; Copyright (c) 2020 UXBOX Labs SL - -(ns app.http.auth - (:require - [app.http.session :as session])) - -(defn login-handler - [{:keys [session rpc] :as cfg} request] - (let [data (:params request) - uagent (get-in request [:headers "user-agent"]) - method (get-in rpc [:methods :mutation :login]) - profile (method data) - id (session/create! session {:profile-id (:id profile) - :user-agent uagent})] - {:status 200 - :cookies (session/cookies session {:value id}) - :body profile})) - -(defn logout-handler - [{:keys [session] :as cfg} request] - (session/delete! cfg request) - {:status 204 - :cookies (session/cookies session {:value "" :max-age -1}) - :body ""}) diff --git a/backend/src/app/http/auth/github.clj b/backend/src/app/http/auth/github.clj index 83d38136c..c01200126 100644 --- a/backend/src/app/http/auth/github.clj +++ b/backend/src/app/http/auth/github.clj @@ -12,7 +12,6 @@ [app.common.exceptions :as ex] [app.common.spec :as us] [app.config :as cfg] - [app.http.session :as session] [app.util.http :as http] [app.util.time :as dt] [clojure.data.json :as json] @@ -38,7 +37,6 @@ (def scope "user:email") - (defn- build-redirect-url [cfg] (let [public (u/uri (:public-uri cfg))] @@ -46,57 +44,47 @@ (defn- get-access-token [cfg state code] - (let [params {:client_id (:client-id cfg) - :client_secret (:client-secret cfg) - :code code - :state state - :redirect_uri (build-redirect-url cfg)} - req {:method :post - :headers {"content-type" "application/x-www-form-urlencoded" - "accept" "application/json"} - :uri (str token-url) - :body (u/map->query-string params)} - res (http/send! req)] + (try + (let [params {:client_id (:client-id cfg) + :client_secret (:client-secret cfg) + :code code + :state state + :redirect_uri (build-redirect-url cfg)} + req {:method :post + :headers {"content-type" "application/x-www-form-urlencoded" + "accept" "application/json"} + :uri (str token-url) + :timeout 6000 + :body (u/map->query-string params)} + res (http/send! req)] - (when (not= 200 (:status res)) - (ex/raise :type :internal - :code :invalid-response-from-github - :context {:status (:status res) - :body (:body res)})) - (try - (let [data (json/read-str (:body res))] - (get data "access_token")) - (catch Throwable e - (log/error "unexpected error on parsing response body from github access token request" e) - nil)))) + (when (= 200 (:status res)) + (-> (json/read-str (:body res)) + (get "access_token")))) + + (catch Exception e + (log/error e "unexpected error on get-access-token") + nil))) (defn- get-user-info [token] - (let [req {:uri (str user-info-url) - :headers {"authorization" (str "token " token)} - :method :get} - res (http/send! req)] - - (when (not= 200 (:status res)) - (ex/raise :type :internal - :code :invalid-response-from-github - :context {:status (:status res) - :body (:body res)})) - - (try - (let [data (json/read-str (:body res))] - {:email (get data "email") - :fullname (get data "name")}) - (catch Throwable e - (log/error "unexpected error on parsing response body from github access token request" e) - nil)))) + (try + (let [req {:uri (str user-info-url) + :headers {"authorization" (str "token " token)} + :timeout 6000 + :method :get} + res (http/send! req)] + (when (= 200 (:status res)) + (let [data (json/read-str (:body res))] + {:email (get data "email") + :fullname (get data "name")}))) + (catch Exception e + (log/error e "unexpected exception on get-user-info") + nil))) (defn auth [{:keys [tokens] :as cfg} _request] - (let [state (tokens :generate - {:iss :github-oauth - :exp (dt/in-future "15m")}) - + (let [state (tokens :generate {:iss :github-oauth :exp (dt/in-future "15m")}) params {:client_id (:client-id cfg/config) :redirect_uri (build-redirect-url cfg) :state state @@ -109,37 +97,37 @@ (defn callback [{:keys [tokens rpc session] :as cfg} request] - (let [state (get-in request [:params :state]) - _ (tokens :verify {:token state :iss :github-oauth}) - info (some->> (get-in request [:params :code]) - (get-access-token cfg state) - (get-user-info))] + (try + (let [state (get-in request [:params :state]) + _ (tokens :verify {:token state :iss :github-oauth}) + info (some->> (get-in request [:params :code]) + (get-access-token cfg state) + (get-user-info)) - (when-not info - (ex/raise :type :authentication - :code :unable-to-authenticate-with-github)) + _ (when-not info + (ex/raise :type :internal + :code :unable-to-auth)) - (let [method-fn (get-in rpc [:methods :mutation :login-or-register]) + method-fn (get-in rpc [:methods :mutation :login-or-register]) profile (method-fn {:email (:email info) :fullname (:fullname info)}) - uagent (get-in request [:headers "user-agent"]) - token (tokens :generate {:iss :auth :exp (dt/in-future "15m") :profile-id (:id profile)}) - uri (-> (u/uri (:public-uri cfg/config)) (assoc :path "/#/auth/verify-token") (assoc :query (u/map->query-string {:token token}))) - - sid (session/create! session {:profile-id (:id profile) - :user-agent uagent})] - - {:status 302 - :headers {"location" (str uri)} - :cookies (session/cookies session/cookies {:value sid}) - :body ""}))) + sxf ((:create session) (:id profile)) + rsp {:status 302 :headers {"location" (str uri)} :body ""}] + (sxf request rsp)) + (catch Exception _e + (let [uri (-> (u/uri (:public-uri cfg)) + (assoc :path "/#/auth/login") + (assoc :query (u/map->query-string {:error "unable-to-auth"})))] + {:status 302 + :headers {"location" (str uri)} + :body ""})))) ;; --- ENTRY POINT diff --git a/backend/src/app/http/auth/gitlab.clj b/backend/src/app/http/auth/gitlab.clj index 6aeb64e71..5e78f1071 100644 --- a/backend/src/app/http/auth/gitlab.clj +++ b/backend/src/app/http/auth/gitlab.clj @@ -12,88 +12,75 @@ [app.common.data :as d] [app.common.exceptions :as ex] [app.common.spec :as us] - [app.http.session :as session] [app.util.http :as http] [app.util.time :as dt] [clojure.data.json :as json] [clojure.spec.alpha :as s] [clojure.tools.logging :as log] [integrant.core :as ig] - [lambdaisland.uri :as uri])) + [lambdaisland.uri :as u])) (def scope "read_user") (defn- build-redirect-url [cfg] - (let [public (uri/uri (:public-uri cfg))] + (let [public (u/uri (:public-uri cfg))] (str (assoc public :path "/api/oauth/gitlab/callback")))) - (defn- build-oauth-uri [cfg] - (let [base-uri (uri/uri (:base-uri cfg))] + (let [base-uri (u/uri (:base-uri cfg))] (assoc base-uri :path "/oauth/authorize"))) - (defn- build-token-url [cfg] - (let [base-uri (uri/uri (:base-uri cfg))] + (let [base-uri (u/uri (:base-uri cfg))] (str (assoc base-uri :path "/oauth/token")))) - (defn- build-user-info-url [cfg] - (let [base-uri (uri/uri (:base-uri cfg))] + (let [base-uri (u/uri (:base-uri cfg))] (str (assoc base-uri :path "/api/v4/user")))) (defn- get-access-token [cfg code] - (let [params {:client_id (:client-id cfg) - :client_secret (:client-secret cfg) - :code code - :grant_type "authorization_code" - :redirect_uri (build-redirect-url cfg)} - req {:method :post - :headers {"content-type" "application/x-www-form-urlencoded"} - :uri (build-token-url cfg) - :body (uri/map->query-string params)} + (try + (let [params {:client_id (:client-id cfg) + :client_secret (:client-secret cfg) + :code code + :grant_type "authorization_code" + :redirect_uri (build-redirect-url cfg)} + req {:method :post + :headers {"content-type" "application/x-www-form-urlencoded"} + :uri (build-token-url cfg) + :body (u/map->query-string params)} res (http/send! req)] - (when (not= 200 (:status res)) - (ex/raise :type :internal - :code :invalid-response-from-gitlab - :context {:status (:status res) - :body (:body res)})) - - (try - (let [data (json/read-str (:body res))] - (get data "access_token")) - (catch Throwable e - (log/error "unexpected error on parsing response body from gitlab access token request" e) - nil)))) + (when (= 200 (:status res)) + (-> (json/read-str (:body res)) + (get "access_token")))) + (catch Exception e + (log/error e "unexpected error on get-access-token") + nil))) (defn- get-user-info [cfg token] - (let [req {:uri (build-user-info-url cfg) - :headers {"Authorization" (str "Bearer " token)} - :method :get} - res (http/send! req)] + (try + (let [req {:uri (build-user-info-url cfg) + :headers {"Authorization" (str "Bearer " token)} + :timeout 6000 + :method :get} + res (http/send! req)] - (when (not= 200 (:status res)) - (ex/raise :type :internal - :code :invalid-response-from-gitlab - :context {:status (:status res) - :body (:body res)})) + (when (= 200 (:status res)) + (let [data (json/read-str (:body res))] + {:email (get data "email") + :fullname (get data "name")}))) - (try - (let [data (json/read-str (:body res))] - ;; (clojure.pprint/pprint data) - {:email (get data "email") - :fullname (get data "name")}) - (catch Throwable e - (log/error "unexpected error on parsing response body from gitlab access token request" e) - nil)))) + (catch Exception e + (log/error e "unexpected exception on get-user-info") + nil))) (defn auth [{:keys [tokens] :as cfg} _request] @@ -105,7 +92,7 @@ :response_type "code" :state token :scope scope} - query (uri/map->query-string params) + query (u/map->query-string params) uri (-> (build-oauth-uri cfg) (assoc :query query))] {:status 200 @@ -113,36 +100,37 @@ (defn callback [{:keys [tokens rpc session] :as cfg} request] - (let [token (get-in request [:params :state]) - _ (tokens :verify {:token token :iss :gitlab-oauth}) - info (some->> (get-in request [:params :code]) - (get-access-token cfg) - (get-user-info cfg))] + (try + (let [token (get-in request [:params :state]) + _ (tokens :verify {:token token :iss :gitlab-oauth}) + info (some->> (get-in request [:params :code]) + (get-access-token cfg) + (get-user-info cfg)) + _ (when-not info + (ex/raise :type :internal + :code :unable-to-auth)) - (when-not info - (ex/raise :type :authentication - :code :unable-to-authenticate-with-gitlab)) - - (let [method-fn (get-in rpc [:methods :mutation :login-or-register]) + method-fn (get-in rpc [:methods :mutation :login-or-register]) profile (method-fn {:email (:email info) :fullname (:fullname info)}) - uagent (get-in request [:headers "user-agent"]) - token (tokens :generate {:iss :auth :exp (dt/in-future "15m") :profile-id (:id profile)}) - uri (-> (uri/uri (:public-uri cfg)) + uri (-> (u/uri (:public-uri cfg)) (assoc :path "/#/auth/verify-token") - (assoc :query (uri/map->query-string {:token token}))) - - sid (session/create! session {:profile-id (:id profile) - :user-agent uagent})] - {:status 302 - :headers {"location" (str uri)} - :cookies (session/cookies session {:value sid}) - :body ""}))) + (assoc :query (u/map->query-string {:token token}))) + sxf ((:create session) (:id profile)) + rsp {:status 302 :headers {"location" (str uri)} :body ""}] + (sxf request rsp)) + (catch Exception _e + (let [uri (-> (u/uri (:public-uri cfg)) + (assoc :path "/#/auth/login") + (assoc :query (u/map->query-string {:error "unable-to-auth"})))] + {:status 302 + :headers {"location" (str uri)} + :body ""})))) (s/def ::client-id ::us/not-empty-string) (s/def ::client-secret ::us/not-empty-string) diff --git a/backend/src/app/http/auth/google.clj b/backend/src/app/http/auth/google.clj index a615ddd80..12a2d7034 100644 --- a/backend/src/app/http/auth/google.clj +++ b/backend/src/app/http/auth/google.clj @@ -11,14 +11,13 @@ (:require [app.common.exceptions :as ex] [app.common.spec :as us] - [app.http.session :as session] [app.util.http :as http] [app.util.time :as dt] [clojure.data.json :as json] [clojure.spec.alpha :as s] [clojure.tools.logging :as log] [integrant.core :as ig] - [lambdaisland.uri :as uri])) + [lambdaisland.uri :as u])) (def base-goauth-uri "https://accounts.google.com/o/oauth2/v2/auth") @@ -30,7 +29,7 @@ (defn- build-redirect-url [cfg] - (let [public (uri/uri (:public-uri cfg))] + (let [public (u/uri (:public-uri cfg))] (str (assoc public :path "/api/oauth/google/callback")))) (defn- get-access-token @@ -44,7 +43,7 @@ req {:method :post :headers {"content-type" "application/x-www-form-urlencoded"} :uri "https://oauth2.googleapis.com/token" - :body (uri/map->query-string params)} + :body (u/map->query-string params)} res (http/send! req)] (when (= 200 (:status res)) @@ -80,8 +79,8 @@ :response_type "code" :redirect_uri (build-redirect-url cfg) :client_id (:client-id cfg)} - query (uri/map->query-string params) - uri (-> (uri/uri base-goauth-uri) + query (u/map->query-string params) + uri (-> (u/uri base-goauth-uri) (assoc :query query))] {:status 200 :body {:redirect-uri (str uri)}})) @@ -100,24 +99,20 @@ method-fn (get-in rpc [:methods :mutation :login-or-register]) profile (method-fn {:email (:email info) :fullname (:fullname info)}) - uagent (get-in request [:headers "user-agent"]) token (tokens :generate {:iss :auth :exp (dt/in-future "15m") :profile-id (:id profile)}) - uri (-> (uri/uri (:public-uri cfg)) + uri (-> (u/uri (:public-uri cfg)) (assoc :path "/#/auth/verify-token") - (assoc :query (uri/map->query-string {:token token}))) + (assoc :query (u/map->query-string {:token token}))) - sid (session/create! session {:profile-id (:id profile) - :user-agent uagent})] - {:status 302 - :headers {"location" (str uri)} - :cookies (session/cookies session {:value sid}) - :body ""}) + sxf ((:create session) (:id profile)) + rsp {:status 302 :headers {"location" (str uri)} :body ""}] + (sxf request rsp)) (catch Exception _e - (let [uri (-> (uri/uri (:public-uri cfg)) + (let [uri (-> (u/uri (:public-uri cfg)) (assoc :path "/#/auth/login") - (assoc :query (uri/map->query-string {:error "unable-to-auth"})))] + (assoc :query (u/map->query-string {:error "unable-to-auth"})))] {:status 302 :headers {"location" (str uri)} :body ""})))) diff --git a/backend/src/app/http/auth/ldap.clj b/backend/src/app/http/auth/ldap.clj index 02a82fae9..ec6dc16dc 100644 --- a/backend/src/app/http/auth/ldap.clj +++ b/backend/src/app/http/auth/ldap.clj @@ -11,7 +11,6 @@ (:require [app.common.exceptions :as ex] [app.config :as cfg] - [app.http.session :as session] [clj-ldap.client :as client] [clojure.set :as set] [clojure.spec.alpha :as s] @@ -66,12 +65,10 @@ (let [method-fn (get-in rpc [:methods :mutation :login-or-register]) profile (method-fn {:email (:email info) :fullname (:fullname info)}) - uagent (get-in request [:headers "user-agent"]) - sid (session/create! session {:profile-id (:id profile) - :user-agent uagent})] - {:status 200 - :cookies (session/cookies session {:value sid}) - :body profile})))) + + sxf ((:create session) (:id profile)) + rsp {:status 200 :body profile}] + (sxf request rsp))))) {::conn conn}))) (defmethod ig/halt-key! ::client diff --git a/backend/src/app/http/session.clj b/backend/src/app/http/session.clj index 98ccb9ee0..45e25699f 100644 --- a/backend/src/app/http/session.clj +++ b/backend/src/app/http/session.clj @@ -16,14 +16,16 @@ [clojure.spec.alpha :as s] [integrant.core :as ig])) -(defn next-session-id +;; --- IMPL + +(defn- next-session-id ([] (next-session-id 96)) ([n] (-> (bn/random-nonce n) (bc/bytes->b64u) (bc/bytes->str)))) -(defn create! +(defn- create [{:keys [conn] :as cfg} {:keys [profile-id user-agent]}] (let [id (next-session-id)] (db/insert! conn :http-session {:id id @@ -31,28 +33,28 @@ :user-agent user-agent}) id)) -(defn delete! - [{:keys [conn cookie-name] :as cfg} request] - (when-let [token (get-in request [:cookies cookie-name :value])] +(defn- delete + [{:keys [conn cookie-name] :as cfg} {:keys [cookies] :as request}] + (when-let [token (get-in cookies [cookie-name :value])] (db/delete! conn :http-session {:id token})) nil) -(defn retrieve +(defn- retrieve [{:keys [conn] :as cfg} token] (when token (-> (db/exec-one! conn ["select profile_id from http_session where id = ?" token]) (:profile-id)))) -(defn retrieve-from-request - [{:keys [cookie-name] :as cfg} request] - (->> (get-in request [:cookies cookie-name :value]) +(defn- retrieve-from-request + [{:keys [cookie-name] :as cfg} {:keys [cookies] :as request}] + (->> (get-in cookies [cookie-name :value]) (retrieve cfg))) -(defn cookies +(defn- cookies [{:keys [cookie-name] :as cfg} vals] {cookie-name (merge vals {:path "/" :http-only true})}) -(defn middleware +(defn- middleware [cfg handler] (fn [request] (if-let [profile-id (retrieve-from-request cfg request)] @@ -61,6 +63,8 @@ (handler (assoc request :profile-id profile-id))) (handler request)))) +;; --- STATE INIT + (defmethod ig/pre-init-spec ::session [_] (s/keys :req-un [::db/pool])) @@ -71,4 +75,17 @@ (defmethod ig/init-key ::session [_ {:keys [pool] :as cfg}] (let [cfg (assoc cfg :conn pool)] - (merge cfg {:middleware #(middleware cfg %)}))) + (-> cfg + (assoc :middleware #(middleware cfg %)) + (assoc :create (fn [profile-id] + (fn [request response] + (let [uagent (get-in request [:headers "user-agent"]) + value (create cfg {:profile-id profile-id :user-agent uagent})] + (assoc response :cookies (cookies cfg {:value value})))))) + (assoc :delete (fn [request response] + (delete cfg request) + (assoc response + :status 204 + :body "" + :cookies (cookies cfg {:value "" :max-age -1}))))))) + diff --git a/backend/src/app/rpc/mutations/profile.clj b/backend/src/app/rpc/mutations/profile.clj index 8ee5d7e8f..3b18c3a36 100644 --- a/backend/src/app/rpc/mutations/profile.clj +++ b/backend/src/app/rpc/mutations/profile.clj @@ -16,7 +16,6 @@ [app.db :as db] [app.db.profile-initial-data :refer [create-profile-initial-data]] [app.emails :as emails] - [app.http.session :as session] [app.media :as media] [app.rpc.mutations.projects :as projects] [app.rpc.mutations.teams :as teams] @@ -95,13 +94,7 @@ (with-meta (assoc profile :is-active true :claims claims) - {:transform-response - (fn [request response] - (let [uagent (get-in request [:headers "user-agent"]) - id (session/create! session {:profile-id (:id profile) - :user-agent uagent})] - (assoc response - :cookies (session/cookies session {:value id}))))})) + {:transform-response ((:create session) (:id profile))})) ;; If no token is provided, send a verification email (let [token (tokens :generate @@ -217,7 +210,7 @@ :opt-un [::scope])) (sv/defmethod ::login {:auth false :rlimit :password} - [{:keys [pool] :as cfg} {:keys [email password scope] :as params}] + [{:keys [pool session] :as cfg} {:keys [email password scope] :as params}] (letfn [(check-password [profile password] (when (= (:password profile) "!") (ex/raise :type :validation @@ -240,8 +233,21 @@ (let [prof (-> (profile/retrieve-profile-data-by-email conn email) (validate-profile) (profile/strip-private-attrs)) - addt (profile/retrieve-additional-data conn (:id prof))] - (merge prof addt))))) + addt (profile/retrieve-additional-data conn (:id prof)) + prof (merge prof addt)] + (with-meta prof + {:transform-response ((:create session) (:id prof))}))))) + + +;; --- Mutation: Logout + +(s/def ::logout + (s/keys :req-un [::profile-id])) + +(sv/defmethod ::logout + [{:keys [pool session] :as cfg} {:keys [profile-id] :as params}] + (with-meta {} + {:transform-response (:delete session)})) ;; --- Mutation: Register if not exists @@ -480,11 +486,7 @@ {:id profile-id}) (with-meta {} - {:transform-response - (fn [request response] - (session/delete! session request) - (assoc response - :cookies (session/cookies session {:value "" :max-age -1})))}))) + {:transform-response (:delete session)}))) (def sql:owned-teams "with owner_teams as ( diff --git a/backend/src/app/rpc/mutations/verify_token.clj b/backend/src/app/rpc/mutations/verify_token.clj index 8f2a7d0f4..29eefd5ca 100644 --- a/backend/src/app/rpc/mutations/verify_token.clj +++ b/backend/src/app/rpc/mutations/verify_token.clj @@ -5,14 +5,13 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020-2021 UXBOX Labs SL (ns app.rpc.mutations.verify-token (:require [app.common.exceptions :as ex] [app.common.spec :as us] [app.db :as db] - [app.http.session :as session] [app.rpc.mutations.teams :as teams] [app.rpc.queries.profile :as profile] [app.util.services :as sv] @@ -57,14 +56,7 @@ {:id (:id profile)})) (with-meta claims - {:transform-response - (fn [request response] - (let [uagent (get-in request [:headers "user-agent"]) - id (session/create! session {:profile-id profile-id - :user-agent uagent})] - (assoc response - :cookies (session/cookies session {:value id}))))}))) - + {:transform-response ((:create session) profile-id)}))) (defmethod process-token :auth [{:keys [conn] :as cfg} _params {:keys [profile-id] :as claims}] @@ -116,13 +108,7 @@ ;; the user clicking the link he already has access to the ;; email account. (with-meta claims - {:transform-response - (fn [request response] - (let [uagent (get-in request [:headers "user-agent"]) - id (session/create! session {:profile-id member-id - :user-agent uagent})] - (assoc response - :cookies (session/cookies session {:value id}))))}))) + {:transform-response ((:create session) member-id)}))) ;; In this case, we wait until frontend app redirect user to ;; registeration page, the user is correctly registered and the diff --git a/backend/tests/app/tests/test_services_profile.clj b/backend/tests/app/tests/test_services_profile.clj index ab32ca184..e6c9bf6ab 100644 --- a/backend/tests/app/tests/test_services_profile.clj +++ b/backend/tests/app/tests/test_services_profile.clj @@ -191,3 +191,94 @@ ;; TODO: profile deletion with owner teams ;; TODO: profile registration ;; TODO: profile password recovery + +(t/deftest test-register-when-registration-disabled + (with-mocks [mock {:target 'app.config/get + :return (th/mock-config-get-with + {:registration-enabled false})}] + (let [data {::th/type :register-profile + :email "user@example.com" + :password "foobar" + :fullname "foobar"} + out (th/mutation! data) + error (:error out) + edata (ex-data error)] + (t/is (th/ex-info? error)) + (t/is (= (:type edata) :restriction)) + (t/is (= (:code edata) :registration-disabled))))) + +(t/deftest test-register-existing-profile + (let [profile (th/create-profile* 1) + data {::th/type :register-profile + :email (:email profile) + :password "foobar" + :fullname "foobar"} + out (th/mutation! data) + error (:error out) + edata (ex-data error)] + (t/is (th/ex-info? error)) + (t/is (= (:type edata) :validation)) + (t/is (= (:code edata) :email-already-exists)))) + +(t/deftest test-register-profile + (with-mocks [mock {:target 'app.emails/send! + :return nil}] + (let [pool (:app.db/pool th/*system*) + data {::th/type :register-profile + :email "user@example.com" + :password "foobar" + :fullname "foobar"} + out (th/mutation! data)] + ;; (th/print-result! out) + (let [mock (deref mock) + [_ _ params] (:call-args mock)] + ;; (clojure.pprint/pprint params) + (t/is (:called? mock)) + (t/is (= (:email data) (:to params))) + (t/is (contains? params :extra-data)) + (t/is (contains? params :token))) + + (let [result (:result out)] + (t/is (false? (:is-demo result))) + (t/is (= (:email data) (:email result))) + (t/is (= "penpot" (:auth-backend result))) + (t/is (= "foobar" (:fullname result))) + (t/is (not (contains? result :password))))))) + +(t/deftest test-register-profile-with-bounced-email + (with-mocks [mock {:target 'app.emails/send! + :return nil}] + (let [pool (:app.db/pool th/*system*) + data {::th/type :register-profile + :email "user@example.com" + :password "foobar" + :fullname "foobar"} + _ (th/create-global-complaint-for pool {:type :bounce :email "user@example.com"}) + out (th/mutation! data)] + ;; (th/print-result! out) + + (let [mock (deref mock)] + (t/is (false? (:called? mock)))) + + (let [error (:error out) + edata (ex-data error)] + (t/is (th/ex-info? error)) + (t/is (= (:type edata) :validation)) + (t/is (= (:code edata) :email-has-permanent-bounces)))))) + +(t/deftest test-register-profile-with-complained-email + (with-mocks [mock {:target 'app.emails/send! + :return nil}] + (let [pool (:app.db/pool th/*system*) + data {::th/type :register-profile + :email "user@example.com" + :password "foobar" + :fullname "foobar"} + _ (th/create-global-complaint-for pool {:type :complaint :email "user@example.com"}) + out (th/mutation! data)] + + (let [mock (deref mock)] + (t/is (true? (:called? mock)))) + + (let [result (:result out)] + (t/is (= (:email data) (:email result))))))) diff --git a/frontend/src/app/main/repo.cljs b/frontend/src/app/main/repo.cljs index d6effae0e..45fa61166 100644 --- a/frontend/src/app/main/repo.cljs +++ b/frontend/src/app/main/repo.cljs @@ -122,18 +122,6 @@ (seq params)) (send-mutation! id form))) -(defmethod mutation :login - [id params] - (let [uri (str cfg/public-uri "/api/login")] - (->> (http/send! {:method :post :uri uri :body params}) - (rx/mapcat handle-response)))) - -(defmethod mutation :logout - [id params] - (let [uri (str cfg/public-uri "/api/logout")] - (->> (http/send! {:method :post :uri uri :body params}) - (rx/mapcat handle-response)))) - (defmethod mutation :login-with-ldap [id params] (let [uri (str cfg/public-uri "/api/login-ldap")] diff --git a/frontend/src/app/main/ui/auth/login.cljs b/frontend/src/app/main/ui/auth/login.cljs index bbdc805e7..0a196b0aa 100644 --- a/frontend/src/app/main/ui/auth/login.cljs +++ b/frontend/src/app/main/ui/auth/login.cljs @@ -63,7 +63,6 @@ on-error (fn [form event] - (js/console.log error?) (reset! error? true)) on-submit @@ -107,8 +106,7 @@ :help-icon i/eye :label (tr "auth.password")}]] [:& fm/submit-button - {:label (tr "auth.login-submit") - :on-click on-submit}] + {:label (tr "auth.login-submit")}] (when cfg/login-with-ldap [:& fm/submit-button From fc619f975c2e8da9ce172e5eb0b96b4f2a9ce861 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 11 Feb 2021 17:55:23 +0100 Subject: [PATCH 02/90] :sparkles: Add helper for more testable access to config. --- backend/src/app/config.clj | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/backend/src/app/config.clj b/backend/src/app/config.clj index 12022af73..d5f1ce587 100644 --- a/backend/src/app/config.clj +++ b/backend/src/app/config.clj @@ -9,7 +9,9 @@ (ns app.config "A configuration management." + (:refer-clojure :exclude [get]) (:require + [clojure.core :as c] [app.common.spec :as us] [app.common.version :as v] [app.util.time :as dt] @@ -247,3 +249,10 @@ (def deletion-delay (dt/duration {:days 7})) + +(defn get + "A configuration getter. Helps code be more testable." + ([key] + (c/get config key)) + ([key default] + (c/get config key default))) From 17229228a3816877b9f15ff88290b59c4b50b93e Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 11 Feb 2021 17:55:57 +0100 Subject: [PATCH 03/90] :sparkles: Add initialization logging to connection pool. --- backend/src/app/db.clj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/src/app/db.clj b/backend/src/app/db.clj index 1fcb18e47..99e4da7d2 100644 --- a/backend/src/app/db.clj +++ b/backend/src/app/db.clj @@ -19,6 +19,7 @@ [app.util.transit :as t] [clojure.java.io :as io] [clojure.spec.alpha :as s] + [clojure.tools.logging :as log] [integrant.core :as ig] [next.jdbc :as jdbc] [next.jdbc.date-time :as jdbc-dt]) @@ -55,6 +56,7 @@ (defmethod ig/init-key ::pool [_ {:keys [migrations] :as cfg}] + (log/debugf "initialize connection pool %s with uri %s" (:name cfg) (:uri cfg)) (let [pool (create-pool cfg)] (when (seq migrations) (with-open [conn (open pool)] From 7708752ad9e7651c5b3df8901dd1ad831a4d634d Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 11 Feb 2021 17:57:41 +0100 Subject: [PATCH 04/90] :tada: Add automatic complaint and bouncing handling. --- backend/src/app/config.clj | 17 +- backend/src/app/emails.clj | 52 ++- backend/src/app/http.clj | 3 + backend/src/app/http/auth/github.clj | 1 + backend/src/app/http/auth/gitlab.clj | 1 + backend/src/app/http/auth/google.clj | 1 + backend/src/app/http/auth/ldap.clj | 1 + backend/src/app/http/awsns.clj | 207 ++++++++++++ backend/src/app/main.clj | 5 + backend/src/app/migrations.clj | 4 + .../sql/0046-add-profile-complaint-table.sql | 45 +++ backend/src/app/rpc/mutations/profile.clj | 84 +++-- backend/src/app/rpc/mutations/teams.clj | 48 ++- .../src/app/rpc/mutations/verify_token.clj | 10 +- backend/src/app/tokens.clj | 14 + backend/tests/app/tests/helpers.clj | 39 ++- .../tests/app/tests/test_bounces_handling.clj | 316 ++++++++++++++++++ backend/tests/app/tests/test_emails.clj | 1 - .../tests/app/tests/test_services_profile.clj | 94 +++++- .../tests/app/tests/test_services_teams.clj | 88 +++++ docker/devenv/files/nginx.conf | 4 + frontend/resources/locales.json | 22 ++ .../app/main/ui/auth/recovery_request.cljs | 44 +-- frontend/src/app/main/ui/auth/register.cljs | 8 +- frontend/src/app/main/ui/dashboard/team.cljs | 23 +- .../app/main/ui/settings/change_email.cljs | 14 +- 26 files changed, 1073 insertions(+), 73 deletions(-) create mode 100644 backend/src/app/http/awsns.clj create mode 100644 backend/src/app/migrations/sql/0046-add-profile-complaint-table.sql create mode 100644 backend/tests/app/tests/test_bounces_handling.clj create mode 100644 backend/tests/app/tests/test_services_teams.clj diff --git a/backend/src/app/config.clj b/backend/src/app/config.clj index d5f1ce587..51741e329 100644 --- a/backend/src/app/config.clj +++ b/backend/src/app/config.clj @@ -11,10 +11,10 @@ "A configuration management." (:refer-clojure :exclude [get]) (:require - [clojure.core :as c] [app.common.spec :as us] [app.common.version :as v] [app.util.time :as dt] + [clojure.core :as c] [clojure.spec.alpha :as s] [cuerdas.core :as str] [environ.core :refer [env]])) @@ -54,6 +54,12 @@ :smtp-default-reply-to "Penpot " :smtp-default-from "Penpot " + :profile-complaint-max-age (dt/duration {:days 7}) + :profile-complaint-threshold 2 + + :profile-bounce-max-age (dt/duration {:days 7}) + :profile-bounce-threshold 10 + :allow-demo-users true :registration-enabled true :registration-domain-whitelist "" @@ -100,6 +106,11 @@ (s/def ::feedback-enabled ::us/boolean) (s/def ::feedback-destination ::us/string) +(s/def ::profile-complaint-max-age ::dt/duration) +(s/def ::profile-complaint-threshold ::us/integer) +(s/def ::profile-bounce-max-age ::dt/duration) +(s/def ::profile-bounce-threshold ::us/integer) + (s/def ::error-report-webhook ::us/string) (s/def ::smtp-enabled ::us/boolean) @@ -187,6 +198,10 @@ ::ldap-bind-dn ::ldap-bind-password ::public-uri + ::profile-complaint-threshold + ::profile-bounce-threshold + ::profile-complaint-max-age + ::profile-bounce-max-age ::redis-uri ::registration-domain-whitelist ::registration-enabled diff --git a/backend/src/app/emails.clj b/backend/src/app/emails.clj index 68441d821..74fbaf84b 100644 --- a/backend/src/app/emails.clj +++ b/backend/src/app/emails.clj @@ -5,13 +5,15 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020-2021 UXBOX Labs SL (ns app.emails "Main api for send emails." (:require [app.common.spec :as us] [app.config :as cfg] + [app.db :as db] + [app.db.sql :as sql] [app.tasks :as tasks] [app.util.emails :as emails] [clojure.spec.alpha :as s])) @@ -41,6 +43,54 @@ :priority 200 :props email}))) + +(def sql:profile-complaint-report + "select (select count(*) + from profile_complaint_report + where type = 'complaint' + and profile_id = ? + and created_at > now() - ?::interval) as complaints, + (select count(*) + from profile_complaint_report + where type = 'bounce' + and profile_id = ? + and created_at > now() - ?::interval) as bounces;") + +(defn allow-send-emails? + [conn profile] + (when-not (:is-muted profile false) + (let [complaint-threshold (cfg/get :profile-complaint-threshold) + complaint-max-age (cfg/get :profile-complaint-max-age) + bounce-threshold (cfg/get :profile-bounce-threshold) + bounce-max-age (cfg/get :profile-bounce-max-age) + + {:keys [complaints bounces] :as result} + (db/exec-one! conn [sql:profile-complaint-report + (:id profile) + (db/interval complaint-max-age) + (:id profile) + (db/interval bounce-max-age)])] + + (and (< complaints complaint-threshold) + (< bounces bounce-threshold))))) + +(defn has-complaint-reports? + ([conn email] (has-complaint-reports? conn email nil)) + ([conn email {:keys [threshold] :or {threshold 1}}] + (let [reports (db/exec! conn (sql/select :global-complaint-report + {:email email :type "complaint"} + {:limit 10}))] + (>= (count reports) threshold)))) + +(defn has-bounce-reports? + ([conn email] (has-bounce-reports? conn email nil)) + ([conn email {:keys [threshold] :or {threshold 1}}] + (let [reports (db/exec! conn (sql/select :global-complaint-report + {:email email :type "bounce"} + {:limit 10}))] + (>= (count reports) threshold)))) + + ;; --- Emails (s/def ::subject ::us/string) diff --git a/backend/src/app/http.clj b/backend/src/app/http.clj index ffe534971..1158f34b9 100644 --- a/backend/src/app/http.clj +++ b/backend/src/app/http.clj @@ -126,6 +126,9 @@ ["/dbg" ["/error-by-id/:id" {:get (:error-report-handler cfg)}]] + ["/webhooks" + ["/sns" {:post (:sns-webhook cfg)}]] + ["/api" {:middleware [[middleware/format-response-body] [middleware/params] [middleware/multipart-params] diff --git a/backend/src/app/http/auth/github.clj b/backend/src/app/http/auth/github.clj index c01200126..26753bc05 100644 --- a/backend/src/app/http/auth/github.clj +++ b/backend/src/app/http/auth/github.clj @@ -110,6 +110,7 @@ method-fn (get-in rpc [:methods :mutation :login-or-register]) profile (method-fn {:email (:email info) + :backend "github" :fullname (:fullname info)}) token (tokens :generate {:iss :auth diff --git a/backend/src/app/http/auth/gitlab.clj b/backend/src/app/http/auth/gitlab.clj index 5e78f1071..f253016b0 100644 --- a/backend/src/app/http/auth/gitlab.clj +++ b/backend/src/app/http/auth/gitlab.clj @@ -112,6 +112,7 @@ method-fn (get-in rpc [:methods :mutation :login-or-register]) profile (method-fn {:email (:email info) + :backend "gitlab" :fullname (:fullname info)}) token (tokens :generate {:iss :auth :exp (dt/in-future "15m") diff --git a/backend/src/app/http/auth/google.clj b/backend/src/app/http/auth/google.clj index 12a2d7034..653352d42 100644 --- a/backend/src/app/http/auth/google.clj +++ b/backend/src/app/http/auth/google.clj @@ -98,6 +98,7 @@ :code :unable-to-auth)) method-fn (get-in rpc [:methods :mutation :login-or-register]) profile (method-fn {:email (:email info) + :backend "google" :fullname (:fullname info)}) token (tokens :generate {:iss :auth :exp (dt/in-future "15m") diff --git a/backend/src/app/http/auth/ldap.clj b/backend/src/app/http/auth/ldap.clj index ec6dc16dc..41e260e9f 100644 --- a/backend/src/app/http/auth/ldap.clj +++ b/backend/src/app/http/auth/ldap.clj @@ -64,6 +64,7 @@ :password (:password data)))] (let [method-fn (get-in rpc [:methods :mutation :login-or-register]) profile (method-fn {:email (:email info) + :backend "ldap" :fullname (:fullname info)}) sxf ((:create session) (:id profile)) diff --git a/backend/src/app/http/awsns.clj b/backend/src/app/http/awsns.clj new file mode 100644 index 000000000..9443b90eb --- /dev/null +++ b/backend/src/app/http/awsns.clj @@ -0,0 +1,207 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2020 Andrey Antukh + +(ns app.http.awsns + "AWS SNS webhook handler for bounces." + (:require + [app.common.exceptions :as ex] + [app.db :as db] + [app.db.sql :as sql] + [app.util.http :as http] + [clojure.pprint :refer [pprint]] + [clojure.spec.alpha :as s] + [clojure.tools.logging :as log] + [cuerdas.core :as str] + [integrant.core :as ig] + [jsonista.core :as j])) + +(declare parse-json) +(declare parse-notification) +(declare process-report) + +(defn- pprint-report + [message] + (binding [clojure.pprint/*print-right-margin* 120] + (with-out-str (pprint message)))) + +(defmethod ig/pre-init-spec ::handler [_] + (s/keys :req-un [::db/pool])) + +(defmethod ig/init-key ::handler + [_ cfg] + (fn [request] + (let [body (parse-json (slurp (:body request))) + mtype (get body "Type")] + (cond + (= mtype "SubscriptionConfirmation") + (let [surl (get body "SubscribeURL") + stopic (get body "TopicArn")] + (log/infof "Subscription received (topic=%s, url=%s)" stopic surl) + (http/send! {:uri surl :method :post :timeout 10000})) + + (= mtype "Notification") + (when-let [message (parse-json (get body "Message"))] + ;; (log/infof "Received: %s" (pr-str message)) + (let [notification (parse-notification cfg message)] + (process-report cfg notification))) + + :else + (log/warn (str "Unexpected data received.\n" + (pprint-report body)))) + + {:status 200 :body ""}))) + +(defn- parse-bounce + [data] + {:type "bounce" + :kind (str/lower (get data "bounceType")) + :category (str/lower (get data "bounceSubType")) + :feedback-id (get data "feedbackId") + :timestamp (get data "timestamp") + :recipients (->> (get data "bouncedRecipients") + (mapv (fn [item] + {:email (str/lower (get item "emailAddress")) + :status (get item "status") + :action (get item "action") + :dcode (get item "diagnosticCode")})))}) + +(defn- parse-complaint + [data] + {:type "complaint" + :user-agent (get data "userAgent") + :kind (get data "complaintFeedbackType") + :category (get data "complaintSubType") + :timestamp (get data "arrivalDate") + :feedback-id (get data "feedbackId") + :recipients (->> (get data "complainedRecipients") + (mapv #(get % "emailAddress")) + (mapv str/lower))}) + +(defn- extract-headers + [mail] + (reduce (fn [acc item] + (let [key (get item "name") + val (get item "value")] + (assoc acc (str/lower key) val))) + {} + (get mail "headers"))) + +(defn- extract-identity + [{:keys [tokens] :as cfg} headers] + (let [tdata (get headers "x-penpot-data")] + (when-not (str/empty? tdata) + (let [result (tokens :verify {:token tdata :iss :profile-identity})] + (:profile-id result))))) + +(defn- parse-notification + [cfg message] + (let [type (get message "notificationType") + data (case type + "Bounce" (parse-bounce (get message "bounce")) + "Complaint" (parse-complaint (get message "complaint")) + {:type (keyword (str/lower type)) + :message message})] + (when data + (let [mail (get message "mail")] + (when-not mail + (ex/raise :type :internal + :code :incomplete-notification + :hint "no email data received, please enable full headers report")) + (let [headers (extract-headers mail) + mail {:destination (get mail "destination") + :source (get mail "source") + :timestamp (get mail "timestamp") + :subject (get-in mail ["commonHeaders" "subject"]) + :headers headers}] + (assoc data + :mail mail + :profile-id (extract-identity cfg headers))))))) + +(defn- parse-json + [v] + (ex/ignoring + (j/read-value v))) + +(defn- register-bounce-for-profile + [{:keys [pool]} {:keys [type kind profile-id] :as report}] + (when (= kind "permanent") + (db/with-atomic [conn pool] + (db/insert! conn :profile-complaint-report + {:profile-id profile-id + :type (name type) + :content (db/tjson report)}) + + ;; TODO: maybe also try to find profiles by mail and if exists + ;; register profile reports for them? + (doseq [recipient (:recipients report)] + (db/insert! conn :global-complaint-report + {:email (:email recipient) + :type (name type) + :content (db/tjson report)})) + + (let [profile (db/exec-one! conn (sql/select :profile {:id profile-id}))] + (when (some #(= (:email profile) (:email %)) (:recipients report)) + ;; If the report matches the profile email, this means that + ;; the report is for itself, can be caused when a user + ;; registers with an invalid email or the user email is + ;; permanently rejecting receiving the email. In this case we + ;; have no option to mark the user as muted (and in this case + ;; the profile will be also inactive. + (db/update! conn :profile + {:is-muted true} + {:id profile-id})))))) + +(defn- register-complaint-for-profile + [{:keys [pool]} {:keys [type profile-id] :as report}] + (db/with-atomic [conn pool] + (db/insert! conn :profile-complaint-report + {:profile-id profile-id + :type (name type) + :content (db/tjson report)}) + + ;; TODO: maybe also try to find profiles by email and if exists + ;; register profile reports for them? + (doseq [email (:recipients report)] + (db/insert! conn :global-complaint-report + {:email email + :type (name type) + :content (db/tjson report)})) + + (let [profile (db/exec-one! conn (sql/select :profile {:id profile-id}))] + (when (some #(= % (:email profile)) (:recipients report)) + ;; If the report matches the profile email, this means that + ;; the report is for itself, rare case but can happen; In this + ;; case just mark profile as muted (very rare case). + (db/update! conn :profile + {:is-muted true} + {:id profile-id}))))) + +(defn- process-report + [cfg {:keys [type profile-id] :as report}] + (log/debug (str "Procesing report:\n" (pprint-report report))) + (cond + ;; In this case we receive a bounce/complaint notification without + ;; confirmed identity, we just emit a warning but do nothing about + ;; it because this is not a normal case. All notifications should + ;; come with profile identity. + (nil? profile-id) + (log/warn (str "A notification without identity recevied from AWS\n" + (pprint-report report))) + + (= "bounce" type) + (register-bounce-for-profile cfg report) + + (= "complaint" type) + (register-complaint-for-profile cfg report) + + :else + (log/warn (str "Unrecognized report received from AWS\n" + (pprint-report report))))) + + diff --git a/backend/src/app/main.clj b/backend/src/app/main.clj index e26d84a92..6f2203445 100644 --- a/backend/src/app/main.clj +++ b/backend/src/app/main.clj @@ -71,6 +71,10 @@ {:pool (ig/ref :app.db/pool) :cookie-name "auth-token"} + :app.http.awsns/handler + {:tokens (ig/ref :app.tokens/tokens) + :pool (ig/ref :app.db/pool)} + :app.http/server {:port (:http-server-port config) :handler (ig/ref :app.http/router) @@ -90,6 +94,7 @@ :assets (ig/ref :app.http.assets/handlers) :svgparse (ig/ref :app.svgparse/handler) :storage (ig/ref :app.storage/storage) + :sns-webhook (ig/ref :app.http.awsns/handler) :error-report-handler (ig/ref :app.error-reporter/handler)} :app.http.assets/handlers diff --git a/backend/src/app/migrations.clj b/backend/src/app/migrations.clj index 2d247e11c..7b0a19e6c 100644 --- a/backend/src/app/migrations.clj +++ b/backend/src/app/migrations.clj @@ -148,6 +148,10 @@ {:name "0045-add-index-to-file-change-table" :fn (mg/resource "app/migrations/sql/0045-add-index-to-file-change-table.sql")} + + {:name "0046-add-profile-complaint-table" + :fn (mg/resource "app/migrations/sql/0046-add-profile-complaint-table.sql")} + ]) diff --git a/backend/src/app/migrations/sql/0046-add-profile-complaint-table.sql b/backend/src/app/migrations/sql/0046-add-profile-complaint-table.sql new file mode 100644 index 000000000..431f73744 --- /dev/null +++ b/backend/src/app/migrations/sql/0046-add-profile-complaint-table.sql @@ -0,0 +1,45 @@ +CREATE TABLE profile_complaint_report ( + profile_id uuid NOT NULL REFERENCES profile(id) ON DELETE CASCADE, + created_at timestamptz NOT NULL DEFAULT now(), + + type text NOT NULL, + content jsonb, + + PRIMARY KEY (profile_id, created_at) +); + +ALTER TABLE profile_complaint_report + ALTER COLUMN type SET STORAGE external, + ALTER COLUMN content SET STORAGE external; + +ALTER TABLE profile + ADD COLUMN is_muted boolean DEFAULT false, + ADD COLUMN auth_backend text NULL; + +ALTER TABLE profile + ALTER COLUMN auth_backend SET STORAGE external; + +UPDATE profile + SET auth_backend = 'google' + WHERE password = '!'; + +UPDATE profile + SET auth_backend = 'penpot' + WHERE password != '!'; + +-- Table storing a permanent complaint table for register all +-- permanent bounces and spam reports (complaints) and avoid sending +-- more emails there. +CREATE TABLE global_complaint_report ( + email text NOT NULL, + created_at timestamptz NOT NULL DEFAULT now(), + + type text NOT NULL, + content jsonb, + + PRIMARY KEY (email, created_at) +); + +ALTER TABLE global_complaint_report + ALTER COLUMN type SET STORAGE external, + ALTER COLUMN content SET STORAGE external; diff --git a/backend/src/app/rpc/mutations/profile.clj b/backend/src/app/rpc/mutations/profile.clj index 3b18c3a36..81ab78746 100644 --- a/backend/src/app/rpc/mutations/profile.clj +++ b/backend/src/app/rpc/mutations/profile.clj @@ -55,12 +55,11 @@ (sv/defmethod ::register-profile {:auth false :rlimit :password} [{:keys [pool tokens session] :as cfg} {:keys [token] :as params}] - (when-not (:registration-enabled cfg/config) + (when-not (cfg/get :registration-enabled) (ex/raise :type :restriction :code :registration-disabled)) - (when-not (email-domain-in-whitelist? (:registration-domain-whitelist cfg/config) - (:email params)) + (when-not (email-domain-in-whitelist? (cfg/get :registration-domain-whitelist) (:email params)) (ex/raise :type :validation :code :email-domain-is-not-allowed)) @@ -97,20 +96,30 @@ {:transform-response ((:create session) (:id profile))})) ;; If no token is provided, send a verification email - (let [token (tokens :generate - {:iss :verify-email - :exp (dt/in-future "48h") - :profile-id (:id profile) - :email (:email profile)})] + (let [vtoken (tokens :generate + {:iss :verify-email + :exp (dt/in-future "48h") + :profile-id (:id profile) + :email (:email profile)}) + ptoken (tokens :generate-predefined + {:iss :profile-identity + :profile-id (:id profile)})] + + ;; Don't allow proceed in register page if the email is + ;; already reported as permanent bounced + (when (emails/has-bounce-reports? conn (:email profile)) + (ex/raise :type :validation + :code :email-has-permanent-bounces + :hint "looks like the email has one or many bounces reported")) (emails/send! conn emails/register {:to (:email profile) :name (:fullname profile) - :token token}) + :token vtoken + :extra-data ptoken}) profile))))) - (defn email-domain-in-whitelist? "Returns true if email's domain is in the given whitelist or if given whitelist is an empty string." @@ -155,8 +164,8 @@ (defn- create-profile "Create the profile entry on the database with limited input filling all the other fields with defaults." - [conn {:keys [id fullname email password demo? props is-active] - :or {is-active false} + [conn {:keys [id fullname email password demo? props is-active is-muted] + :or {is-active false is-muted false} :as params}] (let [id (or id (uuid/next)) demo? (if (boolean? demo?) demo? false) @@ -168,9 +177,11 @@ {:id id :fullname fullname :email (str/lower email) + :auth-backend "penpot" :password password :props props :is-active active? + :is-muted is-muted :is-demo demo?}) (update :props db/decode-transit-pgobject)) (catch org.postgresql.util.PSQLException e @@ -252,11 +263,12 @@ ;; --- Mutation: Register if not exists +(s/def ::backend ::us/string) (s/def ::login-or-register - (s/keys :req-un [::email ::fullname])) + (s/keys :req-un [::email ::fullname ::backend])) (sv/defmethod ::login-or-register {:auth false} - [{:keys [pool] :as cfg} {:keys [email fullname] :as params}] + [{:keys [pool] :as cfg} {:keys [email backend fullname] :as params}] (letfn [(populate-additional-data [conn profile] (let [data (profile/retrieve-additional-data conn (:id profile))] (merge profile data))) @@ -266,6 +278,7 @@ {:id (uuid/next) :fullname fullname :email (str/lower email) + :auth-backend backend :is-active true :password "!" :is-demo false})) @@ -372,16 +385,30 @@ {:iss :change-email :exp (dt/in-future "15m") :profile-id profile-id - :email email})] + :email email}) + ptoken (tokens :generate-predefined + {:iss :profile-identity + :profile-id (:id profile)})] (when (not= email (:email profile)) (check-profile-existence! conn params)) + (when-not (emails/allow-send-emails? conn profile) + (ex/raise :type :validation + :code :profile-is-muted + :hint "looks like the profile has reported repeatedly as spam or has permanent bounces.")) + + (when (emails/has-bounce-reports? conn email) + (ex/raise :type :validation + :code :email-has-permanent-bounces + :hint "looks like the email you invite has been repeatedly reported as spam or permanent bounce")) + (emails/send! conn emails/change-email {:to (:email profile) :name (:fullname profile) :pending-email email - :token token}) + :token token + :extra-data ptoken}) nil))) (defn select-profile-for-update @@ -403,11 +430,15 @@ (assoc profile :token token))) (send-email-notification [conn profile] - (emails/send! conn emails/password-recovery - {:to (:email profile) - :token (:token profile) - :name (:fullname profile)}) - nil)] + (let [ptoken (tokens :generate-predefined + {:iss :profile-identity + :profile-id (:id profile)})] + (emails/send! conn emails/password-recovery + {:to (:email profile) + :token (:token profile) + :name (:fullname profile) + :extra-data ptoken}) + nil))] (db/with-atomic [conn pool] (when-let [profile (profile/retrieve-profile-data-by-email conn email)] @@ -415,6 +446,17 @@ (ex/raise :type :validation :code :profile-not-verified :hint "the user need to validate profile before recover password")) + + (when-not (emails/allow-send-emails? conn profile) + (ex/raise :type :validation + :code :profile-is-muted + :hint "looks like the profile has reported repeatedly as spam or has permanent bounces.")) + + (when (emails/has-bounce-reports? conn (:email profile)) + (ex/raise :type :validation + :code :email-has-permanent-bounces + :hint "looks like the email you invite has been repeatedly reported as spam or permanent bounce")) + (->> profile (create-recovery-token) (send-email-notification conn)))))) diff --git a/backend/src/app/rpc/mutations/teams.clj b/backend/src/app/rpc/mutations/teams.clj index 5abbb4152..c5e37d001 100644 --- a/backend/src/app/rpc/mutations/teams.clj +++ b/backend/src/app/rpc/mutations/teams.clj @@ -297,26 +297,48 @@ (sv/defmethod ::invite-team-member [{:keys [pool tokens] :as cfg} {:keys [profile-id team-id email role] :as params}] (db/with-atomic [conn pool] - (let [perms (teams/check-edition-permissions! conn profile-id team-id) - profile (db/get-by-id conn :profile profile-id) - member (profile/retrieve-profile-data-by-email conn email) - team (db/get-by-id conn :team team-id) - token (tokens :generate - {:iss :team-invitation - :exp (dt/in-future "24h") - :profile-id (:id profile) - :role role - :team-id team-id - :member-email (:email member email) - :member-id (:id member)})] + (let [perms (teams/check-edition-permissions! conn profile-id team-id) + profile (db/get-by-id conn :profile profile-id) + member (profile/retrieve-profile-data-by-email conn email) + team (db/get-by-id conn :team team-id) + itoken (tokens :generate + {:iss :team-invitation + :exp (dt/in-future "24h") + :profile-id (:id profile) + :role role + :team-id team-id + :member-email (:email member email) + :member-id (:id member)}) + ptoken (tokens :generate-predefined + {:iss :profile-identity + :profile-id (:id profile)})] (when-not (some :is-admin perms) (ex/raise :type :validation :code :insufficient-permissions)) + ;; First check if the current profile is allowed to send emails. + (when-not (emails/allow-send-emails? conn profile) + (ex/raise :type :validation + :code :profile-is-muted + :hint "looks like the profile has reported repeatedly as spam or has permanent bounces")) + + (when (and member (not (emails/allow-send-emails? conn member))) + (ex/raise :type :validation + :code :member-is-muted + :hint "looks like the profile has reported repeatedly as spam or has permanent bounces")) + + ;; Secondly check if the invited member email is part of the + ;; global spam/bounce report. + (when (emails/has-bounce-reports? conn email) + (ex/raise :type :validation + :code :email-has-permanent-bounces + :hint "looks like the email you invite has been repeatedly reported as spam or permanent bounce")) + (emails/send! conn emails/invite-to-team {:to email :invited-by (:fullname profile) :team (:name team) - :token token}) + :token itoken + :extra-data ptoken}) nil))) diff --git a/backend/src/app/rpc/mutations/verify_token.clj b/backend/src/app/rpc/mutations/verify_token.clj index 29eefd5ca..357e20e90 100644 --- a/backend/src/app/rpc/mutations/verify_token.clj +++ b/backend/src/app/rpc/mutations/verify_token.clj @@ -90,11 +90,19 @@ (let [params (merge {:team-id team-id :profile-id member-id} (teams/role->params role)) - claims (assoc claims :state :created)] + claims (assoc claims :state :created) + member (profile/retrieve-profile conn member-id)] (db/insert! conn :team-profile-rel params {:on-conflict-do-nothing true}) + ;; If profile is not yet verified, mark it as verified because + ;; accepting an invitation link serves as verification. + (when-not (:is-active member) + (db/update! conn :profile + {:is-active true} + {:id member-id})) + (if (and (uuid? profile-id) (= member-id profile-id)) ;; If the current session is already matches the invited diff --git a/backend/src/app/tokens.clj b/backend/src/app/tokens.clj index a71c49dae..4abbca855 100644 --- a/backend/src/app/tokens.clj +++ b/backend/src/app/tokens.clj @@ -60,11 +60,25 @@ (defmethod ig/pre-init-spec ::tokens [_] (s/keys :req-un [::sprops])) +(defn- generate-predefined + [cfg {:keys [iss profile-id] :as params}] + (case iss + :profile-identity + (do + (us/verify uuid? profile-id) + (generate cfg (assoc params + :exp (dt/in-future {:days 30})))) + + (ex/raise :type :internal + :code :not-implemented + :hint "no predefined token"))) + (defmethod ig/init-key ::tokens [_ {:keys [sprops] :as cfg}] (let [secret (derive-tokens-secret (:secret-key sprops)) cfg (assoc cfg ::secret secret)] (fn [action params] (case action + :generate-predefined (generate-predefined cfg params) :verify (verify cfg params) :generate (generate cfg params))))) diff --git a/backend/tests/app/tests/helpers.clj b/backend/tests/app/tests/helpers.clj index 3709b5465..81c442e68 100644 --- a/backend/tests/app/tests/helpers.clj +++ b/backend/tests/app/tests/helpers.clj @@ -31,15 +31,24 @@ [environ.core :refer [env]] [expound.alpha :as expound] [integrant.core :as ig] + [mockery.core :as mk] [promesa.core :as p]) (:import org.postgresql.ds.PGSimpleDataSource)) (def ^:dynamic *system* nil) (def ^:dynamic *pool* nil) +(def config + (merge {:redis-uri "redis://redis/1" + :database-uri "postgresql://postgres/penpot_test" + :storage-fs-directory "/tmp/app/storage" + :migrations-verbose false} + cfg/config)) + + (defn state-init [next] - (let [config (-> (main/build-system-config cfg/test-config) + (let [config (-> (main/build-system-config config) (dissoc :app.srepl/server :app.http/server :app.http/router @@ -300,3 +309,31 @@ (defn sleep [ms] (Thread/sleep ms)) + +(defn mock-config-get-with + "Helper for mock app.config/get" + [data] + (fn + ([key] (get (merge config data) key)) + ([key default] (get (merge config data) key default)))) + +(defn create-complaint-for + [conn {:keys [id created-at type]}] + (db/insert! conn :profile-complaint-report + {:profile-id id + :created-at (or created-at (dt/now)) + :type (name type) + :content (db/tjson {})})) + +(defn create-global-complaint-for + [conn {:keys [email type created-at]}] + (db/insert! conn :global-complaint-report + {:email email + :type (name type) + :created-at (or created-at (dt/now)) + :content (db/tjson {})})) + + +(defn reset-mock! + [m] + (reset! m @(mk/make-mock {}))) diff --git a/backend/tests/app/tests/test_bounces_handling.clj b/backend/tests/app/tests/test_bounces_handling.clj new file mode 100644 index 000000000..065ada03f --- /dev/null +++ b/backend/tests/app/tests/test_bounces_handling.clj @@ -0,0 +1,316 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2021 UXBOX Labs SL + +(ns app.tests.test-bounces-handling + (:require + [clojure.pprint :refer [pprint]] + [app.http.awsns :as awsns] + [app.emails :as emails] + [app.tests.helpers :as th] + [app.db :as db] + [app.util.time :as dt] + [mockery.core :refer [with-mocks]] + [clojure.test :as t])) + +(t/use-fixtures :once th/state-init) +(t/use-fixtures :each th/database-reset) + +;; (with-mocks [mock {:target 'app.tasks/submit! :return nil}] +;; Right now we have many different scenarios what can cause a +;; bounce/complain report. + +(defn- decode-row + [{:keys [content] :as row}] + (cond-> row + (db/pgobject? content) + (assoc :content (db/decode-transit-pgobject content)))) + +(defn bounce-report + [{:keys [token email] :or {email "user@example.com"}}] + {"notificationType" "Bounce", + "bounce" {"feedbackId""010701776d7dd251-c08d280d-9f47-41aa-b959-0094fec779d9-000000", + "bounceType" "Permanent", + "bounceSubType" "General", + "bouncedRecipients" [{"emailAddress" email, + "action" "failed", + "status" "5.1.1", + "diagnosticCode" "smtp; 550 5.1.1 user unknown"}] + "timestamp" "2021-02-04T14:41:38.000Z", + "remoteMtaIp" "22.22.22.22", + "reportingMTA" "dsn; b224-13.smtp-out.eu-central-1.amazonses.com"} + "mail" {"timestamp" "2021-02-04T14:41:37.020Z", + "source" "no-reply@penpot.app", + "sourceArn" "arn:aws:ses:eu-central-1:1111111111:identity/penpot.app", + "sourceIp" "22.22.22.22", + "sendingAccountId" "1111111111", + "messageId" "010701776d7dccfc-3c0094e7-01d7-458d-8100-893320186028-000000", + "destination" [email], + "headersTruncated" false, + "headers" [{"name" "Received","value" "from app-pre"}, + {"name" "Date","value" "Thu, 4 Feb 2021 14:41:36 +0000 (UTC)"}, + {"name" "From","value" "Penpot "}, + {"name" "Reply-To","value" "Penpot "}, + {"name" "To","value" email}, + {"name" "Message-ID","value" "<2054501.5.1612449696846@penpot.app>"}, + {"name" "Subject","value" "test"}, + {"name" "MIME-Version","value" "1.0"}, + {"name" "Content-Type","value" "multipart/mixed; boundary=\"----=_Part_3_1150363050.1612449696845\""}, + {"name" "X-Penpot-Data","value" token}], + "commonHeaders" {"from" ["Penpot "], + "replyTo" ["Penpot "], + "date" "Thu, 4 Feb 2021 14:41:36 +0000 (UTC)", + "to" [email], + "messageId" "<2054501.5.1612449696846@penpot.app>", + "subject" "test"}}}) + + +(defn complaint-report + [{:keys [token email] :or {email "user@example.com"}}] + {"notificationType" "Complaint", + "complaint" {"feedbackId" "0107017771528618-dcf4d61f-c889-4c8b-a6ff-6f0b6553b837-000000", + "complaintSubType" nil, + "complainedRecipients" [{"emailAddress" email}], + "timestamp" "2021-02-05T08:32:49.000Z", + "userAgent" "Yahoo!-Mail-Feedback/2.0", + "complaintFeedbackType" "abuse", + "arrivalDate" "2021-02-05T08:31:15.000Z"}, + "mail" {"timestamp" "2021-02-05T08:31:13.715Z", + "source" "no-reply@penpot.app", + "sourceArn" "arn:aws:ses:eu-central-1:111111111:identity/penpot.app", + "sourceIp" "22.22.22.22", + "sendingAccountId" "11111111111", + "messageId" "0107017771510f33-a0696d28-859c-4f08-9211-8392d1b5c226-000000", + "destination" ["user@yahoo.com"], + "headersTruncated" false, + "headers" [{"name" "Received","value" "from smtp"}, + {"name" "Date","value" "Fri, 5 Feb 2021 08:31:13 +0000 (UTC)"}, + {"name" "From","value" "Penpot "}, + {"name" "Reply-To","value" "Penpot "}, + {"name" "To","value" email}, + {"name" "Message-ID","value" "<1833063698.279.1612513873536@penpot.app>"}, + {"name" "Subject","value" "Verify email."}, + {"name" "MIME-Version","value" "1.0"}, + {"name" "Content-Type","value" "multipart/mixed; boundary=\"----=_Part_276_1174403980.1612513873535\""}, + {"name" "X-Penpot-Data","value" token}], + "commonHeaders" {"from" ["Penpot "], + "replyTo" ["Penpot "], + "date" "Fri, 5 Feb 2021 08:31:13 +0000 (UTC)", + "to" [email], + "messageId" "<1833063698.279.1612513873536@penpot.app>", + "subject" "Verify email."}}}) + +(t/deftest test-parse-bounce-report + (let [profile (th/create-profile* 1) + tokens (:app.tokens/tokens th/*system*) + cfg {:tokens tokens} + report (bounce-report {:token (tokens :generate-predefined + {:iss :profile-identity + :profile-id (:id profile)})}) + result (#'awsns/parse-notification cfg report)] + ;; (pprint result) + + (t/is (= "bounce" (:type result))) + (t/is (= "permanent" (:kind result))) + (t/is (= "general" (:category result))) + (t/is (= ["user@example.com"] (mapv :email (:recipients result)))) + (t/is (= (:id profile) (:profile-id result))) + )) + +(t/deftest test-parse-complaint-report + (let [profile (th/create-profile* 1) + tokens (:app.tokens/tokens th/*system*) + cfg {:tokens tokens} + report (complaint-report {:token (tokens :generate-predefined + {:iss :profile-identity + :profile-id (:id profile)})}) + result (#'awsns/parse-notification cfg report)] + ;; (pprint result) + (t/is (= "complaint" (:type result))) + (t/is (= "abuse" (:kind result))) + (t/is (= nil (:category result))) + (t/is (= ["user@example.com"] (into [] (:recipients result)))) + (t/is (= (:id profile) (:profile-id result))) + )) + +(t/deftest test-parse-complaint-report-without-token + (let [tokens (:app.tokens/tokens th/*system*) + cfg {:tokens tokens} + report (complaint-report {:token ""}) + result (#'awsns/parse-notification cfg report)] + (t/is (= "complaint" (:type result))) + (t/is (= "abuse" (:kind result))) + (t/is (= nil (:category result))) + (t/is (= ["user@example.com"] (into [] (:recipients result)))) + (t/is (= nil (:profile-id result))) + )) + +(t/deftest test-process-bounce-report + (let [profile (th/create-profile* 1) + tokens (:app.tokens/tokens th/*system*) + pool (:app.db/pool th/*system*) + cfg {:tokens tokens :pool pool} + report (bounce-report {:token (tokens :generate-predefined + {:iss :profile-identity + :profile-id (:id profile)})}) + report (#'awsns/parse-notification cfg report)] + + (#'awsns/process-report cfg report) + + (let [rows (->> (db/query pool :profile-complaint-report {:profile-id (:id profile)}) + (mapv decode-row))] + (t/is (= 1 (count rows))) + (t/is (= "bounce" (get-in rows [0 :type]))) + (t/is (= "2021-02-04T14:41:38.000Z" (get-in rows [0 :content :timestamp])))) + + (let [rows (->> (db/query pool :global-complaint-report :all) + (mapv decode-row))] + (t/is (= 1 (count rows))) + (t/is (= "bounce" (get-in rows [0 :type]))) + (t/is (= "user@example.com" (get-in rows [0 :email])))) + + (let [prof (db/get-by-id pool :profile (:id profile))] + (t/is (false? (:is-muted prof)))) + + )) + +(t/deftest test-process-complaint-report + (let [profile (th/create-profile* 1) + tokens (:app.tokens/tokens th/*system*) + pool (:app.db/pool th/*system*) + cfg {:tokens tokens :pool pool} + report (complaint-report {:token (tokens :generate-predefined + {:iss :profile-identity + :profile-id (:id profile)})}) + report (#'awsns/parse-notification cfg report)] + + (#'awsns/process-report cfg report) + + (let [rows (->> (db/query pool :profile-complaint-report {:profile-id (:id profile)}) + (mapv decode-row))] + (t/is (= 1 (count rows))) + (t/is (= "complaint" (get-in rows [0 :type]))) + (t/is (= "2021-02-05T08:31:15.000Z" (get-in rows [0 :content :timestamp])))) + + + (let [rows (->> (db/query pool :global-complaint-report :all) + (mapv decode-row))] + (t/is (= 1 (count rows))) + (t/is (= "complaint" (get-in rows [0 :type]))) + (t/is (= "user@example.com" (get-in rows [0 :email])))) + + + (let [prof (db/get-by-id pool :profile (:id profile))] + (t/is (false? (:is-muted prof)))) + + )) + +(t/deftest test-process-bounce-report-to-self + (let [profile (th/create-profile* 1) + tokens (:app.tokens/tokens th/*system*) + pool (:app.db/pool th/*system*) + cfg {:tokens tokens :pool pool} + report (bounce-report {:email (:email profile) + :token (tokens :generate-predefined + {:iss :profile-identity + :profile-id (:id profile)})}) + report (#'awsns/parse-notification cfg report)] + + (#'awsns/process-report cfg report) + + (let [rows (db/query pool :profile-complaint-report {:profile-id (:id profile)})] + (t/is (= 1 (count rows)))) + + (let [rows (db/query pool :global-complaint-report :all)] + (t/is (= 1 (count rows)))) + + (let [prof (db/get-by-id pool :profile (:id profile))] + (t/is (true? (:is-muted prof)))))) + +(t/deftest test-process-complaint-report-to-self + (let [profile (th/create-profile* 1) + tokens (:app.tokens/tokens th/*system*) + pool (:app.db/pool th/*system*) + cfg {:tokens tokens :pool pool} + report (complaint-report {:email (:email profile) + :token (tokens :generate-predefined + {:iss :profile-identity + :profile-id (:id profile)})}) + report (#'awsns/parse-notification cfg report)] + + (#'awsns/process-report cfg report) + + (let [rows (db/query pool :profile-complaint-report {:profile-id (:id profile)})] + (t/is (= 1 (count rows)))) + + (let [rows (db/query pool :global-complaint-report :all)] + (t/is (= 1 (count rows)))) + + (let [prof (db/get-by-id pool :profile (:id profile))] + (t/is (true? (:is-muted prof)))))) + +(t/deftest test-allow-send-messages-predicate-with-bounces + (with-mocks [mock {:target 'app.config/get + :return (th/mock-config-get-with + {:profile-bounce-threshold 3 + :profile-complaint-threshold 2})}] + (let [profile (th/create-profile* 1) + pool (:app.db/pool th/*system*)] + (th/create-complaint-for pool {:type :bounce :id (:id profile) :created-at (dt/in-past {:days 8})}) + (th/create-complaint-for pool {:type :bounce :id (:id profile)}) + (th/create-complaint-for pool {:type :bounce :id (:id profile)}) + + (t/is (true? (emails/allow-send-emails? pool profile))) + (t/is (= 4 (:call-count (deref mock)))) + + (th/create-complaint-for pool {:type :bounce :id (:id profile)}) + (t/is (false? (emails/allow-send-emails? pool profile)))))) + + +(t/deftest test-allow-send-messages-predicate-with-complaints + (with-mocks [mock {:target 'app.config/get + :return (th/mock-config-get-with + {:profile-bounce-threshold 3 + :profile-complaint-threshold 2})}] + (let [profile (th/create-profile* 1) + pool (:app.db/pool th/*system*)] + (th/create-complaint-for pool {:type :bounce :id (:id profile) :created-at (dt/in-past {:days 8})}) + (th/create-complaint-for pool {:type :bounce :id (:id profile) :created-at (dt/in-past {:days 8})}) + (th/create-complaint-for pool {:type :bounce :id (:id profile)}) + (th/create-complaint-for pool {:type :bounce :id (:id profile)}) + (th/create-complaint-for pool {:type :complaint :id (:id profile)}) + + (t/is (true? (emails/allow-send-emails? pool profile))) + (t/is (= 4 (:call-count (deref mock)))) + + (th/create-complaint-for pool {:type :complaint :id (:id profile)}) + (t/is (false? (emails/allow-send-emails? pool profile)))))) + +(t/deftest test-has-complaint-reports-predicate + (let [profile (th/create-profile* 1) + pool (:app.db/pool th/*system*)] + + (t/is (false? (emails/has-complaint-reports? pool (:email profile)))) + + (th/create-global-complaint-for pool {:type :bounce :email (:email profile)}) + (t/is (false? (emails/has-complaint-reports? pool (:email profile)))) + + (th/create-global-complaint-for pool {:type :complaint :email (:email profile)}) + (t/is (true? (emails/has-complaint-reports? pool (:email profile)))))) + +(t/deftest test-has-bounce-reports-predicate + (let [profile (th/create-profile* 1) + pool (:app.db/pool th/*system*)] + + (t/is (false? (emails/has-bounce-reports? pool (:email profile)))) + + (th/create-global-complaint-for pool {:type :complaint :email (:email profile)}) + (t/is (false? (emails/has-bounce-reports? pool (:email profile)))) + + (th/create-global-complaint-for pool {:type :bounce :email (:email profile)}) + (t/is (true? (emails/has-bounce-reports? pool (:email profile)))))) diff --git a/backend/tests/app/tests/test_emails.clj b/backend/tests/app/tests/test_emails.clj index 1ab3eca1e..7381f510a 100644 --- a/backend/tests/app/tests/test_emails.clj +++ b/backend/tests/app/tests/test_emails.clj @@ -11,7 +11,6 @@ (:require [clojure.test :as t] [promesa.core :as p] - [mockery.core :refer [with-mock]] [app.db :as db] [app.emails :as emails] [app.tests.helpers :as th])) diff --git a/backend/tests/app/tests/test_services_profile.clj b/backend/tests/app/tests/test_services_profile.clj index e6c9bf6ab..b355285e5 100644 --- a/backend/tests/app/tests/test_services_profile.clj +++ b/backend/tests/app/tests/test_services_profile.clj @@ -18,6 +18,9 @@ [app.rpc.mutations.profile :as profile] [app.tests.helpers :as th])) +;; TODO: profile deletion with teams +;; TODO: profile deletion with owner teams + (t/use-fixtures :once th/state-init) (t/use-fixtures :each th/database-reset) @@ -187,11 +190,6 @@ (t/testing "not allowed email domain" (t/is (false? (profile/email-domain-in-whitelist? whitelist "username@somedomain.com")))))) -;; TODO: profile deletion with teams -;; TODO: profile deletion with owner teams -;; TODO: profile registration -;; TODO: profile password recovery - (t/deftest test-register-when-registration-disabled (with-mocks [mock {:target 'app.config/get :return (th/mock-config-get-with @@ -267,8 +265,7 @@ (t/is (= (:code edata) :email-has-permanent-bounces)))))) (t/deftest test-register-profile-with-complained-email - (with-mocks [mock {:target 'app.emails/send! - :return nil}] + (with-mocks [mock {:target 'app.emails/send! :return nil}] (let [pool (:app.db/pool th/*system*) data {::th/type :register-profile :email "user@example.com" @@ -282,3 +279,86 @@ (let [result (:result out)] (t/is (= (:email data) (:email result))))))) + +(t/deftest test-email-change-request + (with-mocks [mock {:target 'app.emails/send! :return nil}] + (let [profile (th/create-profile* 1) + pool (:app.db/pool th/*system*) + data {::th/type :request-email-change + :profile-id (:id profile) + :email "user1@example.com"}] + + ;; without complaints + (let [out (th/mutation! data)] + ;; (th/print-result! out) + (t/is (nil? (:result out))) + (let [mock (deref mock)] + (t/is (= 1 (:call-count mock))) + (t/is (true? (:called? mock))))) + + ;; with complaints + (th/create-global-complaint-for pool {:type :complaint :email (:email data)}) + (let [out (th/mutation! data)] + ;; (th/print-result! out) + (t/is (nil? (:result out))) + (t/is (= 2 (:call-count (deref mock))))) + + ;; with bounces + (th/create-global-complaint-for pool {:type :bounce :email (:email data)}) + (let [out (th/mutation! data) + error (:error out)] + ;; (th/print-result! out) + (t/is (th/ex-info? error)) + (t/is (th/ex-of-type? error :validation)) + (t/is (th/ex-of-code? error :email-has-permanent-bounces)) + (t/is (= 2 (:call-count (deref mock)))))))) + +(t/deftest test-request-profile-recovery + (with-mocks [mock {:target 'app.emails/send! :return nil}] + (let [profile1 (th/create-profile* 1) + profile2 (th/create-profile* 2 {:is-active true}) + pool (:app.db/pool th/*system*) + data {::th/type :request-profile-recovery}] + + ;; with invalid email + (let [data (assoc data :email "foo@bar.com") + out (th/mutation! data)] + (t/is (nil? (:result out))) + (t/is (= 0 (:call-count (deref mock))))) + + ;; with valid email inactive user + (let [data (assoc data :email (:email profile1)) + out (th/mutation! data) + error (:error out)] + (t/is (= 0 (:call-count (deref mock)))) + (t/is (th/ex-info? error)) + (t/is (th/ex-of-type? error :validation)) + (t/is (th/ex-of-code? error :profile-not-verified))) + + ;; with valid email and active user + (let [data (assoc data :email (:email profile2)) + out (th/mutation! data)] + ;; (th/print-result! out) + (t/is (nil? (:result out))) + (t/is (= 1 (:call-count (deref mock))))) + + ;; with valid email and active user with global complaints + (th/create-global-complaint-for pool {:type :complaint :email (:email profile2)}) + (let [data (assoc data :email (:email profile2)) + out (th/mutation! data)] + ;; (th/print-result! out) + (t/is (nil? (:result out))) + (t/is (= 2 (:call-count (deref mock))))) + + ;; with valid email and active user with global bounce + (th/create-global-complaint-for pool {:type :bounce :email (:email profile2)}) + (let [data (assoc data :email (:email profile2)) + out (th/mutation! data) + error (:error out)] + ;; (th/print-result! out) + (t/is (= 2 (:call-count (deref mock)))) + (t/is (th/ex-info? error)) + (t/is (th/ex-of-type? error :validation)) + (t/is (th/ex-of-code? error :email-has-permanent-bounces))) + + ))) diff --git a/backend/tests/app/tests/test_services_teams.clj b/backend/tests/app/tests/test_services_teams.clj new file mode 100644 index 000000000..da6ddb688 --- /dev/null +++ b/backend/tests/app/tests/test_services_teams.clj @@ -0,0 +1,88 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2020 UXBOX Labs SL + +(ns app.tests.test-services-teams + (:require + [app.common.uuid :as uuid] + [app.db :as db] + [app.http :as http] + [app.storage :as sto] + [app.tests.helpers :as th] + [mockery.core :refer [with-mocks]] + [clojure.test :as t] + [datoteka.core :as fs])) + +(t/use-fixtures :once th/state-init) +(t/use-fixtures :each th/database-reset) + +(t/deftest test-invite-team-member + (with-mocks [mock {:target 'app.emails/send! :return nil}] + (let [profile1 (th/create-profile* 1 {:is-active true}) + profile2 (th/create-profile* 2 {:is-active true}) + profile3 (th/create-profile* 3 {:is-active true :is-muted true}) + + team (th/create-team* 1 {:profile-id (:id profile1)}) + + pool (:app.db/pool th/*system*) + data {::th/type :invite-team-member + :team-id (:id team) + :role :editor + :profile-id (:id profile1)}] + + ;; (th/print-result! out) + + ;; invite external user without complaints + (let [data (assoc data :email "foo@bar.com") + out (th/mutation! data)] + (t/is (nil? (:result out))) + (t/is (= 1 (:call-count (deref mock))))) + + ;; invite internal user without complaints + (th/reset-mock! mock) + (let [data (assoc data :email (:email profile2)) + out (th/mutation! data)] + (t/is (nil? (:result out))) + (t/is (= 1 (:call-count (deref mock))))) + + ;; invite user with complaint + (th/create-global-complaint-for pool {:type :complaint :email "foo@bar.com"}) + (th/reset-mock! mock) + (let [data (assoc data :email "foo@bar.com") + out (th/mutation! data)] + (t/is (nil? (:result out))) + (t/is (= 1 (:call-count (deref mock))))) + + ;; invite user with bounce + (th/reset-mock! mock) + (th/create-global-complaint-for pool {:type :bounce :email "foo@bar.com"}) + (let [data (assoc data :email "foo@bar.com") + out (th/mutation! data) + error (:error out)] + + (t/is (th/ex-info? error)) + (t/is (th/ex-of-type? error :validation)) + (t/is (th/ex-of-code? error :email-has-permanent-bounces)) + (t/is (= 0 (:call-count (deref mock))))) + + ;; invite internal user that is muted + (th/reset-mock! mock) + (let [data (assoc data :email (:email profile3)) + out (th/mutation! data) + error (:error out)] + + (t/is (th/ex-info? error)) + (t/is (th/ex-of-type? error :validation)) + (t/is (th/ex-of-code? error :member-is-muted)) + (t/is (= 0 (:call-count (deref mock))))) + + ))) + + + + diff --git a/docker/devenv/files/nginx.conf b/docker/devenv/files/nginx.conf index 04c8fd453..a4b13cb73 100644 --- a/docker/devenv/files/nginx.conf +++ b/docker/devenv/files/nginx.conf @@ -99,6 +99,10 @@ http { proxy_pass http://127.0.0.1:6060/api; } + location /webhooks { + proxy_pass http://127.0.0.1:6060/webhooks; + } + location /dbg { proxy_pass http://127.0.0.1:6060/dbg; } diff --git a/frontend/resources/locales.json b/frontend/resources/locales.json index 46f51b44e..322c7bd72 100644 --- a/frontend/resources/locales.json +++ b/frontend/resources/locales.json @@ -836,6 +836,28 @@ "es" : "Autenticación con google esta dehabilitada en el servidor" } }, + + "errors.profile-is-muted" : { + "translations" : { + "en" : "Your profile has emails muted (spam reports or high bounces).", + "es" : "Tu perfil tiene los emails silenciados (por reportes de spam o alto indice de rebote)." + } + }, + + "errors.member-is-muted" : { + "translations" : { + "en" : "The profile you inviting has emails muted (spam reports or high bounces).", + "es" : "El perfil que esta invitando tiene los emails silenciados (por reportes de spam o alto indice de rebote)." + } + }, + + "errors.email-has-permanent-bounces" : { + "translations" : { + "en" : "The email «%s» has many permanent bounce reports.", + "es" : "El email «%s» tiene varios reportes de rebote permanente." + } + }, + "errors.auth.unauthorized" : { "used-in" : [ "src/app/main/ui/auth/login.cljs:89" ], "translations" : { diff --git a/frontend/src/app/main/ui/auth/recovery_request.cljs b/frontend/src/app/main/ui/auth/recovery_request.cljs index 19f4daadd..9a0e0db0b 100644 --- a/frontend/src/app/main/ui/auth/recovery_request.cljs +++ b/frontend/src/app/main/ui/auth/recovery_request.cljs @@ -18,9 +18,9 @@ [app.util.dom :as dom] [app.util.i18n :as i18n :refer [tr t]] [app.util.router :as rt] + [beicon.core :as rx] [cljs.spec.alpha :as s] [cuerdas.core :as str] - [beicon.core :as rx] [rumext.alpha :as mf])) (s/def ::email ::us/email) @@ -28,37 +28,41 @@ (mf/defc recovery-form [] - (let [form (fm/use-form :spec ::recovery-request-form - :initial {}) - + (let [form (fm/use-form :spec ::recovery-request-form :initial {}) submitted (mf/use-state false) - on-error - (mf/use-callback - (fn [{:keys [code] :as error}] - (reset! submitted false) - (if (= code :profile-not-verified) - (rx/of (dm/error (tr "auth.notifications.profile-not-verified") - {:timeout nil})) - - (rx/throw error)))) - on-success (mf/use-callback - (fn [] + (fn [data] (reset! submitted false) (st/emit! (dm/info (tr "auth.notifications.recovery-token-sent")) (rt/nav :auth-login)))) + on-error + (mf/use-callback + (fn [data {:keys [code] :as error}] + (reset! submitted false) + (case code + :profile-not-verified + (rx/of (dm/error (tr "auth.notifications.profile-not-verified") {:timeout nil})) + + :profile-is-muted + (rx/of (dm/error (tr "errors.profile-is-muted"))) + + :email-has-permanent-bounces + (rx/of (dm/error (tr "errors.email-has-permanent-bounces" (:email data)))) + + (rx/throw error)))) + on-submit (mf/use-callback (fn [] (reset! submitted true) - (->> (with-meta (:clean-data @form) - {:on-success on-success - :on-error on-error}) - (uda/request-profile-recovery) - (st/emit!))))] + (let [cdata (:clean-data @form) + params (with-meta cdata + {:on-success #(on-success cdata %) + :on-error #(on-error cdata %)})] + (st/emit! (uda/request-profile-recovery params)))))] [:& fm/form {:on-submit on-submit :form form} diff --git a/frontend/src/app/main/ui/auth/register.cljs b/frontend/src/app/main/ui/auth/register.cljs index 9d76bd2b9..96635d64b 100644 --- a/frontend/src/app/main/ui/auth/register.cljs +++ b/frontend/src/app/main/ui/auth/register.cljs @@ -64,13 +64,17 @@ (reset! submitted? false) (case (:code error) :registration-disabled - (st/emit! (dm/error (tr "errors.registration-disabled"))) + (rx/of (dm/error (tr "errors.registration-disabled"))) + + :email-has-permanent-bounces + (let [email (get @form [:data :email])] + (rx/of (dm/error (tr "errors.email-has-permanent-bounces" email)))) :email-already-exists (swap! form assoc-in [:errors :email] {:message "errors.email-already-exists"}) - (st/emit! (dm/error (tr "errors.unexpected-error")))))) + (rx/throw error)))) on-success (mf/use-callback diff --git a/frontend/src/app/main/ui/dashboard/team.cljs b/frontend/src/app/main/ui/dashboard/team.cljs index 85ea34d9d..2ab438bdd 100644 --- a/frontend/src/app/main/ui/dashboard/team.cljs +++ b/frontend/src/app/main/ui/dashboard/team.cljs @@ -97,13 +97,34 @@ (st/emitf (dm/success "Invitation sent successfully") (modal/hide))) + on-error + (mf/use-callback + (mf/deps team) + (fn [form {:keys [type code] :as error}] + (let [email (get @form [:data :email])] + (cond + (and (= :validation type) + (= :profile-is-muted code)) + (dm/error (tr "errors.profile-is-muted")) + + (and (= :validation type) + (= :member-is-muted code)) + (dm/error (tr "errors.member-is-muted")) + + (and (= :validation type) + (= :email-has-permanent-bounces)) + (dm/error (tr "errors.email-has-permanent-bounces" email)) + + :else + (dm/error (tr "errors.generic")))))) on-submit (mf/use-callback (mf/deps team) (fn [form] (let [params (:clean-data @form) - mdata {:on-success (partial on-success form)}] + mdata {:on-success (partial on-success form) + :on-error (partial on-error form)}] (st/emit! (dd/invite-team-member (with-meta params mdata))))))] [:div.modal.dashboard-invite-modal.form-container diff --git a/frontend/src/app/main/ui/settings/change_email.cljs b/frontend/src/app/main/ui/settings/change_email.cljs index cdad1a33e..f4c665f77 100644 --- a/frontend/src/app/main/ui/settings/change_email.cljs +++ b/frontend/src/app/main/ui/settings/change_email.cljs @@ -40,14 +40,20 @@ (s/keys :req-un [::email-1 ::email-2])) (defn- on-error - [form error] - (cond - (= (:code error) :email-already-exists) + [form {:keys [code] :as error}] + (case code + :email-already-exists (swap! form (fn [data] (let [error {:message (tr "errors.email-already-exists")}] (assoc-in data [:errors :email-1] error)))) - :else + :profile-is-muted + (rx/of (dm/error (tr "errors.profile-is-muted"))) + + :email-has-permanent-bounces + (let [email (get @form [:data email])] + (rx/of (dm/error (tr "errors.email-has-permanent-bounces" email)))) + (rx/throw error))) (defn- on-success From fb0c1f548b3513ef8ddafe2c347c09dbb9edaeee Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 11 Feb 2021 18:04:02 +0100 Subject: [PATCH 05/90] :paperclip: Update changelog. --- CHANGES.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 3a4da21ef..ae34729d9 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,8 +3,16 @@ ## Next ### New features + +- Bounce & Complaint handling. + + ### Bugs fixed +- Properly handle errors on github, gitlab and ldap auth backends. +- Properly mark profile auth backend (on first register/ auth with 3rd party auth provider). + + ## 1.2.0-alpha From 0c0f26bb187da3af3b8b505bf0c1f4aa4d6e4717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Moya?= Date: Fri, 12 Feb 2021 16:57:18 +0100 Subject: [PATCH 06/90] :bug: Fix two small typos --- frontend/src/app/main/ui/auth/register.cljs | 1 + frontend/src/app/main/ui/settings/change_email.cljs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/app/main/ui/auth/register.cljs b/frontend/src/app/main/ui/auth/register.cljs index 96635d64b..c5acb1dac 100644 --- a/frontend/src/app/main/ui/auth/register.cljs +++ b/frontend/src/app/main/ui/auth/register.cljs @@ -23,6 +23,7 @@ [app.util.i18n :refer [tr t]] [app.util.router :as rt] [app.util.timers :as tm] + [beicon.core :as rx] [cljs.spec.alpha :as s] [cuerdas.core :as str] [rumext.alpha :as mf])) diff --git a/frontend/src/app/main/ui/settings/change_email.cljs b/frontend/src/app/main/ui/settings/change_email.cljs index f4c665f77..b35bc8af3 100644 --- a/frontend/src/app/main/ui/settings/change_email.cljs +++ b/frontend/src/app/main/ui/settings/change_email.cljs @@ -51,7 +51,7 @@ (rx/of (dm/error (tr "errors.profile-is-muted"))) :email-has-permanent-bounces - (let [email (get @form [:data email])] + (let [email (get @form [:data :email-1])] (rx/of (dm/error (tr "errors.email-has-permanent-bounces" email)))) (rx/throw error))) From d8104f0d224a67878a5c218a3e102eb042bdd171 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Mon, 15 Feb 2021 11:09:15 +0100 Subject: [PATCH 07/90] :bug: Fix problem width handoff code generation --- CHANGES.md | 2 +- frontend/src/app/main/ui/shapes/filters.cljs | 51 +++++++++++--------- frontend/src/app/main/ui/shapes/frame.cljs | 9 ++-- frontend/src/app/main/ui/shapes/shape.cljs | 18 +++++-- 4 files changed, 47 insertions(+), 33 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ae34729d9..b51985f55 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,7 +11,7 @@ - Properly handle errors on github, gitlab and ldap auth backends. - Properly mark profile auth backend (on first register/ auth with 3rd party auth provider). - +- Fix problem width handoff code generation [Taiga #1204](https://tree.taiga.io/project/penpot/issue/1204) ## 1.2.0-alpha diff --git a/frontend/src/app/main/ui/shapes/filters.cljs b/frontend/src/app/main/ui/shapes/filters.cljs index 72badd7ad..f530dc169 100644 --- a/frontend/src/app/main/ui/shapes/filters.cljs +++ b/frontend/src/app/main/ui/shapes/filters.cljs @@ -124,33 +124,36 @@ (defn get-filters-bounds [shape filters blur-value] - (if (and (= :svg-raw (:type shape)) - (not= :svg (get-in shape [:content :tag]))) + (let [svg-root? (and (= :svg-raw (:type shape)) (not= :svg (get-in shape [:content :tag]))) + frame? (= :frame (:type shape)) + {:keys [x y width height]} (:selrect shape)] + (if svg-root? + ;; When is a raw-svg but not the root we use the whole svg as bound for the filter. Is the maximum + ;; we're allowed to display + {:x 0 :y 0 :width width :height height} - ;; When is a raw-svg but not the root we use the whole svg as bound for the filter. Is the maximum - ;; we're allowed to display - {:x 0 :y 0 :width (get-in shape [:selrect :width]) :height (get-in shape [:selrect :height])} + ;; Otherwise we calculate the bound + (let [filter-bounds (->> filters + (filter #(= :drop-shadow (:type %))) + (map (partial filter-bounds shape) )) + ;; We add the selrect so the minimum size will be the selrect + filter-bounds (conj filter-bounds (:selrect shape)) + x1 (apply min (map :x1 filter-bounds)) + y1 (apply min (map :y1 filter-bounds)) + x2 (apply max (map :x2 filter-bounds)) + y2 (apply max (map :y2 filter-bounds)) - ;; Otherwise we calculate the bound - (let [filter-bounds (->> filters - (filter #(= :drop-shadow (:type %))) - (map (partial filter-bounds shape) )) - ;; We add the selrect so the minimum size will be the selrect - filter-bounds (conj filter-bounds (:selrect shape)) - x1 (apply min (map :x1 filter-bounds)) - y1 (apply min (map :y1 filter-bounds)) - x2 (apply max (map :x2 filter-bounds)) - y2 (apply max (map :y2 filter-bounds)) + x1 (- x1 (* blur-value 2)) + x2 (+ x2 (* blur-value 2)) + y1 (- y1 (* blur-value 2)) + y2 (+ y2 (* blur-value 2))] - x1 (- x1 (* blur-value 2)) - x2 (+ x2 (* blur-value 2)) - y1 (- y1 (* blur-value 2)) - y2 (+ y2 (* blur-value 2))] - - {:x x1 - :y y1 - :width (- x2 x1) - :height (- y2 y1)}))) + ;; We should move the frame filter coordinates because they should be + ;; relative with the frame. By default they come as absolute + {:x (if frame? (- x1 x) x1) + :y (if frame? (- y1 y) y1) + :width (- x2 x1) + :height (- y2 y1)})))) (defn blur-filters [type value] (->> [value] diff --git a/frontend/src/app/main/ui/shapes/frame.cljs b/frontend/src/app/main/ui/shapes/frame.cljs index 55b39bb1b..cf5c0d138 100644 --- a/frontend/src/app/main/ui/shapes/frame.cljs +++ b/frontend/src/app/main/ui/shapes/frame.cljs @@ -32,11 +32,10 @@ #js {:x 0 :y 0 :width width - :height height}))] - [:svg {:x x :y y :width width :height height - :xmlnsXlink "http://www.w3.org/1999/xlink" - :xmlns "http://www.w3.org/2000/svg"} - [:> "rect" props] + :height height + :className "frame-background"}))] + [:* + [:> :rect props] (for [[i item] (d/enumerate childs)] [:& shape-wrapper {:frame shape :shape item diff --git a/frontend/src/app/main/ui/shapes/shape.cljs b/frontend/src/app/main/ui/shapes/shape.cljs index 62760374e..08953de39 100644 --- a/frontend/src/app/main/ui/shapes/shape.cljs +++ b/frontend/src/app/main/ui/shapes/shape.cljs @@ -27,14 +27,26 @@ filter-id (str "filter_" render-id) styles (cond-> (obj/new) (:blocked shape) (obj/set! "pointerEvents" "none")) + + {:keys [x y width height type]} shape + frame? (= :frame type) group-props (-> (obj/clone props) (obj/without ["shape" "children"]) (obj/set! "id" (str "shape-" (:id shape))) - (obj/set! "className" (str "shape " (:type shape))) (obj/set! "filter" (filters/filter-str filter-id shape)) - (obj/set! "style" styles))] + (obj/set! "style" styles) + + (cond-> frame? + (-> (obj/set! "x" x) + (obj/set! "y" y) + (obj/set! "width" width) + (obj/set! "height" height) + (obj/set! "xmlnsXlink" "http://www.w3.org/1999/xlink") + (obj/set! "xmlns" "http://www.w3.org/2000/svg")))) + + wrapper-tag (if frame? "svg" "g")] [:& (mf/provider muc/render-ctx) {:value render-id} - [:> :g group-props + [:> wrapper-tag group-props [:defs [:& filters/filters {:shape shape :filter-id filter-id}] [:& grad/gradient {:shape shape :attr :fill-color-gradient}] From 6c2b5ff0c70d8927b73af34148d3f397a8fbe222 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Fri, 12 Feb 2021 11:22:29 +0100 Subject: [PATCH 08/90] :sparkles: Control key to hide group interactions --- frontend/src/app/main/streams.cljs | 17 ++++++- .../src/app/main/ui/workspace/effects.cljs | 2 - .../src/app/main/ui/workspace/selection.cljs | 36 +++++++------- .../app/main/ui/workspace/shapes/group.cljs | 48 +++++++++++-------- .../src/app/main/ui/workspace/viewport.cljs | 38 ++++++++------- 5 files changed, 86 insertions(+), 55 deletions(-) diff --git a/frontend/src/app/main/streams.cljs b/frontend/src/app/main/streams.cljs index b8a8e952a..3529d2776 100644 --- a/frontend/src/app/main/streams.cljs +++ b/frontend/src/app/main/streams.cljs @@ -15,7 +15,7 @@ ;; --- User Events -(defrecord KeyboardEvent [type key shift ctrl alt]) +(defrecord KeyboardEvent [type key shift ctrl alt meta]) (defn keyboard-event? [v] @@ -120,6 +120,21 @@ (rx/map (constantly false)))) (rx/dedupe))] (rx/subscribe-with ob sub) + sub)) + +(defonce keyboard-ctrl + (let [sub (rx/behavior-subject nil) + ob (->> (rx/merge + (->> st/stream + (rx/filter keyboard-event?) + (rx/map :ctrl)) + ;; Fix a situation caused by using `ctrl+alt` kind of shortcuts, + ;; that makes keyboard-alt stream registring the key pressed but + ;; on bluring the window (unfocus) the key down is never arrived. + (->> window-blur + (rx/map (constantly false)))) + (rx/dedupe))] + (rx/subscribe-with ob sub) sub)) (defn mouse-position-deltas diff --git a/frontend/src/app/main/ui/workspace/effects.cljs b/frontend/src/app/main/ui/workspace/effects.cljs index a0ae1fd3c..84a69c299 100644 --- a/frontend/src/app/main/ui/workspace/effects.cljs +++ b/frontend/src/app/main/ui/workspace/effects.cljs @@ -52,11 +52,9 @@ drawing? @refs/selected-drawing-tool button (.-which (.-nativeEvent event)) shift? (kbd/shift? event) - ctrl? (or (kbd/ctrl? event) (kbd/meta? event)) allow-click? (and (not blocked) (not drawing?) - (not ctrl?) (not edition))] (when (and (= button 1) allow-click?) diff --git a/frontend/src/app/main/ui/workspace/selection.cljs b/frontend/src/app/main/ui/workspace/selection.cljs index ddfb7b0b1..6a395336d 100644 --- a/frontend/src/app/main/ui/workspace/selection.cljs +++ b/frontend/src/app/main/ui/workspace/selection.cljs @@ -10,29 +10,30 @@ (ns app.main.ui.workspace.selection "Selection handlers component." (:require - [beicon.core :as rx] - [cuerdas.core :as str] - [potok.core :as ptk] - [rumext.alpha :as mf] - [rumext.util :refer [map->obj]] + [app.common.geom.matrix :as gmt] + [app.common.geom.point :as gpt] + [app.common.geom.shapes :as geom] + [app.common.math :as mth] [app.common.uuid :as uuid] - [app.util.data :as d] [app.main.data.workspace :as dw] [app.main.data.workspace.common :as dwc] [app.main.refs :as refs] [app.main.store :as st] [app.main.streams :as ms] [app.main.ui.cursors :as cur] - [app.common.math :as mth] + [app.main.ui.hooks :as hooks] + [app.main.ui.measurements :as msr] + [app.main.ui.workspace.shapes.outline :refer [outline]] + [app.main.ui.workspace.shapes.path.editor :refer [path-editor]] + [app.util.data :as d] + [app.util.debug :refer [debug?]] [app.util.dom :as dom] [app.util.object :as obj] - [app.common.geom.shapes :as geom] - [app.common.geom.point :as gpt] - [app.common.geom.matrix :as gmt] - [app.util.debug :refer [debug?]] - [app.main.ui.workspace.shapes.outline :refer [outline]] - [app.main.ui.measurements :as msr] - [app.main.ui.workspace.shapes.path.editor :refer [path-editor]])) + [beicon.core :as rx] + [cuerdas.core :as str] + [potok.core :as ptk] + [rumext.alpha :as mf] + [rumext.util :refer [map->obj]])) (def rotation-handler-size 20) (def resize-point-radius 4) @@ -235,19 +236,22 @@ (mf/defc controls {::mf/wrap-props false} [props] - (let [{:keys [overflow-text] :as shape} (obj/get props "shape") + (let [{:keys [overflow-text type] :as shape} (obj/get props "shape") zoom (obj/get props "zoom") color (obj/get props "color") on-resize (obj/get props "on-resize") on-rotate (obj/get props "on-rotate") current-transform (mf/deref refs/current-transform) + hide? (mf/use-state false) selrect (-> (:selrect shape) minimum-selrect) transform (geom/transform-matrix shape {:no-flip true})] + (hooks/use-stream ms/keyboard-ctrl #(when (= type :group) (reset! hide? %))) + (when (not (#{:move :rotate} current-transform)) - [:g.controls + [:g.controls {:style {:display (when @hide? "none")}} ;; Selection rect [:& selection-rect {:rect selrect diff --git a/frontend/src/app/main/ui/workspace/shapes/group.cljs b/frontend/src/app/main/ui/workspace/shapes/group.cljs index f3f4cc3c5..bb8ac5c04 100644 --- a/frontend/src/app/main/ui/workspace/shapes/group.cljs +++ b/frontend/src/app/main/ui/workspace/shapes/group.cljs @@ -9,17 +9,18 @@ (ns app.main.ui.workspace.shapes.group (:require + [app.common.geom.shapes :as gsh] [app.main.data.workspace :as dw] [app.main.refs :as refs] [app.main.store :as st] [app.main.streams :as ms] + [app.main.ui.hooks :as hooks] [app.main.ui.shapes.group :as group] [app.main.ui.shapes.shape :refer [shape-container]] [app.main.ui.workspace.effects :as we] + [app.util.debug :refer [debug?]] [app.util.dom :as dom] - [rumext.alpha :as mf] - [app.common.geom.shapes :as gsh] - [app.util.debug :refer [debug?]])) + [rumext.alpha :as mf])) (defn use-double-click [{:keys [id]}] (mf/use-callback @@ -40,8 +41,10 @@ frame (unchecked-get props "frame") {:keys [id x y width height]} shape - transform (gsh/transform-matrix shape) + transform (gsh/transform-matrix shape) + + ctrl? (mf/use-state false) childs-ref (mf/use-memo (mf/deps shape) #(refs/objects-by-id (:shapes shape))) childs (mf/deref childs-ref) @@ -59,33 +62,38 @@ is-mask-selected? (mf/deref is-mask-selected-ref) + expand-mask? is-child-selected? + group-interactions? (not (or @ctrl? is-child-selected?)) + handle-mouse-down (we/use-mouse-down shape) handle-context-menu (we/use-context-menu shape) handle-pointer-enter (we/use-pointer-enter shape) handle-pointer-leave (we/use-pointer-leave shape) handle-double-click (use-double-click shape)] + (hooks/use-stream ms/keyboard-ctrl #(reset! ctrl? %)) + [:> shape-container {:shape shape} [:g.group-shape [:& group-shape {:frame frame :shape shape :childs childs - :expand-mask is-mask-selected? - :pointer-events (when (not is-child-selected?) "none")}] + :expand-mask expand-mask? + :pointer-events (when group-interactions? "none")}] - (when-not is-child-selected? - [:rect.group-actions - {:x x - :y y - :fill (if (debug? :group) "red" "transparent") - :opacity 0.5 - :transform transform - :width width - :height height - :on-mouse-down handle-mouse-down - :on-context-menu handle-context-menu - :on-pointer-over handle-pointer-enter - :on-pointer-out handle-pointer-leave - :on-double-click handle-double-click}])]])))) + [:rect.group-actions + {:x x + :y y + :width width + :height height + :transform transform + :style {:pointer-events (when-not group-interactions? "none") + :fill (if (debug? :group) "red" "transparent") + :opacity 0.5} + :on-mouse-down handle-mouse-down + :on-context-menu handle-context-menu + :on-pointer-over handle-pointer-enter + :on-pointer-out handle-pointer-leave + :on-double-click handle-double-click}]]])))) diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs index 0d7f2d6af..b5d79a0db 100644 --- a/frontend/src/app/main/ui/workspace/viewport.cljs +++ b/frontend/src/app/main/ui/workspace/viewport.cljs @@ -219,11 +219,17 @@ (not (:blocked shape)) (not= edition (:id shape)) (outline? (:id shape)))) - shapes (->> (vals objects) (filter show-outline?)) + + remove-groups? (mf/use-state false) + + shapes (cond->> (vals objects) + show-outline? (filter show-outline?) + @remove-groups? (remove #(= :group (:type %)))) transform (mf/deref refs/current-transform) color (if (or (> (count shapes) 1) (nil? (:shape-ref (first shapes)))) "#31EFB8" "#00E0FF")] + (hooks/use-stream ms/keyboard-ctrl #(reset! remove-groups? %)) (when (nil? transform) [:g.outlines (for [shape shapes] @@ -424,16 +430,16 @@ (mf/use-callback (fn [event] (let [target (dom/get-target event)] - ; Capture mouse pointer to detect the movements even if cursor - ; leaves the viewport or the browser itself - ; https://developer.mozilla.org/en-US/docs/Web/API/Element/setPointerCapture + ; Capture mouse pointer to detect the movements even if cursor + ; leaves the viewport or the browser itself + ; https://developer.mozilla.org/en-US/docs/Web/API/Element/setPointerCapture (.setPointerCapture target (.-pointerId event))))) on-pointer-up (mf/use-callback (fn [event] (let [target (dom/get-target event)] - ; Release pointer on mouse up + ; Release pointer on mouse up (.releasePointerCapture target (.-pointerId event))))) on-click @@ -442,9 +448,7 @@ (let [ctrl? (kbd/ctrl? event) shift? (kbd/shift? event) alt? (kbd/alt? event)] - (if ctrl? - (st/emit! (dw/select-last-layer @ms/mouse-position)) - (st/emit! (ms/->MouseEvent :click ctrl? shift? alt?)))))) + (st/emit! (ms/->MouseEvent :click ctrl? shift? alt?))))) on-double-click (mf/use-callback @@ -460,14 +464,15 @@ (mf/use-callback (fn [event] (let [bevent (.getBrowserEvent ^js event) - key (.-keyCode ^js event) - ctrl? (kbd/ctrl? event) + key (.-keyCode ^js event) + ctrl? (kbd/ctrl? event) shift? (kbd/shift? event) - alt? (kbd/alt? event) + alt? (kbd/alt? event) + meta? (kbd/meta? event) target (dom/get-target event)] (when-not (.-repeat bevent) - (st/emit! (ms/->KeyboardEvent :down key ctrl? shift? alt?)) + (st/emit! (ms/->KeyboardEvent :down key shift? ctrl? alt? meta?)) (when (and (kbd/space? event) (not= "rich-text" (obj/get target "className")) (not= "INPUT" (obj/get target "tagName")) @@ -477,13 +482,14 @@ on-key-up (mf/use-callback (fn [event] - (let [key (.-keyCode event) - ctrl? (kbd/ctrl? event) + (let [key (.-keyCode event) + ctrl? (kbd/ctrl? event) shift? (kbd/shift? event) - alt? (kbd/alt? event)] + alt? (kbd/alt? event) + meta? (kbd/meta? event)] (when (kbd/space? event) (st/emit! dw/finish-pan ::finish-positioning)) - (st/emit! (ms/->KeyboardEvent :up key ctrl? shift? alt?))))) + (st/emit! (ms/->KeyboardEvent :up key shift? ctrl? alt? meta?))))) translate-point-to-viewport (mf/use-callback From d86dc608b064401d480d9f9ebf34c3ca48ac1dae Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Fri, 12 Feb 2021 12:12:39 +0100 Subject: [PATCH 09/90] :sparkles: Adds edition shortcut and context menu item --- CHANGES.md | 3 ++- frontend/resources/locales.json | 6 +++++ frontend/src/app/main/data/shortcuts.cljs | 5 ++++ frontend/src/app/main/data/workspace.cljs | 25 +++++++++++++++++++ .../app/main/data/workspace/shortcuts.cljs | 7 +++++- .../app/main/ui/workspace/context_menu.cljs | 21 +++++++++++++--- .../main/ui/workspace/shapes/text/editor.cljs | 8 +++--- 7 files changed, 64 insertions(+), 11 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index b51985f55..c740b6d96 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,7 +5,8 @@ ### New features - Bounce & Complaint handling. - +- Disable groups interactions when holding "Ctrl" key (deep selection) +- New action in context menu to "edit" some shapes (binded to key "Enter") ### Bugs fixed diff --git a/frontend/resources/locales.json b/frontend/resources/locales.json index 322c7bd72..b16baae2f 100644 --- a/frontend/resources/locales.json +++ b/frontend/resources/locales.json @@ -4841,5 +4841,11 @@ "en" : "Flip vertical", "es" : "Voltear vertical" } + }, + "workspace.shape.menu.edit" : { + "translations" : { + "en" : "Edit", + "es" : "Editar" + } } } diff --git a/frontend/src/app/main/data/shortcuts.cljs b/frontend/src/app/main/data/shortcuts.cljs index 48afb5ae5..03800e992 100644 --- a/frontend/src/app/main/data/shortcuts.cljs +++ b/frontend/src/app/main/data/shortcuts.cljs @@ -24,6 +24,7 @@ (def mac-shift "\u21E7") (def mac-control "\u2303") (def mac-esc "\u238B") +(def mac-enter "\u23CE") (def left-arrow "\u2190") (def up-arrow "\u2191") @@ -73,3 +74,7 @@ mac-esc "Escape")) +(defn enter [] + (if (cfg/check-platform? :macos) + mac-enter + "Enter")) diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs index 79d370c33..ab4cb2101 100644 --- a/frontend/src/app/main/data/workspace.cljs +++ b/frontend/src/app/main/data/workspace.cljs @@ -1089,6 +1089,31 @@ (rx/of (relocate-shapes selected parent-id to-index)))))) +(defn start-editing-selected + [] + (ptk/reify ::start-editing-selected + ptk/WatchEvent + (watch [_ state stream] + (let [selected (get-in state [:workspace-local :selected])] + (if-not (= 1 (count selected)) + (rx/empty) + + (let [objects (dwc/lookup-page-objects state) + {:keys [id type shapes]} (get objects (first selected))] + + (case type + :text + (rx/of (dwc/start-edition-mode id)) + + :group + (rx/of (dwc/select-shapes (into (d/ordered-set) [(last shapes)]))) + + :path + (rx/of (dwc/start-edition-mode id) + (dwdp/start-path-edit id)) + :else (rx/empty)))))))) + + ;; --- Change Page Order (D&D Ordering) (defn relocate-page diff --git a/frontend/src/app/main/data/workspace/shortcuts.cljs b/frontend/src/app/main/data/workspace/shortcuts.cljs index 2eda58376..33100459d 100644 --- a/frontend/src/app/main/data/workspace/shortcuts.cljs +++ b/frontend/src/app/main/data/workspace/shortcuts.cljs @@ -255,7 +255,12 @@ :escape {:tooltip (ds/esc) :command "escape" - :fn #(st/emit! (esc-pressed))}}) + :fn #(st/emit! (esc-pressed))} + + :start-editing {:tooltip (ds/enter) + :command "enter" + :fn #(st/emit! (dw/start-editing-selected))} + }) (defn get-tooltip [shortcut] (assert (contains? shortcuts shortcut) (str shortcut)) diff --git a/frontend/src/app/main/ui/workspace/context_menu.cljs b/frontend/src/app/main/ui/workspace/context_menu.cljs index 01c1151d0..7d6c99610 100644 --- a/frontend/src/app/main/ui/workspace/context_menu.cljs +++ b/frontend/src/app/main/ui/workspace/context_menu.cljs @@ -24,6 +24,7 @@ [app.main.ui.icons :as i] [app.util.dom :as dom] [app.util.i18n :refer [t] :as i18n] + [app.util.timers :as timers] [beicon.core :as rx] [okulary.core :as l] [potok.core :as ptk] @@ -53,6 +54,10 @@ {:keys [id] :as shape} (:shape mdata) selected (:selected mdata) + single? (= (count selected) 1) + multiple? (> (count selected) 1) + editable-shape? (#{:group :text :path} (:type shape)) + current-file-id (mf/use-ctx ctx/current-file-id) do-duplicate (st/emitf dw/duplicate-selected) @@ -77,6 +82,9 @@ do-add-component (st/emitf dwl/add-component) do-detach-component (st/emitf (dwl/detach-component id)) do-reset-component (st/emitf (dwl/reset-component id)) + do-start-editing (fn [] + ;; We defer the execution so the mouse event won't close the editor + (timers/schedule #(st/emit! (dw/start-editing-selected)))) do-update-component (st/emitf (dwc/start-undo-transaction) (dwl/update-component id) @@ -99,7 +107,7 @@ :on-accept confirm-update-remote-component})) do-show-component (st/emitf (dw/go-to-layout :assets)) do-navigate-component-file (st/emitf (dwl/nav-to-component-file - (:component-file shape)))] + (:component-file shape)))] [:* [:& menu-entry {:title (t locale "workspace.shape.menu.copy") :shortcut (sc/get-tooltip :copy) @@ -128,7 +136,7 @@ :on-click do-send-to-back}] [:& menu-separator] - (when (> (count selected) 1) + (when multiple? [:* [:& menu-entry {:title (t locale "workspace.shape.menu.group") :shortcut (sc/get-tooltip :group) @@ -138,7 +146,7 @@ :on-click do-mask-group}] [:& menu-separator]]) - (when (>= (count selected) 1) + (when (or single? multiple?) [:* [:& menu-entry {:title (t locale "workspace.shape.menu.flip-vertical") :shortcut (sc/get-tooltip :flip-vertical) @@ -148,7 +156,7 @@ :on-click do-flip-horizontal}] [:& menu-separator]]) - (when (and (= (count selected) 1) (= (:type shape) :group)) + (when (and single? (= (:type shape) :group)) [:* [:& menu-entry {:title (t locale "workspace.shape.menu.ungroup") :shortcut (sc/get-tooltip :ungroup) @@ -161,6 +169,11 @@ :shortcut (sc/get-tooltip :group) :on-click do-mask-group}])]) + (when (and single? editable-shape?) + [:& menu-entry {:title (t locale "workspace.shape.menu.edit") + :shortcut (sc/get-tooltip :start-editing) + :on-click do-start-editing}]) + (if (:hidden shape) [:& menu-entry {:title (t locale "workspace.shape.menu.show") :on-click do-show-shape}] diff --git a/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs b/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs index d279c16fa..c1b638ed0 100644 --- a/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs +++ b/frontend/src/app/main/ui/workspace/shapes/text/editor.cljs @@ -182,11 +182,9 @@ (and self (.contains self target)) (and cpicker (.contains cpicker target)) (and palette (.contains palette target))) - (do - - (if selecting? - (mf/set-ref-val! selecting-ref false) - (on-close)))))) + (if selecting? + (mf/set-ref-val! selecting-ref false) + (on-close))))) on-mouse-down (fn [event] From cd313dc2fef4062d6a8a6b838e34ff60ec111d0f Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Mon, 15 Feb 2021 12:09:18 +0100 Subject: [PATCH 10/90] :sparkles: Changed keyboard streams --- frontend/src/app/main/streams.cljs | 13 ++++++++++--- frontend/src/app/main/ui/keyboard.cljs | 10 ++++++++++ frontend/src/app/main/ui/workspace/viewport.cljs | 5 ++++- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/main/streams.cljs b/frontend/src/app/main/streams.cljs index 3529d2776..969bae465 100644 --- a/frontend/src/app/main/streams.cljs +++ b/frontend/src/app/main/streams.cljs @@ -11,7 +11,8 @@ [app.main.store :as st] [app.main.refs :as refs] [app.common.geom.point :as gpt] - [app.util.globals :as globals])) + [app.util.globals :as globals]) + (:import goog.events.KeyCodes)) ;; --- User Events @@ -112,7 +113,9 @@ ob (->> (rx/merge (->> st/stream (rx/filter keyboard-event?) - (rx/map :alt)) + (rx/filter #(let [key (:key %)] + (= key KeyCodes.ALT))) + (rx/map #(= :down (:type %)))) ;; Fix a situation caused by using `ctrl+alt` kind of shortcuts, ;; that makes keyboard-alt stream registring the key pressed but ;; on bluring the window (unfocus) the key down is never arrived. @@ -127,7 +130,11 @@ ob (->> (rx/merge (->> st/stream (rx/filter keyboard-event?) - (rx/map :ctrl)) + (rx/filter #(let [key (:key %)] + (or + (= key KeyCodes.CTRL) + (= key KeyCodes.META)))) + (rx/map #(= :down (:type %)))) ;; Fix a situation caused by using `ctrl+alt` kind of shortcuts, ;; that makes keyboard-alt stream registring the key pressed but ;; on bluring the window (unfocus) the key down is never arrived. diff --git a/frontend/src/app/main/ui/keyboard.cljs b/frontend/src/app/main/ui/keyboard.cljs index 93e49a6d5..95a59c4e5 100644 --- a/frontend/src/app/main/ui/keyboard.cljs +++ b/frontend/src/app/main/ui/keyboard.cljs @@ -1,3 +1,13 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2020-2021 UXBOX Labs SL + +;; TODO: Move to another namespace (ns app.main.ui.keyboard) (defn is-keycode? diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs index b5d79a0db..a495d37da 100644 --- a/frontend/src/app/main/ui/workspace/viewport.cljs +++ b/frontend/src/app/main/ui/workspace/viewport.cljs @@ -57,7 +57,8 @@ [promesa.core :as p] [rumext.alpha :as mf]) (:import goog.events.EventType - goog.events.WheelEvent)) + goog.events.WheelEvent + goog.events.KeyCodes)) (defonce css-mouse? (cfg/check-browser? :firefox)) @@ -465,6 +466,7 @@ (fn [event] (let [bevent (.getBrowserEvent ^js event) key (.-keyCode ^js event) + key (.normalizeKeyCode KeyCodes key) ctrl? (kbd/ctrl? event) shift? (kbd/shift? event) alt? (kbd/alt? event) @@ -483,6 +485,7 @@ (mf/use-callback (fn [event] (let [key (.-keyCode event) + key (.normalizeKeyCode KeyCodes key) ctrl? (kbd/ctrl? event) shift? (kbd/shift? event) alt? (kbd/alt? event) From baaeb20d6bf2e2d9dfec62e1f7ab51094ec24036 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Mon, 15 Feb 2021 12:15:16 +0100 Subject: [PATCH 11/90] :recycle: Moved namespace for `keyboard` utils --- exporter/src/app/browser.cljs | 9 ++++++++ exporter/src/app/config.cljs | 9 ++++++++ exporter/src/app/core.cljs | 9 ++++++++ exporter/src/app/http.cljs | 9 ++++++++ exporter/src/app/http/export_bitmap.cljs | 9 ++++++++ exporter/src/app/http/export_svg.cljs | 9 ++++++++ exporter/src/app/http/impl.cljs | 9 ++++++++ exporter/src/app/util/transit.cljs | 2 +- exporter/src/app/zipfile.cljs | 9 ++++++++ frontend/src/app/main/ui/comments.cljs | 10 ++++----- .../main/ui/components/editable_label.cljs | 6 ++--- .../app/main/ui/components/numeric_input.cljs | 6 ++--- frontend/src/app/main/ui/confirm.cljs | 10 ++++----- frontend/src/app/main/ui/dashboard/files.cljs | 2 +- frontend/src/app/main/ui/dashboard/grid.cljs | 6 ++--- .../app/main/ui/dashboard/inline_edition.cljs | 2 +- .../src/app/main/ui/dashboard/projects.cljs | 2 +- .../src/app/main/ui/dashboard/sidebar.cljs | 6 ++--- .../src/app/main/ui/dashboard/team_form.cljs | 2 +- frontend/src/app/main/ui/handoff.cljs | 2 +- .../src/app/main/ui/handoff/left_sidebar.cljs | 3 +-- frontend/src/app/main/ui/modal.cljs | 12 +++++----- frontend/src/app/main/ui/viewer.cljs | 6 ++--- frontend/src/app/main/ui/workspace.cljs | 2 +- .../app/main/ui/workspace/colorpalette.cljs | 2 +- .../workspace/colorpicker/pixel_overlay.cljs | 22 +++++++++---------- .../src/app/main/ui/workspace/effects.cljs | 10 ++++----- .../src/app/main/ui/workspace/header.cljs | 2 +- .../app/main/ui/workspace/shapes/frame.cljs | 6 ++--- .../ui/workspace/shapes/interactions.cljs | 16 +++++++------- .../app/main/ui/workspace/sidebar/assets.cljs | 4 ++-- .../app/main/ui/workspace/sidebar/layers.cljs | 3 +-- .../main/ui/workspace/sidebar/sitemap.cljs | 4 ++-- .../src/app/main/ui/workspace/viewport.cljs | 2 +- .../src/app/{main/ui => util}/keyboard.cljs | 3 +-- 35 files changed, 147 insertions(+), 78 deletions(-) rename frontend/src/app/{main/ui => util}/keyboard.cljs (93%) diff --git a/exporter/src/app/browser.cljs b/exporter/src/app/browser.cljs index 0ba877fa7..f9811f714 100644 --- a/exporter/src/app/browser.cljs +++ b/exporter/src/app/browser.cljs @@ -1,3 +1,12 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2020-2021 UXBOX Labs SL + (ns app.browser (:require [lambdaisland.glogi :as log] diff --git a/exporter/src/app/config.cljs b/exporter/src/app/config.cljs index 24c352113..993c9555c 100644 --- a/exporter/src/app/config.cljs +++ b/exporter/src/app/config.cljs @@ -1,3 +1,12 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2020-2021 UXBOX Labs SL + (ns app.config (:require ["process" :as process] diff --git a/exporter/src/app/core.cljs b/exporter/src/app/core.cljs index a9414c324..2a20b0f67 100644 --- a/exporter/src/app/core.cljs +++ b/exporter/src/app/core.cljs @@ -1,3 +1,12 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2020-2021 UXBOX Labs SL + (ns app.core (:require [lambdaisland.glogi :as log] diff --git a/exporter/src/app/http.cljs b/exporter/src/app/http.cljs index 03c239087..cc63a7d53 100644 --- a/exporter/src/app/http.cljs +++ b/exporter/src/app/http.cljs @@ -1,3 +1,12 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2020-2021 UXBOX Labs SL + (ns app.http (:require [app.http.export :refer [export-handler]] diff --git a/exporter/src/app/http/export_bitmap.cljs b/exporter/src/app/http/export_bitmap.cljs index b2c46c9e2..09eb81e16 100644 --- a/exporter/src/app/http/export_bitmap.cljs +++ b/exporter/src/app/http/export_bitmap.cljs @@ -1,3 +1,12 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2020-2021 UXBOX Labs SL + (ns app.http.export-bitmap (:require [cuerdas.core :as str] diff --git a/exporter/src/app/http/export_svg.cljs b/exporter/src/app/http/export_svg.cljs index a5e9e8955..33264b042 100644 --- a/exporter/src/app/http/export_svg.cljs +++ b/exporter/src/app/http/export_svg.cljs @@ -1,3 +1,12 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2020-2021 UXBOX Labs SL + (ns app.http.export-svg (:require [cuerdas.core :as str] diff --git a/exporter/src/app/http/impl.cljs b/exporter/src/app/http/impl.cljs index c04c461a7..f51c70370 100644 --- a/exporter/src/app/http/impl.cljs +++ b/exporter/src/app/http/impl.cljs @@ -1,3 +1,12 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2020-2021 UXBOX Labs SL + (ns app.http.impl (:require ["http" :as http] diff --git a/exporter/src/app/util/transit.cljs b/exporter/src/app/util/transit.cljs index e4d487ffd..80ccfea15 100644 --- a/exporter/src/app/util/transit.cljs +++ b/exporter/src/app/util/transit.cljs @@ -5,7 +5,7 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 app Labs SL +;; Copyright (c) 2020-2021 UXBOX Labs SL (ns app.util.transit (:require diff --git a/exporter/src/app/zipfile.cljs b/exporter/src/app/zipfile.cljs index ac9c16fe6..8c9cbeff0 100644 --- a/exporter/src/app/zipfile.cljs +++ b/exporter/src/app/zipfile.cljs @@ -1,3 +1,12 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2020-2021 UXBOX Labs SL + (ns app.zipfile (:require ["jszip" :as jszip])) diff --git a/frontend/src/app/main/ui/comments.cljs b/frontend/src/app/main/ui/comments.cljs index 89555b234..3343403cb 100644 --- a/frontend/src/app/main/ui/comments.cljs +++ b/frontend/src/app/main/ui/comments.cljs @@ -11,18 +11,18 @@ (:require [app.config :as cfg] [app.main.data.comments :as dcm] + [app.main.data.modal :as modal] [app.main.refs :as refs] [app.main.store :as st] [app.main.streams :as ms] - [app.main.ui.context :as ctx] [app.main.ui.components.dropdown :refer [dropdown]] - [app.main.data.modal :as modal] + [app.main.ui.context :as ctx] [app.main.ui.icons :as i] - [app.main.ui.keyboard :as kbd] - [app.util.time :as dt] [app.util.dom :as dom] - [app.util.object :as obj] [app.util.i18n :as i18n :refer [t tr]] + [app.util.keyboard :as kbd] + [app.util.object :as obj] + [app.util.time :as dt] [cuerdas.core :as str] [okulary.core :as l] [rumext.alpha :as mf])) diff --git a/frontend/src/app/main/ui/components/editable_label.cljs b/frontend/src/app/main/ui/components/editable_label.cljs index 6fac66f56..d8ea4c657 100644 --- a/frontend/src/app/main/ui/components/editable_label.cljs +++ b/frontend/src/app/main/ui/components/editable_label.cljs @@ -9,12 +9,12 @@ (ns app.main.ui.components.editable-label (:require - [rumext.alpha :as mf] [app.main.ui.icons :as i] - [app.main.ui.keyboard :as kbd] + [app.util.data :refer [classnames]] [app.util.dom :as dom] + [app.util.keyboard :as kbd] [app.util.timers :as timers] - [app.util.data :refer [classnames]])) + [rumext.alpha :as mf])) (mf/defc editable-label [{:keys [value on-change on-cancel editing? disable-dbl-click? class-name]}] diff --git a/frontend/src/app/main/ui/components/numeric_input.cljs b/frontend/src/app/main/ui/components/numeric_input.cljs index 6ee38c6d1..a8161d7d9 100644 --- a/frontend/src/app/main/ui/components/numeric_input.cljs +++ b/frontend/src/app/main/ui/components/numeric_input.cljs @@ -9,12 +9,12 @@ (ns app.main.ui.components.numeric-input (:require - [rumext.alpha :as mf] - [app.main.ui.keyboard :as kbd] [app.common.data :as d] + [app.common.math :as math] [app.util.dom :as dom] + [app.util.keyboard :as kbd] [app.util.object :as obj] - [app.common.math :as math])) + [rumext.alpha :as mf])) (mf/defc numeric-input {::mf/wrap-props false diff --git a/frontend/src/app/main/ui/confirm.cljs b/frontend/src/app/main/ui/confirm.cljs index 73bf41bcc..dd1b303af 100644 --- a/frontend/src/app/main/ui/confirm.cljs +++ b/frontend/src/app/main/ui/confirm.cljs @@ -8,17 +8,17 @@ ;; Copyright (c) 2020 UXBOX Labs SL (ns app.main.ui.confirm - (:import goog.events.EventType) (:require - [rumext.alpha :as mf] - [goog.events :as events] [app.main.data.modal :as modal] [app.main.store :as st] [app.main.ui.icons :as i] - [app.main.ui.keyboard :as k] + [app.util.data :refer [classnames]] [app.util.dom :as dom] [app.util.i18n :as i18n :refer [tr t]] - [app.util.data :refer [classnames]])) + [app.util.keyboard :as k] + [goog.events :as events] + [rumext.alpha :as mf]) + (:import goog.events.EventType)) (mf/defc confirm-dialog {::mf/register modal/components diff --git a/frontend/src/app/main/ui/dashboard/files.cljs b/frontend/src/app/main/ui/dashboard/files.cljs index d87aa390a..81501e109 100644 --- a/frontend/src/app/main/ui/dashboard/files.cljs +++ b/frontend/src/app/main/ui/dashboard/files.cljs @@ -16,9 +16,9 @@ [app.main.ui.dashboard.grid :refer [grid]] [app.main.ui.dashboard.inline-edition :refer [inline-edition]] [app.main.ui.icons :as i] - [app.main.ui.keyboard :as kbd] [app.util.dom :as dom] [app.util.i18n :as i18n :refer [t]] + [app.util.keyboard :as kbd] [app.util.router :as rt] [okulary.core :as l] [rumext.alpha :as mf])) diff --git a/frontend/src/app/main/ui/dashboard/grid.cljs b/frontend/src/app/main/ui/dashboard/grid.cljs index 50c67d187..91e7c89d8 100644 --- a/frontend/src/app/main/ui/dashboard/grid.cljs +++ b/frontend/src/app/main/ui/dashboard/grid.cljs @@ -9,20 +9,20 @@ (ns app.main.ui.dashboard.grid (:require - [app.common.uuid :as uuid] [app.common.math :as mth] + [app.common.uuid :as uuid] [app.config :as cfg] [app.main.data.dashboard :as dd] + [app.main.data.modal :as modal] [app.main.fonts :as fonts] [app.main.store :as st] [app.main.ui.components.context-menu :refer [context-menu]] [app.main.ui.dashboard.inline-edition :refer [inline-edition]] [app.main.ui.icons :as i] - [app.main.ui.keyboard :as kbd] - [app.main.data.modal :as modal] [app.main.worker :as wrk] [app.util.dom :as dom] [app.util.i18n :as i18n :refer [t tr]] + [app.util.keyboard :as kbd] [app.util.router :as rt] [app.util.time :as dt] [app.util.timers :as ts] diff --git a/frontend/src/app/main/ui/dashboard/inline_edition.cljs b/frontend/src/app/main/ui/dashboard/inline_edition.cljs index 6439414a8..652fa10f5 100644 --- a/frontend/src/app/main/ui/dashboard/inline_edition.cljs +++ b/frontend/src/app/main/ui/dashboard/inline_edition.cljs @@ -10,8 +10,8 @@ (ns app.main.ui.dashboard.inline-edition (:require [app.main.ui.icons :as i] - [app.main.ui.keyboard :as kbd] [app.util.dom :as dom] + [app.util.keyboard :as kbd] [rumext.alpha :as mf])) (mf/defc inline-edition diff --git a/frontend/src/app/main/ui/dashboard/projects.cljs b/frontend/src/app/main/ui/dashboard/projects.cljs index fde6e0cf2..4aa913ea2 100644 --- a/frontend/src/app/main/ui/dashboard/projects.cljs +++ b/frontend/src/app/main/ui/dashboard/projects.cljs @@ -16,9 +16,9 @@ [app.main.store :as st] [app.main.ui.dashboard.grid :refer [line-grid]] [app.main.ui.icons :as i] - [app.main.ui.keyboard :as kbd] [app.util.dom :as dom] [app.util.i18n :as i18n :refer [t tr]] + [app.util.keyboard :as kbd] [app.util.router :as rt] [app.util.time :as dt] [okulary.core :as l] diff --git a/frontend/src/app/main/ui/dashboard/sidebar.cljs b/frontend/src/app/main/ui/dashboard/sidebar.cljs index 2d4fb98a3..f5d98b031 100644 --- a/frontend/src/app/main/ui/dashboard/sidebar.cljs +++ b/frontend/src/app/main/ui/dashboard/sidebar.cljs @@ -13,10 +13,10 @@ [app.common.spec :as us] [app.config :as cfg] [app.main.data.auth :as da] + [app.main.data.comments :as dcm] [app.main.data.dashboard :as dd] [app.main.data.messages :as dm] [app.main.data.modal :as modal] - [app.main.data.comments :as dcm] [app.main.refs :as refs] [app.main.repo :as rp] [app.main.store :as st] @@ -26,13 +26,13 @@ [app.main.ui.dashboard.inline-edition :refer [inline-edition]] [app.main.ui.dashboard.team-form] [app.main.ui.icons :as i] - [app.main.ui.keyboard :as kbd] + [app.util.avatars :as avatars] [app.util.dom :as dom] [app.util.i18n :as i18n :refer [t tr]] + [app.util.keyboard :as kbd] [app.util.object :as obj] [app.util.router :as rt] [app.util.time :as dt] - [app.util.avatars :as avatars] [beicon.core :as rx] [cljs.spec.alpha :as s] [cuerdas.core :as str] diff --git a/frontend/src/app/main/ui/dashboard/team_form.cljs b/frontend/src/app/main/ui/dashboard/team_form.cljs index 0e263e551..4db46c580 100644 --- a/frontend/src/app/main/ui/dashboard/team_form.cljs +++ b/frontend/src/app/main/ui/dashboard/team_form.cljs @@ -20,10 +20,10 @@ [app.main.store :as st] [app.main.ui.components.forms :refer [input submit-button form]] [app.main.ui.icons :as i] - [app.main.ui.keyboard :as kbd] [app.util.dom :as dom] [app.util.forms :as fm] [app.util.i18n :as i18n :refer [t tr]] + [app.util.keyboard :as kbd] [app.util.object :as obj] [app.util.router :as rt] [app.util.time :as dt] diff --git a/frontend/src/app/main/ui/handoff.cljs b/frontend/src/app/main/ui/handoff.cljs index 95c0434e4..b9c41b9f3 100644 --- a/frontend/src/app/main/ui/handoff.cljs +++ b/frontend/src/app/main/ui/handoff.cljs @@ -20,11 +20,11 @@ [app.main.ui.handoff.right-sidebar :refer [right-sidebar]] [app.main.ui.hooks :as hooks] [app.main.ui.icons :as i] - [app.main.ui.keyboard :as kbd] [app.main.ui.viewer.header :refer [header]] [app.main.ui.viewer.thumbnails :refer [thumbnails-panel]] [app.util.dom :as dom] [app.util.i18n :as i18n :refer [t tr]] + [app.util.keyboard :as kbd] [beicon.core :as rx] [goog.events :as events] [okulary.core :as l] diff --git a/frontend/src/app/main/ui/handoff/left_sidebar.cljs b/frontend/src/app/main/ui/handoff/left_sidebar.cljs index 70d1c701d..b9107018d 100644 --- a/frontend/src/app/main/ui/handoff/left_sidebar.cljs +++ b/frontend/src/app/main/ui/handoff/left_sidebar.cljs @@ -14,10 +14,9 @@ [app.main.data.viewer :as dv] [app.main.store :as st] [app.main.ui.icons :as i] - [app.main.ui.keyboard :as kbd] - [app.main.ui.keyboard :as kbd] [app.main.ui.workspace.sidebar.layers :refer [element-icon layer-name frame-wrapper]] [app.util.dom :as dom] + [app.util.keyboard :as kbd] [okulary.core :as l] [rumext.alpha :as mf])) diff --git a/frontend/src/app/main/ui/modal.cljs b/frontend/src/app/main/ui/modal.cljs index a3de8bf92..396aa867b 100644 --- a/frontend/src/app/main/ui/modal.cljs +++ b/frontend/src/app/main/ui/modal.cljs @@ -9,14 +9,14 @@ (ns app.main.ui.modal (:require - [okulary.core :as l] - [goog.events :as events] - [rumext.alpha :as mf] - [app.main.store :as st] - [app.main.ui.keyboard :as k] [app.main.data.modal :as dm] + [app.main.refs :as refs] + [app.main.store :as st] [app.util.dom :as dom] - [app.main.refs :as refs]) + [app.util.keyboard :as k] + [goog.events :as events] + [okulary.core :as l] + [rumext.alpha :as mf]) (:import goog.events.EventType)) (defn- on-esc-clicked diff --git a/frontend/src/app/main/ui/viewer.cljs b/frontend/src/app/main/ui/viewer.cljs index 7fb7f80a3..01411bcc3 100644 --- a/frontend/src/app/main/ui/viewer.cljs +++ b/frontend/src/app/main/ui/viewer.cljs @@ -15,21 +15,21 @@ [app.common.geom.point :as gpt] [app.common.geom.shapes :as geom] [app.common.pages :as cp] + [app.main.data.comments :as dcm] [app.main.data.viewer :as dv] [app.main.data.viewer.shortcuts :as sc] - [app.main.data.comments :as dcm] [app.main.refs :as refs] [app.main.store :as st] + [app.main.ui.comments :as cmt] [app.main.ui.components.fullscreen :as fs] [app.main.ui.hooks :as hooks] [app.main.ui.icons :as i] - [app.main.ui.keyboard :as kbd] [app.main.ui.viewer.header :refer [header]] [app.main.ui.viewer.shapes :as shapes :refer [frame-svg]] [app.main.ui.viewer.thumbnails :refer [thumbnails-panel]] - [app.main.ui.comments :as cmt] [app.util.dom :as dom] [app.util.i18n :as i18n :refer [t tr]] + [app.util.keyboard :as kbd] [goog.events :as events] [okulary.core :as l] [rumext.alpha :as mf])) diff --git a/frontend/src/app/main/ui/workspace.cljs b/frontend/src/app/main/ui/workspace.cljs index a8eb93cde..acc321f3b 100644 --- a/frontend/src/app/main/ui/workspace.cljs +++ b/frontend/src/app/main/ui/workspace.cljs @@ -21,7 +21,6 @@ [app.main.ui.context :as ctx] [app.main.ui.hooks :as hooks] [app.main.ui.icons :as i] - [app.main.ui.keyboard :as kbd] [app.main.ui.workspace.colorpalette :refer [colorpalette]] [app.main.ui.workspace.colorpicker] [app.main.ui.workspace.context-menu :refer [context-menu]] @@ -32,6 +31,7 @@ [app.main.ui.workspace.sidebar :refer [left-sidebar right-sidebar]] [app.main.ui.workspace.viewport :refer [viewport viewport-actions coordinates]] [app.util.dom :as dom] + [app.util.keyboard :as kbd] [app.util.object :as obj] [beicon.core :as rx] [cuerdas.core :as str] diff --git a/frontend/src/app/main/ui/workspace/colorpalette.cljs b/frontend/src/app/main/ui/workspace/colorpalette.cljs index eb2653003..01e3e2012 100644 --- a/frontend/src/app/main/ui/workspace/colorpalette.cljs +++ b/frontend/src/app/main/ui/workspace/colorpalette.cljs @@ -18,10 +18,10 @@ [app.main.ui.components.dropdown :refer [dropdown]] [app.main.ui.context :as ctx] [app.main.ui.icons :as i] - [app.main.ui.keyboard :as kbd] [app.util.color :as uc] [app.util.dom :as dom] [app.util.i18n :as i18n :refer [t]] + [app.util.keyboard :as kbd] [app.util.object :as obj] [beicon.core :as rx] [cuerdas.core :as str] diff --git a/frontend/src/app/main/ui/workspace/colorpicker/pixel_overlay.cljs b/frontend/src/app/main/ui/workspace/colorpicker/pixel_overlay.cljs index fcd72eb28..b62243465 100644 --- a/frontend/src/app/main/ui/workspace/colorpicker/pixel_overlay.cljs +++ b/frontend/src/app/main/ui/workspace/colorpicker/pixel_overlay.cljs @@ -9,16 +9,7 @@ (ns app.main.ui.workspace.colorpicker.pixel-overlay (:require - [rumext.alpha :as mf] - [cuerdas.core :as str] - [okulary.core :as l] - [promesa.core :as p] - [beicon.core :as rx] - [goog.events :as events] [app.common.uuid :as uuid] - [app.util.timers :as timers] - [app.util.dom :as dom] - [app.util.object :as obj] [app.main.data.colors :as dwc] [app.main.data.fetch :as mdf] [app.main.data.modal :as modal] @@ -26,8 +17,17 @@ [app.main.store :as st] [app.main.ui.context :as muc] [app.main.ui.cursors :as cur] - [app.main.ui.keyboard :as kbd] - [app.main.ui.workspace.shapes :refer [shape-wrapper frame-wrapper]]) + [app.main.ui.workspace.shapes :refer [shape-wrapper frame-wrapper]] + [app.util.dom :as dom] + [app.util.keyboard :as kbd] + [app.util.object :as obj] + [app.util.timers :as timers] + [beicon.core :as rx] + [cuerdas.core :as str] + [goog.events :as events] + [okulary.core :as l] + [promesa.core :as p] + [rumext.alpha :as mf]) (:import goog.events.EventType)) (defn format-viewbox [vbox] diff --git a/frontend/src/app/main/ui/workspace/effects.cljs b/frontend/src/app/main/ui/workspace/effects.cljs index 84a69c299..dee7ee88f 100644 --- a/frontend/src/app/main/ui/workspace/effects.cljs +++ b/frontend/src/app/main/ui/workspace/effects.cljs @@ -9,13 +9,13 @@ (ns app.main.ui.workspace.effects (:require - [rumext.alpha :as mf] - [app.util.dom :as dom] - [app.main.data.workspace.selection :as dws] - [app.main.store :as st] [app.main.data.workspace :as dw] + [app.main.data.workspace.selection :as dws] [app.main.refs :as refs] - [app.main.ui.keyboard :as kbd])) + [app.main.store :as st] + [app.util.dom :as dom] + [app.util.keyboard :as kbd] + [rumext.alpha :as mf])) (defn use-pointer-enter [{:keys [id]}] diff --git a/frontend/src/app/main/ui/workspace/header.cljs b/frontend/src/app/main/ui/workspace/header.cljs index e4507a5ec..53948281f 100644 --- a/frontend/src/app/main/ui/workspace/header.cljs +++ b/frontend/src/app/main/ui/workspace/header.cljs @@ -19,10 +19,10 @@ [app.main.store :as st] [app.main.ui.components.dropdown :refer [dropdown]] [app.main.ui.icons :as i] - [app.main.ui.keyboard :as kbd] [app.main.ui.workspace.presence :refer [active-sessions]] [app.util.dom :as dom] [app.util.i18n :as i18n :refer [tr]] + [app.util.keyboard :as kbd] [app.util.router :as rt] [okulary.core :as l] [rumext.alpha :as mf])) diff --git a/frontend/src/app/main/ui/workspace/shapes/frame.cljs b/frontend/src/app/main/ui/workspace/shapes/frame.cljs index ff0e4ff0b..679f9af15 100644 --- a/frontend/src/app/main/ui/workspace/shapes/frame.cljs +++ b/frontend/src/app/main/ui/workspace/shapes/frame.cljs @@ -14,16 +14,16 @@ [app.main.data.workspace :as dw] [app.main.refs :as refs] [app.main.store :as st] - [app.main.ui.keyboard :as kbd] + [app.main.ui.context :as muc] [app.main.ui.shapes.frame :as frame] [app.main.ui.shapes.shape :refer [shape-container]] [app.main.ui.workspace.effects :as we] [app.util.dom :as dom] + [app.util.keyboard :as kbd] [app.util.timers :as ts] [beicon.core :as rx] [okulary.core :as l] - [rumext.alpha :as mf] - [app.main.ui.context :as muc])) + [rumext.alpha :as mf])) (defn use-select-shape [{:keys [id]} edition] (mf/use-callback diff --git a/frontend/src/app/main/ui/workspace/shapes/interactions.cljs b/frontend/src/app/main/ui/workspace/shapes/interactions.cljs index d4a8684fe..469a636fc 100644 --- a/frontend/src/app/main/ui/workspace/shapes/interactions.cljs +++ b/frontend/src/app/main/ui/workspace/shapes/interactions.cljs @@ -10,17 +10,17 @@ (ns app.main.ui.workspace.shapes.interactions "Visually show shape interactions in workspace" (:require - [rumext.alpha :as mf] - [cuerdas.core :as str] - [app.util.data :as dt] - [app.util.dom :as dom] [app.common.geom.point :as gpt] [app.common.geom.shapes :as geom] - [app.main.store :as st] - [app.main.refs :as refs] [app.main.data.workspace :as dw] - [app.main.ui.keyboard :as kbd] - [app.main.ui.workspace.shapes.outline :refer [outline]])) + [app.main.refs :as refs] + [app.main.store :as st] + [app.main.ui.workspace.shapes.outline :refer [outline]] + [app.util.data :as dt] + [app.util.dom :as dom] + [app.util.keyboard :as kbd] + [cuerdas.core :as str] + [rumext.alpha :as mf])) (defn- get-click-interaction [shape] diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs index 52e519ce6..ed043bf1c 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs @@ -26,17 +26,17 @@ [app.main.store :as st] [app.main.ui.components.color-bullet :as bc] [app.main.ui.components.context-menu :refer [context-menu]] + [app.main.ui.components.editable-label :refer [editable-label]] [app.main.ui.components.file-uploader :refer [file-uploader]] [app.main.ui.components.tab-container :refer [tab-container tab-element]] - [app.main.ui.components.editable-label :refer [editable-label]] [app.main.ui.context :as ctx] [app.main.ui.icons :as i] - [app.main.ui.keyboard :as kbd] [app.main.ui.workspace.sidebar.options.typography :refer [typography-entry]] [app.util.data :refer [matches-search]] [app.util.dom :as dom] [app.util.dom.dnd :as dnd] [app.util.i18n :as i18n :refer [tr t]] + [app.util.keyboard :as kbd] [app.util.router :as rt] [app.util.text :as ut] [app.util.timers :as timers] diff --git a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs index 83e776c7c..fc1630396 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs @@ -18,10 +18,9 @@ [app.main.store :as st] [app.main.ui.hooks :as hooks] [app.main.ui.icons :as i] - [app.main.ui.keyboard :as kbd] - [app.main.ui.keyboard :as kbd] [app.util.dom :as dom] [app.util.i18n :as i18n :refer [t]] + [app.util.keyboard :as kbd] [app.util.object :as obj] [app.util.perf :as perf] [app.util.timers :as ts] diff --git a/frontend/src/app/main/ui/workspace/sidebar/sitemap.cljs b/frontend/src/app/main/ui/workspace/sidebar/sitemap.cljs index bb28e672b..5b2d8eb52 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/sitemap.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/sitemap.cljs @@ -9,18 +9,18 @@ (ns app.main.ui.workspace.sidebar.sitemap (:require - [app.main.ui.components.context-menu :refer [context-menu]] [app.common.data :as d] [app.main.data.modal :as modal] [app.main.data.workspace :as dw] [app.main.refs :as refs] [app.main.store :as st] + [app.main.ui.components.context-menu :refer [context-menu]] [app.main.ui.context :as ctx] [app.main.ui.hooks :as hooks] [app.main.ui.icons :as i] - [app.main.ui.keyboard :as kbd] [app.util.dom :as dom] [app.util.i18n :as i18n :refer [tr]] + [app.util.keyboard :as kbd] [app.util.router :as rt] [cuerdas.core :as str] [okulary.core :as l] diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs index a495d37da..a92b2bcb4 100644 --- a/frontend/src/app/main/ui/workspace/viewport.cljs +++ b/frontend/src/app/main/ui/workspace/viewport.cljs @@ -29,7 +29,6 @@ [app.main.ui.cursors :as cur] [app.main.ui.hooks :as hooks] [app.main.ui.icons :as i] - [app.main.ui.keyboard :as kbd] [app.main.ui.workspace.colorpicker.pixel-overlay :refer [pixel-overlay]] [app.main.ui.workspace.comments :refer [comments-layer]] [app.main.ui.workspace.drawarea :refer [draw-area]] @@ -46,6 +45,7 @@ [app.util.dom :as dom] [app.util.dom.dnd :as dnd] [app.util.http :as http] + [app.util.keyboard :as kbd] [app.util.object :as obj] [app.util.perf :as perf] [app.util.timers :as timers] diff --git a/frontend/src/app/main/ui/keyboard.cljs b/frontend/src/app/util/keyboard.cljs similarity index 93% rename from frontend/src/app/main/ui/keyboard.cljs rename to frontend/src/app/util/keyboard.cljs index 95a59c4e5..3aa7681d9 100644 --- a/frontend/src/app/main/ui/keyboard.cljs +++ b/frontend/src/app/util/keyboard.cljs @@ -7,8 +7,7 @@ ;; ;; Copyright (c) 2020-2021 UXBOX Labs SL -;; TODO: Move to another namespace -(ns app.main.ui.keyboard) +(ns app.util.keyboard) (defn is-keycode? [keycode] From c1476d0397333e4a321d5a37693eae9198575415 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 15 Feb 2021 13:14:05 +0100 Subject: [PATCH 12/90] :tada: Add optional loki integration. And refactor internal error reporting. --- CHANGES.md | 2 + backend/deps.edn | 3 +- backend/dev/user.clj | 8 +- backend/resources/error-report.tmpl | 38 ++++-- backend/resources/log4j2.xml | 17 ++- backend/scripts/repl | 7 +- backend/src/app/config.clj | 13 +- backend/src/app/http/errors.clj | 7 -- backend/src/app/loggers/loki.clj | 92 ++++++++++++++ .../mattermost.clj} | 118 +++++++++--------- backend/src/app/loggers/zmq.clj | 92 ++++++++++++++ backend/src/app/main.clj | 15 ++- backend/src/app/util/json.clj | 8 ++ backend/src/app/util/time.clj | 4 + backend/src/app/worker.clj | 5 - 15 files changed, 331 insertions(+), 98 deletions(-) create mode 100644 backend/src/app/loggers/loki.clj rename backend/src/app/{error_reporter.clj => loggers/mattermost.clj} (57%) create mode 100644 backend/src/app/loggers/zmq.clj diff --git a/CHANGES.md b/CHANGES.md index 0de1f25a4..326b99e2c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,10 +4,12 @@ ### New features +- Add optional loki integration. - Bounce & Complaint handling. - Disable groups interactions when holding "Ctrl" key (deep selection) - New action in context menu to "edit" some shapes (binded to key "Enter") + ### Bugs fixed - Properly handle errors on github, gitlab and ldap auth backends. diff --git a/backend/deps.edn b/backend/deps.edn index c178b10a8..2452df5d9 100644 --- a/backend/deps.edn +++ b/backend/deps.edn @@ -16,6 +16,8 @@ org.apache.logging.log4j/log4j-jul {:mvn/version "2.14.0"} org.apache.logging.log4j/log4j-slf4j-impl {:mvn/version "2.14.0"} org.slf4j/slf4j-api {:mvn/version "1.7.30"} + org.zeromq/jeromq {:mvn/version "0.5.2"} + org.graalvm.js/js {:mvn/version "20.3.0"} com.taoensso/nippy {:mvn/version "3.1.1"} @@ -43,7 +45,6 @@ org.postgresql/postgresql {:mvn/version "42.2.18"} com.zaxxer/HikariCP {:mvn/version "3.4.5"} - funcool/log4j2-clojure {:mvn/version "2020.11.23-1"} funcool/datoteka {:mvn/version "1.2.0"} funcool/promesa {:mvn/version "6.0.0"} funcool/cuerdas {:mvn/version "2020.03.26-3"} diff --git a/backend/dev/user.clj b/backend/dev/user.clj index 6e66cd6c1..85b53afb5 100644 --- a/backend/dev/user.clj +++ b/backend/dev/user.clj @@ -9,24 +9,24 @@ (ns user (:require + [app.common.exceptions :as ex] [app.config :as cfg] [app.main :as main] [app.util.time :as dt] [app.util.transit :as t] - [app.common.exceptions :as ex] - [taoensso.nippy :as nippy] [clojure.data.json :as json] [clojure.java.io :as io] - [clojure.test :as test] [clojure.pprint :refer [pprint]] [clojure.repl :refer :all] [clojure.spec.alpha :as s] [clojure.spec.gen.alpha :as sgen] [clojure.test :as test] + [clojure.test :as test] [clojure.tools.namespace.repl :as repl] [clojure.walk :refer [macroexpand-all]] [criterium.core :refer [quick-bench bench with-progress-reporting]] - [integrant.core :as ig])) + [integrant.core :as ig] + [taoensso.nippy :as nippy])) (repl/disable-reload! (find-ns 'integrant.core)) diff --git a/backend/resources/error-report.tmpl b/backend/resources/error-report.tmpl index 3a420a60c..be4df1196 100644 --- a/backend/resources/error-report.tmpl +++ b/backend/resources/error-report.tmpl @@ -31,7 +31,7 @@ .table-key { font-weight: 600; - width: 70px; + width: 60px; padding: 4px; } @@ -70,27 +70,43 @@ {% if user-agent %}
-
UAGENT:
+
UAGT:
{{user-agent}}
{% endif %} {% if frontend-version %}
-
FVERS:
+
FVER:
{{frontend-version}}
{% endif %}
-
BVERS:
+
BVER:
{{version}}
+ {% if host %}
HOST:
{{host}}
+ {% endif %} + + {% if tenant %} +
+
ENV:
+
{{tenant}}
+
+ {% endif %} + + {% if public-uri %} +
+
PURI:
+
{{public-uri}}
+
+ {% endif %} {% if type %}
@@ -106,15 +122,19 @@
{% endif %} + {% if error %}
-
CLASS:
-
{{class}}
+
CLSS:
+
{{error.class}}
+ {% endif %} + {% if error %}
HINT:
-
{{hint}}
+
{{error.message}}
+ {% endif %} {% if method %}
@@ -150,12 +170,14 @@
{% endif %} + {% if error %}
TRACE:
- 
{{message}}
+ 
{{error.trace}}
+ {% endif %} diff --git a/backend/resources/log4j2.xml b/backend/resources/log4j2.xml index 0dff9f13d..8830df725 100644 --- a/backend/resources/log4j2.xml +++ b/backend/resources/log4j2.xml @@ -13,9 +13,10 @@ - - - + + tcp://localhost:45556 + + @@ -27,13 +28,19 @@ - + - + + + + + + + diff --git a/backend/scripts/repl b/backend/scripts/repl index e3fa8b324..147661f35 100755 --- a/backend/scripts/repl +++ b/backend/scripts/repl @@ -2,6 +2,9 @@ export PENPOT_ASSERTS_ENABLED=true +export OPTIONS="-A:jmx-remote:dev -J-Dclojure.tools.logging.factory=clojure.tools.logging.impl/log4j2-factory -J-Xms512m -J-Xmx512m" +export OPTIONS_EVAL="nil" +# export OPTIONS_EVAL="(set! *warn-on-reflection* true)" + set -ex -# clojure -Ojmx-remote -A:dev -e "(set! *warn-on-reflection* true)" -m rebel-readline.main -clojure -A:jmx-remote:dev -J-Xms512m -J-Xmx512m -M -m rebel-readline.main +exec clojure $OPTIONS -M -e "$OPTIONS_EVAL" -m rebel-readline.main diff --git a/backend/src/app/config.clj b/backend/src/app/config.clj index 51741e329..00a296c13 100644 --- a/backend/src/app/config.clj +++ b/backend/src/app/config.clj @@ -21,7 +21,8 @@ (def defaults {:http-server-port 6060 - + :host "devenv" + :tenant "dev" :database-uri "postgresql://127.0.0.1/penpot" :database-username "penpot" :database-password "penpot" @@ -87,11 +88,17 @@ }) (s/def ::http-server-port ::us/integer) + +(s/def ::host ::us/string) +(s/def ::tenant ::us/string) + (s/def ::database-username (s/nilable ::us/string)) (s/def ::database-password (s/nilable ::us/string)) (s/def ::database-uri ::us/string) (s/def ::redis-uri ::us/string) +(s/def ::loggers-loki-uri ::us/string) +(s/def ::loggers-zmq-uri ::us/string) (s/def ::storage-backend ::us/keyword) (s/def ::storage-fs-directory ::us/string) @@ -185,6 +192,7 @@ ::google-client-id ::google-client-secret ::http-server-port + ::host ::ldap-auth-avatar-attribute ::ldap-auth-base-dn ::ldap-auth-email-attribute @@ -221,6 +229,8 @@ ::srepl-host ::srepl-port ::local-assets-uri + ::loggers-loki-uri + ::loggers-zmq-uri ::storage-s3-bucket ::storage-s3-region ::telemetry-enabled @@ -228,6 +238,7 @@ ::telemetry-server-enabled ::telemetry-server-port ::telemetry-uri + ::tenant ::initial-data-file ::initial-data-project-name])) diff --git a/backend/src/app/http/errors.clj b/backend/src/app/http/errors.clj index af688d473..3758942f5 100644 --- a/backend/src/app/http/errors.clj +++ b/backend/src/app/http/errors.clj @@ -11,7 +11,6 @@ "A errors handling for the http server." (:require [app.common.uuid :as uuid] - [app.config :as cfg] [app.util.log4j :refer [update-thread-context!]] [clojure.tools.logging :as log] [cuerdas.core :as str] @@ -30,16 +29,10 @@ :path (:uri request) :method (:request-method request) :params (:params request) - :version (:full cfg/version) - :host (:public-uri cfg/config) - :class (.getCanonicalName ^java.lang.Class (class error)) - :hint (ex-message error) :data edata} - (let [headers (:headers request)] {:user-agent (get headers "user-agent") :frontend-version (get headers "x-frontend-version" "unknown")}) - (when (and (map? edata) (:data edata)) {:explain (explain-error edata)})))) diff --git a/backend/src/app/loggers/loki.clj b/backend/src/app/loggers/loki.clj new file mode 100644 index 000000000..32813e5ec --- /dev/null +++ b/backend/src/app/loggers/loki.clj @@ -0,0 +1,92 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2020-2021 UXBOX Labs SL + +(ns app.loggers.loki + "A Loki integration." + (:require + [app.common.spec :as us] + [app.config :as cfg] + [app.util.async :as aa] + [app.util.http :as http] + [app.util.json :as json] + [app.worker :as wrk] + [clojure.core.async :as a] + [clojure.spec.alpha :as s] + [clojure.tools.logging :as log] + [integrant.core :as ig])) + +(declare handle-event) + +(s/def ::uri ::us/string) +(s/def ::receiver fn?) + +(defmethod ig/pre-init-spec ::reporter [_] + (s/keys :req-un [::wrk/executor ::receiver] + :opt-un [::uri])) + +(defmethod ig/init-key ::reporter + [_ {:keys [receiver uri] :as cfg}] + (when uri + (log/info "Intializing loki reporter.") + (let [output (a/chan (a/sliding-buffer 1024))] + (receiver :sub output) + (a/go-loop [] + (let [msg (a/ +;; Copyright (c) 2020-2021 UXBOX Labs SL -(ns app.error-reporter +(ns app.loggers.mattermost "A mattermost integration for error reporting." (:require [app.common.exceptions :as ex] @@ -15,6 +15,7 @@ [app.common.uuid :as uuid] [app.config :as cfg] [app.db :as db] + [app.util.async :as aa] [app.util.http :as http] [app.util.json :as json] [app.util.template :as tmpl] @@ -24,11 +25,7 @@ [clojure.spec.alpha :as s] [clojure.tools.logging :as log] [cuerdas.core :as str] - [integrant.core :as ig] - [promesa.exec :as px]) - (:import - org.apache.logging.log4j.core.LogEvent - org.apache.logging.log4j.util.ReadOnlyStringMap)) + [integrant.core :as ig])) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Error Listener @@ -37,76 +34,51 @@ (declare handle-event) (defonce enabled-mattermost (atom true)) -(defonce queue (a/chan (a/sliding-buffer 64))) -(defonce queue-fn (fn [event] (a/>!! queue event))) (s/def ::uri ::us/string) (defmethod ig/pre-init-spec ::reporter [_] - (s/keys :req-un [::wrk/executor ::db/pool] + (s/keys :req-un [::wrk/executor ::db/pool ::receiver] :opt-un [::uri])) (defmethod ig/init-key ::reporter - [_ {:keys [executor] :as cfg}] - (log/info "Intializing error reporter.") - (let [close-ch (a/chan 1)] + [_ {:keys [receiver] :as cfg}] + (log/info "Intializing mattermost error reporter.") + (let [output (a/chan (a/sliding-buffer 128) + (filter #(= (:level %) "error")))] + (receiver :sub output) (a/go-loop [] - (let [[val port] (a/alts! [close-ch queue])] - (cond - (= port close-ch) + (let [msg (a/ (parse-context event) + (merge (dissoc event :context)) + (assoc :tenant (cfg/get :tenant)) + (assoc :host (cfg/get :host)) + (assoc :public-uri (cfg/get :public-uri)) + (assoc :version (:full cfg/version)))) + (defn handle-event - [cfg event] - (try - (let [cdata (get-context-data event)] - (when (and (:uri cfg) @enabled-mattermost) - (send-mattermost-notification! cfg cdata)) - (persist-on-database! cfg cdata)) - (catch Exception e - (log/warnf e "Unexpected exception on error reporter.")))) + [{:keys [executor] :as cfg} event] + (aa/with-thread executor + (try + (let [cdata (parse-event event)] + (when (and (:uri cfg) @enabled-mattermost) + (send-mattermost-notification! cfg cdata)) + (persist-on-database! cfg cdata)) + (catch Exception e + (log/error e "Unexpected exception on error reporter."))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Http Handler diff --git a/backend/src/app/loggers/zmq.clj b/backend/src/app/loggers/zmq.clj new file mode 100644 index 000000000..834212cc8 --- /dev/null +++ b/backend/src/app/loggers/zmq.clj @@ -0,0 +1,92 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2020-2021 UXBOX Labs SL + +(ns app.loggers.zmq + "A generic ZMQ listener." + (:require + [app.common.data :as d] + [app.common.spec :as us] + [app.util.json :as json] + [app.util.time :as dt] + [clojure.core.async :as a] + [clojure.spec.alpha :as s] + [clojure.tools.logging :as log] + [cuerdas.core :as str] + [integrant.core :as ig]) + (:import + org.zeromq.SocketType + org.zeromq.ZMQ$Socket + org.zeromq.ZContext)) + +(declare prepare) +(declare start-rcv-loop) + +(s/def ::endpoint ::us/string) + +(defmethod ig/pre-init-spec ::receiver [_] + (s/keys :opt-un [::endpoint])) + +(defmethod ig/init-key ::receiver + [_ {:keys [endpoint] :as cfg}] + (log/infof "Intializing ZMQ receiver on '%s'." endpoint) + (let [buffer (a/chan 1) + output (a/chan 1 (comp (filter map?) + (map prepare))) + mult (a/mult output)] + (when endpoint + (a/thread (start-rcv-loop {:out buffer :endpoint endpoint}))) + (a/pipe buffer output) + (with-meta + (fn [cmd ch] + (case cmd + :sub (a/tap mult ch) + :unsub (a/untap mult ch)) + ch) + {::output output + ::buffer buffer + ::mult mult}))) + +(defmethod ig/halt-key! ::receiver + [_ f] + (a/close! (::buffer (meta f)))) + +(defn- start-rcv-loop + ([] (start-rcv-loop nil)) + ([{:keys [out endpoint] :or {endpoint "tcp://localhost:5556"}}] + (let [out (or out (a/chan 1)) + zctx (ZContext.) + socket (.. zctx (createSocket SocketType/SUB))] + (.. socket (connect ^String endpoint)) + (.. socket (subscribe "")) + (.. socket (setReceiveTimeOut 5000)) + (loop [] + (let [msg (.recv ^ZMQ$Socket socket) + msg (json/decode msg) + msg (if (nil? msg) :empty msg)] + (if (a/>!! out msg) + (recur) + (do + (.close ^java.lang.AutoCloseable socket) + (.close ^java.lang.AutoCloseable zctx)))))))) + +(defn- prepare + [event] + (d/merge + {:logger (:loggerName event) + :level (str/lower (:level event)) + :thread (:thread event) + :created-at (dt/instant (:timeMillis event)) + :message (:message event)} + (when-let [ctx (:contextMap event)] + {:context ctx}) + (when-let [thrown (:thrown event)] + {:error + {:class (:name thrown) + :message (:message thrown) + :trace (:extendedStackTrace thrown)}}))) diff --git a/backend/src/app/main.clj b/backend/src/app/main.clj index 6f2203445..ba8594798 100644 --- a/backend/src/app/main.clj +++ b/backend/src/app/main.clj @@ -95,7 +95,7 @@ :svgparse (ig/ref :app.svgparse/handler) :storage (ig/ref :app.storage/storage) :sns-webhook (ig/ref :app.http.awsns/handler) - :error-report-handler (ig/ref :app.error-reporter/handler)} + :error-report-handler (ig/ref :app.loggers.mattermost/handler)} :app.http.assets/handlers {:metrics (ig/ref :app.metrics/metrics) @@ -280,12 +280,21 @@ :app.sprops/props {:pool (ig/ref :app.db/pool)} - :app.error-reporter/reporter + :app.loggers.zmq/receiver + {:endpoint (:loggers-zmq-uri config)} + + :app.loggers.loki/reporter + {:uri (:loggers-loki-uri config) + :receiver (ig/ref :app.loggers.zmq/receiver) + :executor (ig/ref :app.worker/executor)} + + :app.loggers.mattermost/reporter {:uri (:error-report-webhook config) + :receiver (ig/ref :app.loggers.zmq/receiver) :pool (ig/ref :app.db/pool) :executor (ig/ref :app.worker/executor)} - :app.error-reporter/handler + :app.loggers.mattermost/handler {:pool (ig/ref :app.db/pool)} :app.storage/storage diff --git a/backend/src/app/util/json.clj b/backend/src/app/util/json.clj index 7b3013a97..042517c62 100644 --- a/backend/src/app/util/json.clj +++ b/backend/src/app/util/json.clj @@ -16,10 +16,18 @@ [v] (j/write-value-as-string v j/keyword-keys-object-mapper)) +(defn encode + [v] + (j/write-value-as-bytes v j/keyword-keys-object-mapper)) + (defn decode-str [v] (j/read-value v j/keyword-keys-object-mapper)) +(defn decode + [v] + (j/read-value v j/keyword-keys-object-mapper)) + (defn read [v] (j/read-value v j/keyword-keys-object-mapper)) diff --git a/backend/src/app/util/time.clj b/backend/src/app/util/time.clj index be7012872..907098a77 100644 --- a/backend/src/app/util/time.clj +++ b/backend/src/app/util/time.clj @@ -93,6 +93,10 @@ [t1 t2] (Duration/between t1 t2)) +(defn instant + [ms] + (Instant/ofEpochMilli ms)) + (defn parse-duration [s] (Duration/parse s)) diff --git a/backend/src/app/worker.clj b/backend/src/app/worker.clj index 145e1ce58..306604b81 100644 --- a/backend/src/app/worker.clj +++ b/backend/src/app/worker.clj @@ -12,7 +12,6 @@ (:require [app.common.spec :as us] [app.common.uuid :as uuid] - [app.config :as cfg] [app.db :as db] [app.util.async :as aa] [app.util.log4j :refer [update-thread-context!]] @@ -210,10 +209,6 @@ [error item] (let [edata (ex-data error)] {:id (uuid/next) - :version (:full cfg/version) - :host (:public-uri cfg/config) - :class (.getCanonicalName ^java.lang.Class (class error)) - :hint (ex-message error) :data edata :params item})) From 60f4f863dfb80932da2d31accf7fb5039b15e668 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Fri, 12 Feb 2021 15:57:02 +0100 Subject: [PATCH 13/90] :sparkles: Add missing indexes and improve others. --- CHANGES.md | 3 +++ backend/src/app/migrations.clj | 6 ++++++ .../migrations/sql/0035-add-storage-tables.sql | 11 ++++++----- .../sql/0047-mod-file-change-table.sql | 16 ++++++++++++++++ .../migrations/sql/0048-mod-storage-tables.sql | 9 +++++++++ 5 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 backend/src/app/migrations/sql/0047-mod-file-change-table.sql create mode 100644 backend/src/app/migrations/sql/0048-mod-storage-tables.sql diff --git a/CHANGES.md b/CHANGES.md index 326b99e2c..6ebc27f3d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,6 +15,9 @@ - Properly handle errors on github, gitlab and ldap auth backends. - Properly mark profile auth backend (on first register/ auth with 3rd party auth provider). - Fix problem width handoff code generation [Taiga #1204](https://tree.taiga.io/project/penpot/issue/1204) +- Add some missing database indexes (mainly improves performance on + large databases on file-update rpc method, and some background + tasks). ## 1.2.0-alpha diff --git a/backend/src/app/migrations.clj b/backend/src/app/migrations.clj index 7b0a19e6c..f124bebb9 100644 --- a/backend/src/app/migrations.clj +++ b/backend/src/app/migrations.clj @@ -152,6 +152,12 @@ {:name "0046-add-profile-complaint-table" :fn (mg/resource "app/migrations/sql/0046-add-profile-complaint-table.sql")} + {:name "0047-mod-file-change-table" + :fn (mg/resource "app/migrations/sql/0047-mod-file-change-table.sql")} + + {:name "0048-mod-storage-tables" + :fn (mg/resource "app/migrations/sql/0048-mod-storage-tables.sql")} + ]) diff --git a/backend/src/app/migrations/sql/0035-add-storage-tables.sql b/backend/src/app/migrations/sql/0035-add-storage-tables.sql index 4bf96725d..d1ec7f9d4 100644 --- a/backend/src/app/migrations/sql/0035-add-storage-tables.sql +++ b/backend/src/app/migrations/sql/0035-add-storage-tables.sql @@ -10,11 +10,17 @@ CREATE TABLE storage_object ( metadata jsonb NULL DEFAULT NULL ); +CREATE INDEX storage_object__id__deleted_at__idx + ON storage_object(id, deleted_at) + WHERE deleted_at IS NOT null; + CREATE TABLE storage_data ( id uuid PRIMARY KEY REFERENCES storage_object (id) ON DELETE CASCADE, data bytea NOT NULL ); +CREATE INDEX storage_data__id__idx ON storage_data(id); + -- Table used for store inflight upload ids, for later recheck and -- delete possible staled files that exists on the phisical storage -- but does not exists in the 'storage_object' table. @@ -28,8 +34,3 @@ CREATE TABLE storage_pending ( PRIMARY KEY (created_at, id) ); -CREATE INDEX storage_data__id__idx ON storage_data(id); -CREATE INDEX storage_object__id__deleted_at__idx - ON storage_object(id, deleted_at) - WHERE deleted_at IS NOT null; - diff --git a/backend/src/app/migrations/sql/0047-mod-file-change-table.sql b/backend/src/app/migrations/sql/0047-mod-file-change-table.sql new file mode 100644 index 000000000..01bb0f092 --- /dev/null +++ b/backend/src/app/migrations/sql/0047-mod-file-change-table.sql @@ -0,0 +1,16 @@ +--- Helps on the lagged changes query on update-file rpc +CREATE INDEX file_change__file_id__revn__idx ON file_change (file_id, revn); + +--- Drop redundant index +DROP INDEX page_change_file_id_idx; + +--- Add profile_id field. +ALTER TABLE file_change + ADD COLUMN profile_id uuid NULL REFERENCES profile (id) ON DELETE SET NULL; + +CREATE INDEX file_change__profile_id__idx + ON file_change (profile_id) + WHERE profile_id IS NOT NULL; + +--- Fix naming +ALTER INDEX file_change__created_at_idx RENAME TO file_change__created_at__idx; diff --git a/backend/src/app/migrations/sql/0048-mod-storage-tables.sql b/backend/src/app/migrations/sql/0048-mod-storage-tables.sql new file mode 100644 index 000000000..eb9fa8fed --- /dev/null +++ b/backend/src/app/migrations/sql/0048-mod-storage-tables.sql @@ -0,0 +1,9 @@ +--- Drop redundant index already covered by primary key +DROP INDEX storage_data__id__idx; + +--- Replace not efficient index with more efficient one +DROP INDEX storage_object__id__deleted_at__idx; + +CREATE INDEX storage_object__id__deleted_at__idx + ON storage_object(deleted_at, id) + WHERE deleted_at IS NOT NULL; From 0f9b2923c2657590b619d2e06df840bcdb5428a5 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Fri, 12 Feb 2021 16:01:59 +0100 Subject: [PATCH 14/90] :tada: Add msgbus abstraction. As a replacement for the current pubsub approach. It now uses a single connection for multiple subscriptions (instead of conn per subscription); has asynchronous publish and uses more efficient blob encoding for message encoding (the same used as page storage). --- CHANGES.md | 2 + backend/deps.edn | 2 +- backend/src/app/main.clj | 6 +- backend/src/app/msgbus.clj | 185 ++++++++++++++++++++++++ backend/src/app/notifications.clj | 39 +++-- backend/src/app/redis.clj | 58 -------- backend/src/app/rpc/mutations/files.clj | 116 ++++++++------- backend/src/app/util/redis.clj | 166 --------------------- 8 files changed, 269 insertions(+), 305 deletions(-) create mode 100644 backend/src/app/msgbus.clj delete mode 100644 backend/src/app/redis.clj delete mode 100644 backend/src/app/util/redis.clj diff --git a/CHANGES.md b/CHANGES.md index 6ebc27f3d..4487e3a75 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,8 @@ - Bounce & Complaint handling. - Disable groups interactions when holding "Ctrl" key (deep selection) - New action in context menu to "edit" some shapes (binded to key "Enter") +- Add major refactor of internal pubsub/redis code; improves + scalability and performance #640 ### Bugs fixed diff --git a/backend/deps.edn b/backend/deps.edn index 2452df5d9..7220b11b3 100644 --- a/backend/deps.edn +++ b/backend/deps.edn @@ -34,7 +34,7 @@ expound/expound {:mvn/version "0.8.7"} com.cognitect/transit-clj {:mvn/version "1.0.324"} - io.lettuce/lettuce-core {:mvn/version "5.2.2.RELEASE"} + io.lettuce/lettuce-core {:mvn/version "6.1.0.M1"} java-http-clj/java-http-clj {:mvn/version "0.4.1"} info.sunng/ring-jetty9-adapter {:mvn/version "0.14.2"} diff --git a/backend/src/app/main.clj b/backend/src/app/main.clj index ba8594798..2d4745719 100644 --- a/backend/src/app/main.clj +++ b/backend/src/app/main.clj @@ -49,7 +49,7 @@ :app.telemetry/migrations {} - :app.redis/redis + :app.msgbus/msgbus {:uri (:redis-uri config)} :app.tokens/tokens @@ -170,12 +170,12 @@ :tokens (ig/ref :app.tokens/tokens) :metrics (ig/ref :app.metrics/metrics) :storage (ig/ref :app.storage/storage) - :redis (ig/ref :app.redis/redis) + :msgbus (ig/ref :app.msgbus/msgbus) :rlimits (ig/ref :app.rlimits/all) :svgc (ig/ref :app.svgparse/svgc)} :app.notifications/handler - {:redis (ig/ref :app.redis/redis) + {:msgbus (ig/ref :app.msgbus/msgbus) :pool (ig/ref :app.db/pool) :session (ig/ref :app.http.session/session) :metrics (ig/ref :app.metrics/metrics)} diff --git a/backend/src/app/msgbus.clj b/backend/src/app/msgbus.clj new file mode 100644 index 000000000..ba38f76a3 --- /dev/null +++ b/backend/src/app/msgbus.clj @@ -0,0 +1,185 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2021 UXBOX Labs SL + +(ns app.msgbus + "The msgbus abstraction implemented using redis as underlying backend." + (:require + [app.common.spec :as us] + [app.util.blob :as blob] + [clojure.core.async :as a] + [clojure.spec.alpha :as s] + [clojure.tools.logging :as log] + [integrant.core :as ig] + [promesa.core :as p]) + (:import + io.lettuce.core.RedisClient + io.lettuce.core.RedisURI + io.lettuce.core.api.StatefulRedisConnection + io.lettuce.core.api.async.RedisAsyncCommands + io.lettuce.core.codec.ByteArrayCodec + io.lettuce.core.codec.RedisCodec + io.lettuce.core.codec.StringCodec + io.lettuce.core.pubsub.RedisPubSubListener + io.lettuce.core.pubsub.StatefulRedisPubSubConnection + io.lettuce.core.pubsub.api.async.RedisPubSubAsyncCommands)) + +(declare impl-publish-loop) +(declare impl-redis-pub) +(declare impl-redis-sub) +(declare impl-redis-unsub) +(declare impl-subscribe-loop) + + +;; --- STATE INIT: Publisher + +(s/def ::uri ::us/string) +(s/def ::buffer-size ::us/integer) + +(defmethod ig/pre-init-spec ::msgbus [_] + (s/keys :req-un [::uri] + :opt-un [::buffer-size])) + +(defmethod ig/prep-key ::msgbus + [_ cfg] + (merge {:buffer-size 128} cfg)) + +(defmethod ig/init-key ::msgbus + [_ {:keys [uri buffer-size] :as cfg}] + (let [codec (RedisCodec/of StringCodec/UTF8 ByteArrayCodec/INSTANCE) + + uri (RedisURI/create uri) + rclient (RedisClient/create ^RedisURI uri) + + snd-conn (.connect ^RedisClient rclient ^RedisCodec codec) + rcv-conn (.connectPubSub ^RedisClient rclient ^RedisCodec codec) + + snd-buff (a/chan (a/sliding-buffer buffer-size)) + rcv-buff (a/chan (a/sliding-buffer buffer-size)) + sub-buff (a/chan 1) + cch (a/chan 1)] + + ;; Start the sending (publishing) loop + (impl-publish-loop snd-conn snd-buff cch) + + ;; Start the receiving (subscribing) loop + (impl-subscribe-loop rcv-conn rcv-buff sub-buff cch) + + (with-meta + (fn run + ([command] (run command nil)) + ([command params] + (a/go + (case command + :pub (a/>! snd-buff params) + :sub (a/>! sub-buff params))))) + + {::snd-conn snd-conn + ::rcv-conn rcv-conn + ::cch cch + ::snd-buff snd-buff + ::rcv-buff rcv-buff}))) + +(defmethod ig/halt-key! ::msgbus + [_ f] + (let [mdata (meta f)] + (.close ^StatefulRedisConnection (::snd-conn mdata)) + (.close ^StatefulRedisPubSubConnection (::rcv-conn mdata)) + (a/close! (::cch mdata)) + (a/close! (::snd-buff mdata)) + (a/close! (::rcv-buff mdata)))) + +(defn- impl-redis-pub + [rac {:keys [topic message]}] + (let [topic (str topic) + message (blob/encode message) + res (a/chan 1)] + (-> (.publish ^RedisAsyncCommands rac ^String topic ^bytes message) + (p/finally (fn [_ e] + (when e (a/>!! res e)) + (a/close! res)))) + res)) + +(defn- impl-publish-loop + [conn in-buff cch] + (let [rac (.async ^StatefulRedisConnection conn)] + (a/go-loop [] + (let [[val _] (a/alts! [in-buff cch])] + (when (some? val) + (let [result (a/! ch (:message val)) + (recur (rest chans) pending) + (recur (rest chans) (conj pending ch))) + pending)) + chans (update chans topic #(reduce disj % pending))] + (when (empty? (get chans topic)) + (a/ (.subscribe cmd (into-array String [topic])) + (p/finally (fn [_ e] + (when e (a/>!! res e)) + (a/close! res)))) + res)) + + +(defn impl-redis-unsub + [conn topic] + (let [^RedisPubSubAsyncCommands cmd (.async ^StatefulRedisPubSubConnection conn) + res (a/chan 1)] + (-> (.unsubscribe cmd (into-array String [topic])) + (p/finally (fn [_ e] + (when e (a/>!! res e)) + (a/close! res)))) + res)) diff --git a/backend/src/app/notifications.clj b/backend/src/app/notifications.clj index e8543d9d7..7aefa4e45 100644 --- a/backend/src/app/notifications.clj +++ b/backend/src/app/notifications.clj @@ -13,7 +13,6 @@ [app.common.spec :as us] [app.db :as db] [app.metrics :as mtx] - [app.redis :as rd] [app.util.async :as aa] [app.util.transit :as t] [clojure.core.async :as a] @@ -34,9 +33,10 @@ (declare handler) (s/def ::session map?) +(s/def ::msgbus fn?) (defmethod ig/pre-init-spec ::handler [_] - (s/keys :req-un [::rd/redis ::db/pool ::session ::mtx/metrics])) + (s/keys :req-un [::msgbus ::db/pool ::session ::mtx/metrics])) (defmethod ig/init-key ::handler [_ {:keys [session metrics] :as cfg}] @@ -127,7 +127,7 @@ false))) (defn websocket - [{:keys [file-id team-id redis] :as cfg}] + [{:keys [file-id team-id msgbus] :as cfg}] (let [in (a/chan 32) out (a/chan 32) mtx-active-connections (:mtx-active-connections cfg) @@ -138,10 +138,13 @@ (letfn [(on-connect [conn] (mtx-active-connections :inc) - (let [sub (rd/subscribe redis {:xform (map t/decode-str) - :topics [file-id team-id]}) + (let [sub (a/chan) ws (WebSocket. conn in out sub nil cfg)] + ;; Subscribe to corresponding topics + (a/ - -(ns app.redis - (:refer-clojure :exclude [run!]) - (:require - [app.common.spec :as us] - [app.util.redis :as redis] - [clojure.spec.alpha :as s] - [integrant.core :as ig]) - (:import - java.lang.AutoCloseable)) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; State -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(defmethod ig/pre-init-spec ::redis [_] - (s/keys :req-un [::uri])) - -(defmethod ig/init-key ::redis - [_ cfg] - (let [client (redis/client (:uri cfg "redis://redis/0")) - conn (redis/connect client)] - {::client client - ::conn conn})) - -(defmethod ig/halt-key! ::redis - [_ {:keys [::client ::conn]}] - (.close ^AutoCloseable conn) - (.close ^AutoCloseable client)) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; API -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(s/def ::client some?) -(s/def ::conn some?) -(s/def ::redis (s/keys :req [::client ::conn])) - -(defn subscribe - [client opts] - (us/assert ::redis client) - (redis/subscribe (::client client) opts)) - -(defn run! - [client cmd params] - (us/assert ::redis client) - (redis/run! (::conn client) cmd params)) - -(defn run - [client cmd params] - (us/assert ::redis client) - (redis/run (::conn client) cmd params)) - diff --git a/backend/src/app/rpc/mutations/files.clj b/backend/src/app/rpc/mutations/files.clj index 9d04afeb2..990273881 100644 --- a/backend/src/app/rpc/mutations/files.clj +++ b/backend/src/app/rpc/mutations/files.clj @@ -16,14 +16,12 @@ [app.common.uuid :as uuid] [app.config :as cfg] [app.db :as db] - [app.redis :as rd] [app.rpc.queries.files :as files] [app.rpc.queries.projects :as proj] [app.tasks :as tasks] [app.util.blob :as blob] [app.util.services :as sv] [app.util.time :as dt] - [app.util.transit :as t] [clojure.spec.alpha :as s])) ;; --- Helpers & Specs @@ -252,19 +250,22 @@ :reg-objects :mov-objects} (:type change)) (some? (:component-id change))))) -(declare update-file) -(declare retrieve-lagged-changes) (declare insert-change) +(declare retrieve-lagged-changes) +(declare retrieve-team-id) +(declare send-notifications) +(declare update-file) (sv/defmethod ::update-file [{:keys [pool] :as cfg} {:keys [id profile-id] :as params}] (db/with-atomic [conn pool] (let [{:keys [id] :as file} (db/get-by-id conn :file id {:for-update true})] (files/check-edition-permissions! conn profile-id id) - (update-file (assoc cfg :conn conn) file params)))) + (update-file (assoc cfg :conn conn) + (assoc params :file file))))) (defn- update-file - [{:keys [conn redis]} file params] + [{:keys [conn] :as cfg} {:keys [file changes session-id] :as params}] (when (> (:revn params) (:revn file)) (ex/raise :type :validation @@ -272,64 +273,69 @@ :hint "The incoming revision number is greater that stored version." :context {:incoming-revn (:revn params) :stored-revn (:revn file)})) - (let [sid (:session-id params) - changes (:changes params) - file (-> file - (update :data blob/decode) - (update :data assoc :id (:id file)) - (update :data pmg/migrate-data) - (update :data cp/process-changes changes) - (update :data blob/encode) - (update :revn inc) - (assoc :changes (blob/encode changes) - :session-id sid)) - _ (insert-change conn file) - msg {:type :file-change - :profile-id (:profile-id params) - :file-id (:id file) - :session-id sid - :revn (:revn file) - :changes changes} - - library-changes (filter library-change? changes)] - - @(rd/run! redis :publish {:channel (str (:id file)) - :message (t/encode-str msg)}) - - (when (and (:is-shared file) (seq library-changes)) - (let [{:keys [team-id] :as project} - (db/get-by-id conn :project (:project-id file)) - - msg {:type :library-change - :profile-id (:profile-id params) + (let [file (-> file + (update :revn inc) + (update :data (fn [data] + (-> data + (blob/decode) + (assoc :id (:id file)) + (pmg/migrate-data) + (cp/process-changes changes) + (blob/encode)))))] + ;; Insert change to the xlog + (db/insert! conn :file-change + {:id (uuid/next) + :session-id session-id :file-id (:id file) - :session-id sid :revn (:revn file) - :modified-at (dt/now) - :changes library-changes}] - - @(rd/run! redis :publish {:channel (str team-id) - :message (t/encode-str msg)}))) + :data (:data file) + :changes (blob/encode changes)}) + ;; Update file (db/update! conn :file {:revn (:revn file) - :data (:data file)} + :data (:data file) + :has-media-trimmed false} {:id (:id file)}) - (retrieve-lagged-changes conn params))) + (let [params (assoc params :file file)] + ;; Send asynchronous notifications + (send-notifications cfg params) -(defn- insert-change - [conn {:keys [revn data changes session-id] :as file}] - (let [id (uuid/next) - file-id (:id file)] - (db/insert! conn :file-change - {:id id - :session-id session-id - :file-id file-id - :revn revn - :data data - :changes changes}))) + ;; Retrieve and return lagged data + (retrieve-lagged-changes conn params)))) + +(defn- send-notifications + [{:keys [msgbus conn] :as cfg} {:keys [file changes session-id] :as params}] + (let [lchanges (filter library-change? changes)] + + ;; Asynchronously publish message to the msgbus + (msgbus :pub {:topic (str (:id file)) + :message + {:type :file-change + :profile-id (:profile-id params) + :file-id (:id file) + :session-id (:session-id params) + :revn (:revn file) + :changes changes}}) + + (when (and (:is-shared file) (seq lchanges)) + (let [team-id (retrieve-team-id conn (:project-id file))] + ;; Asynchronously publish message to the msgbus + (msgbus :pub {:topic (str team-id) + :message + {:type :library-change + :profile-id (:profile-id params) + :file-id (:id file) + :session-id session-id + :revn (:revn file) + :modified-at (dt/now) + :changes lchanges}}))))) + +(defn- retrieve-team-id + [conn project-id] + (:team-id (db/get-by-id conn :project project-id {:columns [:team-id]}))) (def ^:private sql:lagged-changes diff --git a/backend/src/app/util/redis.clj b/backend/src/app/util/redis.clj deleted file mode 100644 index 0be8b5b46..000000000 --- a/backend/src/app/util/redis.clj +++ /dev/null @@ -1,166 +0,0 @@ -;; This Source Code Form is subject to the terms of the Mozilla Public -;; License, v. 2.0. If a copy of the MPL was not distributed with this -;; file, You can obtain one at http://mozilla.org/MPL/2.0/. -;; -;; This Source Code Form is "Incompatible With Secondary Licenses", as -;; defined by the Mozilla Public License, v. 2.0. -;; -;; Copyright (c) 2020 UXBOX Labs SL - -(ns app.util.redis - "Asynchronous posgresql client." - (:refer-clojure :exclude [run!]) - (:require - [clojure.core.async :as a] - [promesa.core :as p]) - (:import - io.lettuce.core.RedisClient - io.lettuce.core.RedisURI - io.lettuce.core.codec.StringCodec - io.lettuce.core.api.async.RedisAsyncCommands - io.lettuce.core.api.StatefulRedisConnection - io.lettuce.core.pubsub.RedisPubSubListener - io.lettuce.core.pubsub.StatefulRedisPubSubConnection - io.lettuce.core.pubsub.api.sync.RedisPubSubCommands - )) - -(defrecord Client [^RedisClient inner - ^RedisURI uri] - clojure.lang.IDeref - (deref [_] inner) - - java.lang.AutoCloseable - (close [_] - (.shutdown inner))) - -(defrecord Connection [^StatefulRedisConnection inner - ^RedisAsyncCommands cmd] - clojure.lang.IDeref - (deref [_] inner) - - java.lang.AutoCloseable - (close [_] - (.close ^StatefulRedisConnection inner))) - -(defn client - [uri] - (->Client (RedisClient/create) - (RedisURI/create uri))) - -(defn connect - [{:keys [uri] :as client}] - (let [conn (.connect ^RedisClient @client StringCodec/UTF8 ^RedisURI uri)] - (->Connection conn (.async ^StatefulRedisConnection conn)))) - -(defn- impl-subscribe - [topics xform ^StatefulRedisPubSubConnection conn] - (let [cmd (.sync conn) - output (a/chan 1 (comp (filter string?) xform)) - buffer (a/chan (a/sliding-buffer 64)) - sub (reify RedisPubSubListener - (message [it pattern channel message]) - (message [it channel message] - ;; There are no back pressure, so we use a slidding - ;; buffer for cases when the pubsub broker sends - ;; more messages that we can process. - (a/put! buffer message)) - (psubscribed [it pattern count]) - (punsubscribed [it pattern count]) - (subscribed [it channel count]) - (unsubscribed [it channel count]))] - - ;; Start message event-loop (with keepalive mechanism) - (a/go-loop [] - (let [[val port] (a/alts! [buffer (a/timeout 5000)]) - message (if (= port buffer) val ::keepalive)] - (if (a/>! output message) - (recur) - (do - (a/close! buffer) - (.removeListener conn sub) - (when (.isOpen conn) - (.close conn)))))) - - ;; Synchronously subscribe to topics - (.addListener conn sub) - (.subscribe ^RedisPubSubCommands cmd topics) - - ;; Return the output channel - output)) - -(defn subscribe - [{:keys [uri] :as client} {:keys [topics xform]}] - (let [topics (if (vector? topics) - (into-array String (map str topics)) - (into-array String [(str topics)]))] - (->> (.connectPubSub ^RedisClient @client StringCodec/UTF8 ^RedisURI uri) - (impl-subscribe topics xform)))) - -(defn- resolve-to-bool - [v] - (if (= v 1) - true - false)) - -(defmulti impl-run (fn [_ cmd _] cmd)) - -(defn run! - [conn cmd params] - (let [^RedisAsyncCommands conn (:cmd conn)] - (impl-run conn cmd params))) - -(defn run - [conn cmd params] - (let [res (a/chan 1)] - (if (instance? Connection conn) - (-> (run! conn cmd params) - (p/finally (fn [v e] - (if e - (a/offer! res e) - (a/offer! res v))))) - (a/close! res)) - res)) - -(defmethod impl-run :get - [conn _ {:keys [key]}] - (.get ^RedisAsyncCommands conn ^String key)) - -(defmethod impl-run :set - [conn _ {:keys [key val]}] - (.set ^RedisAsyncCommands conn ^String key ^String val)) - -(defmethod impl-run :smembers - [conn _ {:keys [key]}] - (-> (.smembers ^RedisAsyncCommands conn ^String key) - (p/then' #(into #{} %)))) - -(defmethod impl-run :sadd - [conn _ {:keys [key val]}] - (let [keys (into-array String [val])] - (-> (.sadd ^RedisAsyncCommands conn ^String key ^"[S;" keys) - (p/then resolve-to-bool)))) - -(defmethod impl-run :srem - [conn _ {:keys [key val]}] - (let [keys (into-array String [val])] - (-> (.srem ^RedisAsyncCommands conn ^String key ^"[S;" keys) - (p/then resolve-to-bool)))) - -(defmethod impl-run :publish - [conn _ {:keys [channel message]}] - (-> (.publish ^RedisAsyncCommands conn ^String channel ^String message) - (p/then resolve-to-bool))) - -(defmethod impl-run :hset - [^RedisAsyncCommands conn _ {:keys [key field value]}] - (.hset conn key field value)) - -(defmethod impl-run :hgetall - [^RedisAsyncCommands conn _ {:keys [key]}] - (.hgetall conn key)) - -(defmethod impl-run :hdel - [^RedisAsyncCommands conn _ {:keys [key field]}] - (let [fields (into-array String [field])] - (.hdel conn key fields))) - From 0014bb3d246a2e464850b8fabff13a9bbe027f6b Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Tue, 16 Feb 2021 13:46:31 +0100 Subject: [PATCH 15/90] :bug: Fix problem with indices refreshing on page changes --- CHANGES.md | 22 +++++++++---------- .../src/app/main/data/workspace/common.cljs | 22 ++++++++++++++++--- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4487e3a75..e5ac238e5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,30 +1,28 @@ # CHANGELOG # -## Next +## :rocket: Next -### New features +### :sparkles: New features +- Add major refactor of internal pubsub/redis code; improves scalability and performance #640 - Add optional loki integration. - Bounce & Complaint handling. - Disable groups interactions when holding "Ctrl" key (deep selection) - New action in context menu to "edit" some shapes (binded to key "Enter") -- Add major refactor of internal pubsub/redis code; improves - scalability and performance #640 -### Bugs fixed +### :bug: Bugs fixed +- Add some missing database indexes (mainly improves performance on large databases on file-update rpc method, and some background tasks). +- Fix problem width handoff code generation [Taiga #1204](https://tree.taiga.io/project/penpot/issue/1204) +- Fix problem with indices refreshing on page changes [#646](https://github.com/penpot/penpot/issues/646) - Properly handle errors on github, gitlab and ldap auth backends. - Properly mark profile auth backend (on first register/ auth with 3rd party auth provider). -- Fix problem width handoff code generation [Taiga #1204](https://tree.taiga.io/project/penpot/issue/1204) -- Add some missing database indexes (mainly improves performance on - large databases on file-update rpc method, and some background - tasks). ## 1.2.0-alpha -### New features +### :sparkles: New features - Add horizontal/vertical flip - Add images lock proportions by default [#541](https://github.com/penpot/penpot/discussions/541), [#609](https://github.com/penpot/penpot/issues/609) @@ -37,7 +35,7 @@ - Fix behavior of select all command when there are objects outside frames [Taiga #1209](https://tree.taiga.io/project/penpot/issue/1209) -### Bugs fixed +### :bug: Bugs fixed - Fix 404 when access shared link [#615](https://github.com/penpot/penpot/issues/615) - Fix 500 when requestion password reset @@ -57,7 +55,7 @@ - Fix updates on collaborative editing not updating selection rectangles [Taiga #1127](https://tree.taiga.io/project/penpot/issue/1127) - Make the team deletion deferred (in the same way other objects) -### Community contributions by (Thank you! :heart:) +### :heart: Community contributions by (Thank you!) - abtinmo [#538](https://github.com/penpot/penpot/pull/538) - kdrag0n [#585](https://github.com/penpot/penpot/pull/585) diff --git a/frontend/src/app/main/data/workspace/common.cljs b/frontend/src/app/main/data/workspace/common.cljs index b4b8a128f..a83b4c68f 100644 --- a/frontend/src/app/main/data/workspace/common.cljs +++ b/frontend/src/app/main/data/workspace/common.cljs @@ -63,6 +63,8 @@ ;; --- Changes Handling +(defonce page-change? #{:add-page :mod-page :del-page :mov-page}) + (defn commit-changes ([changes undo-changes] (commit-changes changes undo-changes {})) @@ -105,10 +107,24 @@ ptk/WatchEvent (watch [_ state stream] (when-not @error - (let [page-id (:current-page-id state)] + (let [;; adds page-id to page changes (that have the `id` field instead) + add-page-id + (fn [{:keys [id type page] :as change}] + (cond-> change + (page-change? type) + (assoc :page-id (or id (:id page))))) + + changes-by-pages + (->> changes + (map add-page-id) + (remove #(nil? (:page-id %))) + (group-by :page-id)) + + process-page-changes + (fn [[page-id changes]] + (update-indices page-id changes))] (rx/concat - (when (some :page-id changes) - (rx/of (update-indices page-id changes))) + (rx/from (map process-page-changes changes-by-pages)) (when (and save-undo? (seq undo-changes)) (let [entry {:undo-changes undo-changes From 41aede2b5053e3033aedb67e8c7f78149d648aa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Moya?= Date: Fri, 12 Feb 2021 14:03:33 +0100 Subject: [PATCH 16/90] :bug: Have language change notification written in the new language --- CHANGES.md | 1 + frontend/src/app/main.cljs | 2 +- frontend/src/app/main/data/users.cljs | 68 ++++++++++--------- frontend/src/app/main/ui/auth/register.cljs | 2 +- .../src/app/main/ui/auth/verify_token.cljs | 4 +- 5 files changed, 41 insertions(+), 36 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index e5ac238e5..b2e94b83f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -16,6 +16,7 @@ - Add some missing database indexes (mainly improves performance on large databases on file-update rpc method, and some background tasks). - Fix problem width handoff code generation [Taiga #1204](https://tree.taiga.io/project/penpot/issue/1204) - Fix problem with indices refreshing on page changes [#646](https://github.com/penpot/penpot/issues/646) +- Have language change notification written in the new language [Taiga #1205](https://tree.taiga.io/project/penpot/issue/1205) - Properly handle errors on github, gitlab and ldap auth backends. - Properly mark profile auth backend (on first register/ auth with 3rd party auth provider). diff --git a/frontend/src/app/main.cljs b/frontend/src/app/main.cljs index 0e678384f..883e96c93 100644 --- a/frontend/src/app/main.cljs +++ b/frontend/src/app/main.cljs @@ -82,7 +82,7 @@ (st/emit! (rt/initialize-router ui/routes) (rt/initialize-history on-navigate)) - (st/emit! udu/fetch-profile) + (st/emit! (udu/fetch-profile)) (mf/mount (mf/element ui/app) (dom/get-element "app")) (mf/mount (mf/element modal) (dom/get-element "modal"))) diff --git a/frontend/src/app/main/data/users.cljs b/frontend/src/app/main/data/users.cljs index 4aec70645..1630aa492 100644 --- a/frontend/src/app/main/data/users.cljs +++ b/frontend/src/app/main/data/users.cljs @@ -50,38 +50,43 @@ ;; --- Profile Fetched (defn profile-fetched - [{:keys [fullname] :as data}] - (us/verify ::profile data) - (ptk/reify ::profile-fetched - ptk/UpdateEvent - (update [_ state] - (assoc state :profile - (cond-> data - (nil? (:lang data)) - (assoc :lang cfg/default-language) + ([data] (profile-fetched nil data)) + ([on-success {:keys [fullname] :as data}] + (us/verify ::profile data) + (ptk/reify ::profile-fetched + ptk/UpdateEvent + (update [_ state] + (assoc state :profile + (cond-> data + (nil? (:lang data)) + (assoc :lang cfg/default-language) - (nil? (:theme data)) - (assoc :theme cfg/default-theme)))) + (nil? (:theme data)) + (assoc :theme cfg/default-theme)))) - ptk/EffectEvent - (effect [_ state stream] - (let [profile (:profile state)] - (swap! storage assoc :profile profile) - (i18n/set-current-locale! (:lang profile)) - (theme/set-current-theme! (:theme profile)))))) + ptk/EffectEvent + (effect [_ state stream] + (let [profile (:profile state)] + (swap! storage assoc :profile profile) + (i18n/set-current-locale! (:lang profile)) + (theme/set-current-theme! (:theme profile)) + (when on-success + (on-success))))))) ;; --- Fetch Profile -(def fetch-profile - (reify - ptk/WatchEvent - (watch [_ state s] - (->> (rp/query! :profile) - (rx/map profile-fetched) - (rx/catch (fn [error] - (if (= (:type error) :not-found) - (rx/of (rt/nav :auth-login)) - (rx/empty)))))))) +(defn fetch-profile + ([] (fetch-profile nil)) + ([on-success] + (reify + ptk/WatchEvent + (watch [_ state s] + (->> (rp/query! :profile) + (rx/map (partial profile-fetched on-success)) + (rx/catch (fn [error] + (if (= (:type error) :not-found) + (rx/of (rt/nav :auth-login)) + (rx/empty))))))))) ;; --- Update Profile @@ -97,8 +102,7 @@ handle-error #(do (on-error (:payload %)) (rx/empty))] (->> (rp/mutation :update-profile data) - (rx/do on-success) - (rx/map (constantly fetch-profile)) + (rx/map (constantly (fetch-profile on-success))) (rx/catch rp/client-error? handle-error)))))) ;; --- Request Email Change @@ -123,7 +127,7 @@ ptk/WatchEvent (watch [_ state stream] (->> (rp/mutation :cancel-email-change {}) - (rx/map (constantly fetch-profile)))))) + (rx/map (constantly (fetch-profile))))))) ;; --- Update Password (Form) @@ -158,7 +162,7 @@ (watch [_ state stream] (let [{:keys [id] :as profile} (:profile state)] (->> (rp/mutation :update-profile-props {:props {:onboarding-viewed true}}) - (rx/map (constantly fetch-profile))))))) + (rx/map (constantly (fetch-profile)))))))) ;; --- Update Photo @@ -184,7 +188,7 @@ (rx/map prepare) (rx/mapcat #(rp/mutation :update-profile-photo %)) (rx/do on-success) - (rx/map (constantly fetch-profile)) + (rx/map (constantly (fetch-profile))) (rx/catch on-error)))))) diff --git a/frontend/src/app/main/ui/auth/register.cljs b/frontend/src/app/main/ui/auth/register.cljs index c5acb1dac..49605fcee 100644 --- a/frontend/src/app/main/ui/auth/register.cljs +++ b/frontend/src/app/main/ui/auth/register.cljs @@ -84,7 +84,7 @@ (if (and (:is-active data) (:claims data)) (let [message (tr "auth.notifications.team-invitation-accepted")] (st/emit! (rt/nav :dashboard-projects {:team-id (get-in data [:claims :team-id])}) - du/fetch-profile + (du/fetch-profile) (dm/success message))) (st/emit! (rt/nav :auth-register-success {} {:email (:email data)}))))) diff --git a/frontend/src/app/main/ui/auth/verify_token.cljs b/frontend/src/app/main/ui/auth/verify_token.cljs index 0f0136837..8e060aa99 100644 --- a/frontend/src/app/main/ui/auth/verify_token.cljs +++ b/frontend/src/app/main/ui/auth/verify_token.cljs @@ -42,7 +42,7 @@ (let [msg (tr "dashboard.notifications.email-changed-successfully")] (ts/schedule 100 #(st/emit! (dm/success msg))) (st/emit! (rt/nav :settings-profile) - du/fetch-profile))) + (du/fetch-profile)))) (defmethod handle-token :auth [tdata] @@ -53,7 +53,7 @@ (case (:state tdata) :created (let [message (tr "auth.notifications.team-invitation-accepted")] - (st/emit! du/fetch-profile + (st/emit! (du/fetch-profile) (rt/nav :dashboard-projects {:team-id (:team-id tdata)}) (dm/success message))) From cfa47cc7b9f21985ca7ad01d9425e96d967ba7cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Moya?= Date: Wed, 17 Feb 2021 12:13:58 +0100 Subject: [PATCH 17/90] :bug: Fix small typo --- frontend/resources/locales.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/resources/locales.json b/frontend/resources/locales.json index b16baae2f..cce095e48 100644 --- a/frontend/resources/locales.json +++ b/frontend/resources/locales.json @@ -3452,7 +3452,7 @@ "en" : "Export", "fr" : "Export", "ru" : "Экспорт", - "es" : "Exprotar" + "es" : "Exportar" } }, "workspace.options.export-object" : { From e96d2336cf757aaaf6a8bbeb25a29de2de281f9a Mon Sep 17 00:00:00 2001 From: elhombretecla Date: Wed, 17 Feb 2021 17:28:51 +0100 Subject: [PATCH 18/90] :sparkles: Add links to web and terms --- .../resources/styles/main/layouts/login.scss | 19 +++++++++++++++---- frontend/src/app/main/ui/auth.cljs | 8 ++++++-- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/frontend/resources/styles/main/layouts/login.scss b/frontend/resources/styles/main/layouts/login.scss index ba80b79f3..e4b890d37 100644 --- a/frontend/resources/styles/main/layouts/login.scss +++ b/frontend/resources/styles/main/layouts/login.scss @@ -45,12 +45,13 @@ } .auth-content { - grid-column: 2 / span 1; - height: 100vh; - display: flex; - justify-content: center; align-items: center; background-color: $color-white; + display: flex; + grid-column: 2 / span 1; + height: 100vh; + justify-content: center; + position: relative; .form-container { width: 412px; @@ -91,3 +92,13 @@ } } } + +.terms-login { + bottom: $big; + font-size: $fs14; + position: absolute; + + span { + margin: 0 $small; + } +} diff --git a/frontend/src/app/main/ui/auth.cljs b/frontend/src/app/main/ui/auth.cljs index 19065079b..ecb65ec20 100644 --- a/frontend/src/app/main/ui/auth.cljs +++ b/frontend/src/app/main/ui/auth.cljs @@ -37,7 +37,7 @@ [:div.auth [:section.auth-sidebar - [:a.logo {:href "/#/"} i/logo] + [:a.logo {:href "https://penpot.app"} i/logo] [:span.tagline (t locale "auth.sidebar-tagline")]] [:section.auth-content @@ -56,4 +56,8 @@ :auth-recovery [:& recovery-page {:locale locale - :params (:query-params route)}])]])) + :params (:query-params route)}]) + [:div.terms-login + [:a {:href "https://penpot.app/terms.html" :target "_blank"} "Terms of service"] + [:span "and"] + [:a {:href "https://penpot.app/privacy.html" :target "_blank"} "Privacy policy"]]]])) From 0f359069309bdf597d09dbf83d794434385e7275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Moya?= Date: Wed, 17 Feb 2021 16:27:45 +0100 Subject: [PATCH 19/90] :sparkles: Add internal links for long error reports --- backend/resources/error-report.tmpl | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/backend/resources/error-report.tmpl b/backend/resources/error-report.tmpl index be4df1196..a04f0df6b 100644 --- a/backend/resources/error-report.tmpl +++ b/backend/resources/error-report.tmpl @@ -143,8 +143,18 @@ {% endif %} + {% if explain %} + + {% endif %} + {% if data %} + + {% endif %} + {% if error %} + + {% endif %} + {% if params %} -
+
PARAMS: 
{{params}}
@@ -153,7 +163,7 @@ {% endif %} {% if explain %} -
+
EXPLAIN: 
{{explain}}
@@ -162,7 +172,7 @@ {% endif %} {% if data %} -
+
EDATA: 
{{data}}
@@ -171,7 +181,7 @@ {% endif %} {% if error %} -
+
TRACE:
{{error.trace}}
From 2e084cc2a604a1409701e6fe18b71f71f3d5bf5b Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 15 Feb 2021 20:27:46 +0100 Subject: [PATCH 20/90] :bug: Add more generic error handing to svgparse. --- backend/src/app/svgparse.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/app/svgparse.clj b/backend/src/app/svgparse.clj index f9d658663..9f1662f2d 100644 --- a/backend/src/app/svgparse.clj +++ b/backend/src/app/svgparse.clj @@ -124,7 +124,7 @@ (try (with-open [istream (IOUtils/toInputStream data "UTF-8")] (xml/parse istream)) - (catch org.xml.sax.SAXParseException _e + (catch Exception _e (ex/raise :type :validation :code :invalid-svg-file)))) From 784a4f8ecd5ed147e236564ecaf683df279a4d6e Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 15 Feb 2021 21:03:24 +0100 Subject: [PATCH 21/90] :sparkles: Add some type hints and remove legacy code. --- backend/src/app/db.clj | 7 +- backend/src/app/media.clj | 6 +- backend/src/app/notifications.clj | 6 +- backend/src/app/rpc/queries/files.clj | 5 +- backend/src/app/rpc/queries/recent_files.clj | 2 - backend/src/app/storage.clj | 2 +- backend/src/app/storage/impl.clj | 2 +- backend/src/app/util/blob.clj | 4 +- backend/src/app/util/emails.clj | 2 +- backend/src/app/util/svg.clj | 101 ------------------- backend/tests/app/tests/test_util_svg.clj | 62 ------------ 11 files changed, 18 insertions(+), 181 deletions(-) delete mode 100644 backend/src/app/util/svg.clj delete mode 100644 backend/tests/app/tests/test_util_svg.clj diff --git a/backend/src/app/db.clj b/backend/src/app/db.clj index 99e4da7d2..d85ece5bc 100644 --- a/backend/src/app/db.clj +++ b/backend/src/app/db.clj @@ -27,6 +27,7 @@ com.zaxxer.hikari.HikariConfig com.zaxxer.hikari.HikariDataSource com.zaxxer.hikari.metrics.prometheus.PrometheusMetricsTrackerFactory + java.lang.AutoCloseable java.sql.Connection java.sql.Savepoint org.postgresql.PGConnection @@ -59,7 +60,7 @@ (log/debugf "initialize connection pool %s with uri %s" (:name cfg) (:uri cfg)) (let [pool (create-pool cfg)] (when (seq migrations) - (with-open [conn (open pool)] + (with-open [conn ^AutoCloseable (open pool)] (mg/setup! conn) (doseq [[mname steps] migrations] (mg/migrate! conn {:name (name mname) :steps steps})))) @@ -164,7 +165,7 @@ [& args] `(jdbc/with-transaction ~@args)) -(defn open +(defn ^Connection open [pool] (jdbc/get-connection pool)) @@ -288,7 +289,7 @@ (pginterval data) (dt/duration? data) - (->> (/ (.toMillis data) 1000.0) + (->> (/ (.toMillis ^java.time.Duration data) 1000.0) (format "%s seconds") (pginterval)) diff --git a/backend/src/app/media.clj b/backend/src/app/media.clj index 14a4191e0..13219f23a 100644 --- a/backend/src/app/media.clj +++ b/backend/src/app/media.clj @@ -77,7 +77,7 @@ (assoc params :format format :mtype (cm/format->mtype format) - :size (alength thumbnail-data) + :size (alength ^bytes thumbnail-data) :data (ByteArrayInputStream. thumbnail-data))))) (defmulti process :cmd) @@ -89,7 +89,7 @@ (.addImage) (.autoOrient) (.strip) - (.thumbnail (int width) (int height) ">") + (.thumbnail ^Integer (int width) ^Integer (int height) ">") (.quality (double quality)) (.addImage))] (generic-process (assoc params :operation op)))) @@ -101,7 +101,7 @@ (.addImage) (.autoOrient) (.strip) - (.thumbnail (int width) (int height) "^") + (.thumbnail ^Integer (int width) ^Integer (int height) "^") (.gravity "center") (.extent (int width) (int height)) (.quality (double quality)) diff --git a/backend/src/app/notifications.clj b/backend/src/app/notifications.clj index 7aefa4e45..4ff66aac8 100644 --- a/backend/src/app/notifications.clj +++ b/backend/src/app/notifications.clj @@ -22,7 +22,9 @@ [ring.adapter.jetty9 :as jetty] [ring.middleware.cookies :refer [wrap-cookies]] [ring.middleware.keyword-params :refer [wrap-keyword-params]] - [ring.middleware.params :refer [wrap-params]])) + [ring.middleware.params :refer [wrap-params]]) + (:import + org.eclipse.jetty.websocket.api.WebSocketAdapter)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Http Handler @@ -187,7 +189,7 @@ (aa/ row changes (assoc :changes (blob/decode changes)) - data (assoc :data (blob/decode data)) - pages (assoc :pages (vec (.getArray pages)))))) + data (assoc :data (blob/decode data))))) (def decode-row-xf (comp (map decode-row) diff --git a/backend/src/app/rpc/queries/recent_files.clj b/backend/src/app/rpc/queries/recent_files.clj index 24a5653ea..1791b784b 100644 --- a/backend/src/app/rpc/queries/recent_files.clj +++ b/backend/src/app/rpc/queries/recent_files.clj @@ -41,5 +41,3 @@ (teams/check-read-permissions! conn profile-id team-id) (let [files (db/exec! conn [sql:recent-files team-id])] (into [] decode-row-xf files)))) - - diff --git a/backend/src/app/storage.clj b/backend/src/app/storage.clj index 7e5371d50..94e7e3b70 100644 --- a/backend/src/app/storage.clj +++ b/backend/src/app/storage.clj @@ -308,7 +308,7 @@ (if-let [[groups total] (retrieve-deleted-objects conn)] (do (run! (partial delete-in-bulk conn) groups) - (recur (+ n total))) + (recur (+ n ^long total))) (do (log/infof "gc-deleted: processed %s items" n) {:deleted n}))))))) diff --git a/backend/src/app/storage/impl.clj b/backend/src/app/storage/impl.clj index 450ae718c..00f356f56 100644 --- a/backend/src/app/storage/impl.clj +++ b/backend/src/app/storage/impl.clj @@ -165,7 +165,7 @@ (string->content data) (bytes? data) - (input-stream->content (ByteArrayInputStream. ^bytes data) (alength data)) + (input-stream->content (ByteArrayInputStream. ^bytes data) (alength ^bytes data)) (instance? InputStream data) (do diff --git a/backend/src/app/util/blob.clj b/backend/src/app/util/blob.clj index 332aedaeb..dd1624b1f 100644 --- a/backend/src/app/util/blob.clj +++ b/backend/src/app/util/blob.clj @@ -37,7 +37,7 @@ (defn encode ([data] (encode data nil)) ([data {:keys [version] :or {version default-version}}] - (case version + (case (long version) 1 (encode-v1 data) 2 (encode-v2 data) (throw (ex-info "unsupported version" {:version version}))))) @@ -81,7 +81,7 @@ (defn- encode-v2 [data] (let [data (n/fast-freeze data) - dlen (alength data) + dlen (alength ^bytes data) mlen (Zstd/compressBound dlen) cdata (byte-array mlen) clen (Zstd/compressByteArray ^bytes cdata 0 mlen diff --git a/backend/src/app/util/emails.clj b/backend/src/app/util/emails.clj index 813cf4367..a2111d6f8 100644 --- a/backend/src/app/util/emails.clj +++ b/backend/src/app/util/emails.clj @@ -161,7 +161,7 @@ (.setDebug session debug) session)) -(defn smtp-message +(defn ^MimeMessage smtp-message [cfg message] (let [^Session session (smtp-session cfg)] (build-message cfg session message))) diff --git a/backend/src/app/util/svg.clj b/backend/src/app/util/svg.clj deleted file mode 100644 index 04d404a81..000000000 --- a/backend/src/app/util/svg.clj +++ /dev/null @@ -1,101 +0,0 @@ -;; This Source Code Form is subject to the terms of the Mozilla Public -;; License, v. 2.0. If a copy of the MPL was not distributed with this -;; file, You can obtain one at http://mozilla.org/MPL/2.0/. -;; -;; This Source Code Form is "Incompatible With Secondary Licenses", as -;; defined by the Mozilla Public License, v. 2.0. -;; -;; Copyright (c) 2020 UXBOX Labs SL - -(ns app.util.svg - "Icons SVG parsing helpers." - (:require - [app.common.exceptions :as ex] - [app.common.spec :as us] - [clojure.spec.alpha :as s] - [cuerdas.core :as str]) - (:import - org.jsoup.Jsoup - org.jsoup.nodes.Attribute - org.jsoup.nodes.Element - org.jsoup.nodes.Document)) - -(s/def ::content string?) -(s/def ::width ::us/number) -(s/def ::height ::us/number) -(s/def ::name string?) -(s/def ::view-box (s/coll-of ::us/number :min-count 4 :max-count 4)) - -(s/def ::svg-entity - (s/keys :req-un [::content ::width ::height ::view-box] - :opt-un [::name])) - -;; --- Implementation - -(defn- parse-double - [data] - (s/assert ::us/string data) - (Double/parseDouble data)) - -(defn- parse-viewbox - [data] - (s/assert ::us/string data) - (mapv parse-double (str/split data #"\s+"))) - -(defn- parse-attrs - [^Element element] - (persistent! - (reduce (fn [acc ^Attribute attr] - (let [key (.getKey attr) - val (.getValue attr)] - (case key - "width" (assoc! acc :width (parse-double val)) - "height" (assoc! acc :height (parse-double val)) - "viewbox" (assoc! acc :view-box (parse-viewbox val)) - "sodipodi:docname" (assoc! acc :name val) - acc))) - (transient {}) - (.attributes element)))) - -(defn- impl-parse - [data] - (try - (let [document (Jsoup/parse ^String data) - element (some-> (.body ^Document document) - (.getElementsByTag "svg") - (first)) - content (.html element) - attrs (parse-attrs element)] - (assoc attrs :content content)) - (catch java.lang.IllegalArgumentException _e - (ex/raise :type :validation - :code ::invalid-input - :message "Input does not seems to be a valid svg.")) - (catch java.lang.NullPointerException _e - (ex/raise :type :validation - :code ::invalid-input - :message "Input does not seems to be a valid svg.")) - (catch org.jsoup.UncheckedIOException _e - (ex/raise :type :validation - :code ::invalid-input - :message "Input does not seems to be a valid svg.")) - (catch Exception _e - (ex/raise :type :internal - :code ::unexpected)))) - -;; --- Public Api - -(defn parse-string - "Parse SVG from a string." - [data] - (s/assert ::us/string data) - (let [result (impl-parse data)] - (if (s/valid? ::svg-entity result) - result - (ex/raise :type :validation - :code ::invalid-result - :message "The result does not conform valid svg entity.")))) - -(defn parse - [data] - (parse-string (slurp data))) diff --git a/backend/tests/app/tests/test_util_svg.clj b/backend/tests/app/tests/test_util_svg.clj deleted file mode 100644 index 929b8c867..000000000 --- a/backend/tests/app/tests/test_util_svg.clj +++ /dev/null @@ -1,62 +0,0 @@ -;; This Source Code Form is subject to the terms of the Mozilla Public -;; License, v. 2.0. If a copy of the MPL was not distributed with this -;; file, You can obtain one at http://mozilla.org/MPL/2.0/. -;; -;; This Source Code Form is "Incompatible With Secondary Licenses", as -;; defined by the Mozilla Public License, v. 2.0. -;; -;; Copyright (c) 2020 UXBOX Labs SL - -(ns app.tests.test-util-svg - (:require - [clojure.test :as t] - [clojure.java.io :as io] - [app.http :as http] - [app.util.svg :as svg] - [app.tests.helpers :as th])) - -(t/deftest parse-svg-1 - (let [result (-> (io/resource "app/tests/_files/sample1.svg") - (svg/parse))] - (t/is (contains? result :width)) - (t/is (contains? result :height)) - (t/is (contains? result :view-box)) - (t/is (contains? result :name)) - (t/is (contains? result :content)) - (t/is (= 500.0 (:width result))) - (t/is (= 500.0 (:height result))) - (t/is (= [0.0 0.0 500.00001 500.00001] (:view-box result))) - (t/is (= "lock.svg" (:name result))))) - -(t/deftest parse-svg-2 - (let [result (-> (io/resource "app/tests/_files/sample2.svg") - (svg/parse))] - (t/is (contains? result :width)) - (t/is (contains? result :height)) - (t/is (contains? result :view-box)) - (t/is (contains? result :name)) - (t/is (contains? result :content)) - (t/is (= 500.0 (:width result))) - (t/is (= 500.0 (:height result))) - (t/is (= [0.0 0.0 500.0 500.00001] (:view-box result))) - (t/is (= "play.svg" (:name result))))) - -(t/deftest parse-invalid-svg-1 - (let [image (io/resource "app/tests/_files/sample.jpg") - out (th/try! (svg/parse image))] - - (let [error (:error out)] - (t/is (th/ex-info? error)) - (t/is (th/ex-of-code? error ::svg/invalid-input))))) - -(t/deftest parse-invalid-svg-2 - (let [out (th/try! (svg/parse-string ""))] - (let [error (:error out)] - (t/is (th/ex-info? error)) - (t/is (th/ex-of-code? error ::svg/invalid-input))))) - -(t/deftest parse-invalid-svg-3 - (let [out (th/try! (svg/parse-string ""))] - (let [error (:error out)] - (t/is (th/ex-info? error)) - (t/is (th/ex-of-code? error ::svg/invalid-result))))) From 4991cae5ad8a0638565341382c7b0452ec9f8c6e Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 16 Feb 2021 17:31:22 +0100 Subject: [PATCH 22/90] :bug: Fix corner cases on invitation/signup flows. --- CHANGES.md | 1 + backend/src/app/http/auth/google.clj | 124 +++++++++++------- backend/src/app/rpc/mutations/profile.clj | 42 ++---- .../src/app/rpc/mutations/verify_token.clj | 89 ++++++++----- frontend/resources/locales.json | 29 ++++ .../main/partials/dashboard-sidebar.scss | 1 - frontend/src/app/main/repo.cljs | 6 +- frontend/src/app/main/ui/auth/login.cljs | 14 +- frontend/src/app/main/ui/auth/register.cljs | 13 +- .../src/app/main/ui/auth/verify_token.cljs | 8 +- .../src/app/main/ui/dashboard/team_form.cljs | 45 ++++--- 11 files changed, 223 insertions(+), 149 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index b2e94b83f..0162c7f7e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -19,6 +19,7 @@ - Have language change notification written in the new language [Taiga #1205](https://tree.taiga.io/project/penpot/issue/1205) - Properly handle errors on github, gitlab and ldap auth backends. - Properly mark profile auth backend (on first register/ auth with 3rd party auth provider). +- Fix corner cases on invitation/signup flows. ## 1.2.0-alpha diff --git a/backend/src/app/http/auth/google.clj b/backend/src/app/http/auth/google.clj index 653352d42..be6a0e5fe 100644 --- a/backend/src/app/http/auth/google.clj +++ b/backend/src/app/http/auth/google.clj @@ -5,7 +5,7 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020-2021 UXBOX Labs SL (ns app.http.auth.google (:require @@ -43,6 +43,7 @@ req {:method :post :headers {"content-type" "application/x-www-form-urlencoded"} :uri "https://oauth2.googleapis.com/token" + :timeout 6000 :body (u/map->query-string params)} res (http/send! req)] @@ -69,54 +70,85 @@ (log/error e "unexpected exception on get-user-info") nil))) -(defn- auth - [{:keys [tokens] :as cfg} _req] - (let [token (tokens :generate {:iss :google-oauth :exp (dt/in-future "15m")}) - params {:scope scope - :access_type "offline" - :include_granted_scopes true - :state token - :response_type "code" - :redirect_uri (build-redirect-url cfg) - :client_id (:client-id cfg)} - query (u/map->query-string params) - uri (-> (u/uri base-goauth-uri) - (assoc :query query))] +(defn- retrieve-info + [{:keys [tokens] :as cfg} request] + (let [token (get-in request [:params :state]) + state (tokens :verify {:token token :iss :google-oauth}) + info (some->> (get-in request [:params :code]) + (get-access-token cfg) + (get-user-info))] + (when-not info + (ex/raise :type :internal + :code :unable-to-auth)) + + (cond-> info + (some? (:invitation-token state)) + (assoc :invitation-token (:invitation-token state))))) + +(defn- register-profile + [{:keys [rpc] :as cfg} info] + (let [method-fn (get-in rpc [:methods :mutation :login-or-register]) + profile (method-fn {:email (:email info) + :backend "google" + :fullname (:fullname info)})] + (cond-> profile + (some? (:invitation-token info)) + (assoc :invitation-token (:invitation-token info))))) + +(defn- generate-redirect-uri + [{:keys [tokens] :as cfg} profile] + (let [token (or (:invitation-token profile) + (tokens :generate {:iss :auth + :exp (dt/in-future "15m") + :profile-id (:id profile)}))] + (-> (u/uri (:public-uri cfg)) + (assoc :path "/#/auth/verify-token") + (assoc :query (u/map->query-string {:token token}))))) + +(defn- generate-error-redirect-uri + [cfg] + (-> (u/uri (:public-uri cfg)) + (assoc :path "/#/auth/login") + (assoc :query (u/map->query-string {:error "unable-to-auth"})))) + +(defn- redirect-response + [uri] + {:status 302 + :headers {"location" (str uri)} + :body ""}) + +(defn- auth-handler + [{:keys [tokens] :as cfg} request] + (let [invitation (get-in request [:params :invitation-token]) + state (tokens :generate + {:iss :google-oauth + :invitation-token invitation + :exp (dt/in-future "15m")}) + params {:scope scope + :access_type "offline" + :include_granted_scopes true + :state state + :response_type "code" + :redirect_uri (build-redirect-url cfg) + :client_id (:client-id cfg)} + query (u/map->query-string params) + uri (-> (u/uri base-goauth-uri) + (assoc :query query))] + {:status 200 :body {:redirect-uri (str uri)}})) -(defn- callback - [{:keys [tokens rpc session] :as cfg} request] +(defn- callback-handler + [{:keys [session] :as cfg} request] (try - (let [token (get-in request [:params :state]) - _ (tokens :verify {:token token :iss :google-oauth}) - info (some->> (get-in request [:params :code]) - (get-access-token cfg) - (get-user-info)) - _ (when-not info - (ex/raise :type :internal - :code :unable-to-auth)) - method-fn (get-in rpc [:methods :mutation :login-or-register]) - profile (method-fn {:email (:email info) - :backend "google" - :fullname (:fullname info)}) - token (tokens :generate {:iss :auth - :exp (dt/in-future "15m") - :profile-id (:id profile)}) - uri (-> (u/uri (:public-uri cfg)) - (assoc :path "/#/auth/verify-token") - (assoc :query (u/map->query-string {:token token}))) - - sxf ((:create session) (:id profile)) - rsp {:status 302 :headers {"location" (str uri)} :body ""}] - (sxf request rsp)) + (let [info (retrieve-info cfg request) + profile (register-profile cfg info) + uri (generate-redirect-uri cfg profile) + sxf ((:create session) (:id profile))] + (sxf request (redirect-response uri))) (catch Exception _e - (let [uri (-> (u/uri (:public-uri cfg)) - (assoc :path "/#/auth/login") - (assoc :query (u/map->query-string {:error "unable-to-auth"})))] - {:status 302 - :headers {"location" (str uri)} - :body ""})))) + (-> (generate-error-redirect-uri cfg) + (redirect-response))))) (s/def ::client-id ::us/not-empty-string) (s/def ::client-secret ::us/not-empty-string) @@ -139,7 +171,7 @@ [_ cfg] (if (and (:client-id cfg) (:client-secret cfg)) - {:auth-handler #(auth cfg %) - :callback-handler #(callback cfg %)} + {:auth-handler #(auth-handler cfg %) + :callback-handler #(callback-handler cfg %)} {:auth-handler default-handler :callback-handler default-handler})) diff --git a/backend/src/app/rpc/mutations/profile.clj b/backend/src/app/rpc/mutations/profile.clj index 81ab78746..09a21079d 100644 --- a/backend/src/app/rpc/mutations/profile.clj +++ b/backend/src/app/rpc/mutations/profile.clj @@ -19,7 +19,6 @@ [app.media :as media] [app.rpc.mutations.projects :as projects] [app.rpc.mutations.teams :as teams] - [app.rpc.mutations.verify-token :refer [process-token]] [app.rpc.queries.profile :as profile] [app.storage :as sto] [app.tasks :as tasks] @@ -48,13 +47,13 @@ (declare create-profile-relations) (declare email-domain-in-whitelist?) -(s/def ::token ::us/not-empty-string) +(s/def ::invitation-token ::us/not-empty-string) (s/def ::register-profile (s/keys :req-un [::email ::password ::fullname] - :opt-un [::token])) + :opt-un [::invitation-token])) (sv/defmethod ::register-profile {:auth false :rlimit :password} - [{:keys [pool tokens session] :as cfg} {:keys [token] :as params}] + [{:keys [pool tokens session] :as cfg} params] (when-not (cfg/get :registration-enabled) (ex/raise :type :restriction :code :registration-disabled)) @@ -69,30 +68,18 @@ (create-profile-relations conn))] (create-profile-initial-data conn profile) - (if token - ;; If token comes in params, this is because the user comes - ;; from team-invitation process; in this case we revalidate - ;; the token and process the token claims again with the new - ;; profile data. + (if-let [token (:invitation-token params)] + ;; If invitation token comes in params, this is because the + ;; user comes from team-invitation process; in this case, + ;; regenerate token and send back to the user a new invitation + ;; token (and mark current session as logged). (let [claims (tokens :verify {:token token :iss :team-invitation}) - claims (assoc claims :member-id (:id profile)) - params (assoc params :profile-id (:id profile)) - cfg (assoc cfg :conn conn)] - - (process-token cfg params claims) - - ;; Automatically mark the created profile as active because - ;; we already have the verification of email with the - ;; team-invitation token. - (db/update! conn :profile - {:is-active true} - {:id (:id profile)}) - - ;; Return profile data and create http session for - ;; automatically login the profile. - (with-meta (assoc profile - :is-active true - :claims claims) + claims (assoc claims + :member-id (:id profile) + :member-email (:email profile)) + token (tokens :generate claims)] + (with-meta + {:invitation-token token} {:transform-response ((:create session) (:id profile))})) ;; If no token is provided, send a verification email @@ -117,7 +104,6 @@ :name (:fullname profile) :token vtoken :extra-data ptoken}) - profile))))) (defn email-domain-in-whitelist? diff --git a/backend/src/app/rpc/mutations/verify_token.clj b/backend/src/app/rpc/mutations/verify_token.clj index 357e20e90..dbeadaf7a 100644 --- a/backend/src/app/rpc/mutations/verify_token.clj +++ b/backend/src/app/rpc/mutations/verify_token.clj @@ -83,49 +83,78 @@ :internal.tokens.team-invitation/member-email] :opt-un [:internal.tokens.team-invitation/member-id])) +(defn- accept-invitation + [{:keys [conn] :as cfg} {:keys [member-id team-id role] :as claims}] + (let [params (merge {:team-id team-id + :profile-id member-id} + (teams/role->params role)) + member (profile/retrieve-profile conn member-id)] + + ;; Insert the invited member to the team + (db/insert! conn :team-profile-rel params {:on-conflict-do-nothing true}) + + ;; If profile is not yet verified, mark it as verified because + ;; accepting an invitation link serves as verification. + (when-not (:is-active member) + (db/update! conn :profile + {:is-active true} + {:id member-id})) + (assoc member :is-active true))) + (defmethod process-token :team-invitation - [{:keys [conn session] :as cfg} {:keys [profile-id token]} {:keys [member-id team-id role] :as claims}] + [{:keys [session] :as cfg} {:keys [profile-id token]} {:keys [member-id] :as claims}] (us/assert ::team-invitation-claims claims) - (if (uuid? member-id) - (let [params (merge {:team-id team-id - :profile-id member-id} - (teams/role->params role)) - claims (assoc claims :state :created) - member (profile/retrieve-profile conn member-id)] - - (db/insert! conn :team-profile-rel params - {:on-conflict-do-nothing true}) - - ;; If profile is not yet verified, mark it as verified because - ;; accepting an invitation link serves as verification. - (when-not (:is-active member) - (db/update! conn :profile - {:is-active true} - {:id member-id})) - - (if (and (uuid? profile-id) - (= member-id profile-id)) + (cond + ;; This happens when token is filled with member-id and current + ;; user is already logged in with some account. + (and (uuid? profile-id) + (uuid? member-id)) + (do + (accept-invitation cfg claims) + (if (= member-id profile-id) ;; If the current session is already matches the invited ;; member, then just return the token and leave the frontend ;; app redirect to correct team. - claims + (assoc claims :status :created) - ;; If the session does not matches the invited member id, - ;; replace the session with a new one matching the invited - ;; member. This techinique should be considered secure because - ;; the user clicking the link he already has access to the - ;; email account. - (with-meta claims + ;; If the session does not matches the invited member, replace + ;; the session with a new one matching the invited member. + ;; This techinique should be considered secure because the + ;; user clicking the link he already has access to the email + ;; account. + (with-meta + (assoc claims :status :created) {:transform-response ((:create session) member-id)}))) + ;; This happens when member-id is not filled in the invitation but + ;; the user already has an account (probably with other mail) and + ;; is already logged-in. + (and (uuid? profile-id) + (nil? member-id)) + (do + (accept-invitation cfg (assoc claims :member-id profile-id)) + (assoc claims :state :created)) + + ;; This happens when member-id is filled but the accessing user is + ;; not logged-in. In this case we proceed to accept invitation and + ;; leave the user logged-in. + (and (nil? profile-id) + (uuid? member-id)) + (do + (accept-invitation cfg claims) + (with-meta + (assoc claims :state :created) + {:transform-response ((:create session) member-id)})) + ;; In this case, we wait until frontend app redirect user to ;; registeration page, the user is correctly registered and the ;; register mutation call us again with the same token to finally ;; create the corresponding team-profile relation from the first ;; condition of this if. - (assoc claims - :token token - :state :pending))) + :else + {:invitation-token token + :iss :team-invitation + :state :pending})) ;; --- Default diff --git a/frontend/resources/locales.json b/frontend/resources/locales.json index cce095e48..09c494db3 100644 --- a/frontend/resources/locales.json +++ b/frontend/resources/locales.json @@ -830,6 +830,8 @@ "es" : "Actualizado: %s" } }, + + "errors.google-auth-not-enabled" : { "translations" : { "en" : "Authentication with google disabled on backend", @@ -837,6 +839,13 @@ } }, + "errors.unexpected-token" : { + "translations" : { + "en" : "Unknown token", + "es" : "Token desconocido" + } + }, + "errors.profile-is-muted" : { "translations" : { "en" : "Your profile has emails muted (spam reports or high bounces).", @@ -1899,6 +1908,26 @@ "es" : "Quitar" } }, + "labels.create-team": { + "translations" : { + "en" : "Create new team", + "es" : "Crea un nuevo equipo" + } + }, + + "labels.update-team": { + "translations" : { + "en" : "Update team", + "es" : "Actualiza el equipo" + } + }, + "labels.rename-team": { + "translations" : { + "en" : "Rename team", + "es" : "Renomba el equipo" + } + }, + "labels.rename" : { "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:314", "src/app/main/ui/dashboard/files.cljs:84", "src/app/main/ui/dashboard/grid.cljs:178" ], "translations" : { diff --git a/frontend/resources/styles/main/partials/dashboard-sidebar.scss b/frontend/resources/styles/main/partials/dashboard-sidebar.scss index eca4e70e2..801e91d5b 100644 --- a/frontend/resources/styles/main/partials/dashboard-sidebar.scss +++ b/frontend/resources/styles/main/partials/dashboard-sidebar.scss @@ -354,7 +354,6 @@ } input[type=submit] { - width: 120px; margin-bottom: 0px; } } diff --git a/frontend/src/app/main/repo.cljs b/frontend/src/app/main/repo.cljs index 45fa61166..cb914d078 100644 --- a/frontend/src/app/main/repo.cljs +++ b/frontend/src/app/main/repo.cljs @@ -81,19 +81,19 @@ (defmethod mutation :login-with-google [id params] (let [uri (str cfg/public-uri "/api/oauth/google")] - (->> (http/send! {:method :post :uri uri}) + (->> (http/send! {:method :post :uri uri :query params}) (rx/mapcat handle-response)))) (defmethod mutation :login-with-gitlab [id params] (let [uri (str cfg/public-uri "/api/oauth/gitlab")] - (->> (http/send! {:method :post :uri uri}) + (->> (http/send! {:method :post :uri uri :query params}) (rx/mapcat handle-response)))) (defmethod mutation :login-with-github [id params] (let [uri (str cfg/public-uri "/api/oauth/github")] - (->> (http/send! {:method :post :uri uri}) + (->> (http/send! {:method :post :uri uri :query params}) (rx/mapcat handle-response)))) (defmethod mutation :upload-file-media-object diff --git a/frontend/src/app/main/ui/auth/login.cljs b/frontend/src/app/main/ui/auth/login.cljs index 0a196b0aa..e9a4db5cf 100644 --- a/frontend/src/app/main/ui/auth/login.cljs +++ b/frontend/src/app/main/ui/auth/login.cljs @@ -5,7 +5,7 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020-2021 UXBOX Labs SL (ns app.main.ui.auth.login (:require @@ -33,25 +33,25 @@ (s/keys :req-un [::email ::password])) (defn- login-with-google - [event] + [event params] (dom/prevent-default event) - (->> (rp/mutation! :login-with-google {}) + (->> (rp/mutation! :login-with-google params) (rx/subs (fn [{:keys [redirect-uri] :as rsp}] (.replace js/location redirect-uri)) (fn [{:keys [type] :as error}] (st/emit! (dm/error (tr "errors.google-auth-not-enabled"))))))) (defn- login-with-gitlab - [event] + [event params] (dom/prevent-default event) - (->> (rp/mutation! :login-with-gitlab {}) + (->> (rp/mutation! :login-with-gitlab params) (rx/subs (fn [{:keys [redirect-uri] :as rsp}] (.replace js/location redirect-uri))))) (defn- login-with-github - [event] + [event params] (dom/prevent-default event) - (->> (rp/mutation! :login-with-github {}) + (->> (rp/mutation! :login-with-github params) (rx/subs (fn [{:keys [redirect-uri] :as rsp}] (.replace js/location redirect-uri))))) diff --git a/frontend/src/app/main/ui/auth/register.cljs b/frontend/src/app/main/ui/auth/register.cljs index 49605fcee..ec28f1ce7 100644 --- a/frontend/src/app/main/ui/auth/register.cljs +++ b/frontend/src/app/main/ui/auth/register.cljs @@ -81,11 +81,8 @@ (mf/use-callback (fn [form data] (reset! submitted? false) - (if (and (:is-active data) (:claims data)) - (let [message (tr "auth.notifications.team-invitation-accepted")] - (st/emit! (rt/nav :dashboard-projects {:team-id (get-in data [:claims :team-id])}) - (du/fetch-profile) - (dm/success message))) + (if-let [token (:invitation-token data)] + (st/emit! (rt/nav :auth-verify-token {} {:token token})) (st/emit! (rt/nav :auth-register-success {} {:email (:email data)}))))) on-submit @@ -161,19 +158,19 @@ (when cfg/google-client-id [:a.btn-ocean.btn-large.btn-google-auth - {:on-click login/login-with-google} + {:on-click #(login/login-with-google % params)} "Login with Google"]) (when cfg/gitlab-client-id [:a.btn-ocean.btn-large.btn-gitlab-auth - {:on-click login/login-with-gitlab} + {:on-click #(login/login-with-gitlab % params)} [:img.logo {:src "/images/icons/brand-gitlab.svg"}] (tr "auth.login-with-gitlab-submit")]) (when cfg/github-client-id [:a.btn-ocean.btn-large.btn-github-auth - {:on-click login/login-with-github} + {:on-click #(login/login-with-github % params)} [:img.logo {:src "/images/icons/brand-github.svg"}] (tr "auth.login-with-github-submit")])]) diff --git a/frontend/src/app/main/ui/auth/verify_token.cljs b/frontend/src/app/main/ui/auth/verify_token.cljs index 8e060aa99..349b451d0 100644 --- a/frontend/src/app/main/ui/auth/verify_token.cljs +++ b/frontend/src/app/main/ui/auth/verify_token.cljs @@ -58,12 +58,14 @@ (dm/success message))) :pending - (st/emit! (rt/nav :auth-register {} {:token (:token tdata)})))) + (let [token (:invitation-token tdata)] + (st/emit! (rt/nav :auth-register {} {:invitation-token token}))))) (defmethod handle-token :default [tdata] - (js/console.log "Unhandled token:" (pr-str tdata)) - (st/emit! (rt/nav :auth-login))) + (st/emit! + (rt/nav :auth-login) + (dm/warn (tr "errors.unexpected-token")))) (mf/defc verify-token [{:keys [route] :as props}] diff --git a/frontend/src/app/main/ui/dashboard/team_form.cljs b/frontend/src/app/main/ui/dashboard/team_form.cljs index 4db46c580..d743f76dc 100644 --- a/frontend/src/app/main/ui/dashboard/team_form.cljs +++ b/frontend/src/app/main/ui/dashboard/team_form.cljs @@ -18,10 +18,9 @@ [app.main.data.modal :as modal] [app.main.repo :as rp] [app.main.store :as st] - [app.main.ui.components.forms :refer [input submit-button form]] + [app.main.ui.components.forms :as fm] [app.main.ui.icons :as i] [app.util.dom :as dom] - [app.util.forms :as fm] [app.util.i18n :as i18n :refer [t tr]] [app.util.keyboard :as kbd] [app.util.object :as obj] @@ -90,28 +89,28 @@ [:div.modal-overlay [:div.modal-container.team-form-modal - [:div.modal-header - [:div.modal-header-title - (if team - [:h2 "Rename team"] - [:h2 "Create new team"])] - [:div.modal-close-button - {:on-click (st/emitf (modal/hide))} i/close]] + [:& fm/form {:form form + :on-submit on-submit} - [:div.modal-content.generic-form - [:form - [:& input {:type "text" - :form form - :name :name - :label "Enter new team name:"}]]] + [:div.modal-header + [:div.modal-header-title + (if team + [:h2 (tr "labels.rename-team")] + [:h2 (tr "labels.create-team")])] + [:div.modal-close-button + {:on-click (st/emitf (modal/hide))} i/close]] - [:div.modal-footer - [:div.action-buttons - [:& submit-button - {:form form - :on-click on-submit - :label (if team - "Update team" - "Create team")}]]]]])) + [:div.modal-content.generic-form + [:& fm/input {:type "text" + :form form + :name :name + :label "Enter new team name:"}]] + + [:div.modal-footer + [:div.action-buttons + [:& fm/submit-button + {:label (if team + (tr "labels.update-team") + (tr "labels.create-team"))}]]]]]])) From 56b10d669a5a694d17075bb1046863ed0aeb4fba Mon Sep 17 00:00:00 2001 From: Mathieu Brunot Date: Mon, 1 Feb 2021 02:19:57 +0100 Subject: [PATCH 23/90] :whale: SMTP and LDAP test containers --- CHANGES.md | 1 + docker/devenv/docker-compose.yaml | 43 +++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 0162c7f7e..7cac817fe 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ - Add major refactor of internal pubsub/redis code; improves scalability and performance #640 - Add optional loki integration. +- Add emailcatcher and ldap test containers to devenv. #506 - Bounce & Complaint handling. - Disable groups interactions when holding "Ctrl" key (deep selection) - New action in context menu to "edit" some shapes (binded to key "Enter") diff --git a/docker/devenv/docker-compose.yaml b/docker/devenv/docker-compose.yaml index 68bc4d3ed..0c105f87f 100644 --- a/docker/devenv/docker-compose.yaml +++ b/docker/devenv/docker-compose.yaml @@ -43,6 +43,28 @@ services: - PENPOT_DATABASE_PASSWORD=penpot - PENPOT_REDIS_URI=redis://redis/0 - EXTERNAL_UID=${CURRENT_USER_ID} + # STMP setup + - PENPOT_SMTP_ENABLED=true + - PENPOT_SMTP_DEFAULT_FROM=no-reply@example.com + - PENPOT_SMTP_DEFAULT_REPLY_TO=no-reply@example.com + - PENPOT_SMTP_HOST=mailer + - PENPOT_SMTP_PORT=1025 + - PENPOT_SMTP_USERNAME= + - PENPOT_SMTP_PASSWORD= + - PENPOT_SMTP_SSL=false + - PENPOT_SMTP_TLS=false + # LDAP setup + - PENPOT_LDAP_HOST=ldap + - PENPOT_LDAP_PORT=10389 + - PENPOT_LDAP_SSL=false + - PENPOT_LDAP_STARTTLS=false + - PENPOT_LDAP_BASE_DN=ou=people,dc=planetexpress,dc=com + - PENPOT_LDAP_BIND_DN=cn=admin,dc=planetexpress,dc=com + - PENPOT_LDAP_BIND_PASSWORD=GoodNewsEveryone + - PENPOT_LDAP_USERNAME_ATTRIBUTE=uid + - PENPOT_LDAP_EMAIL_ATTRIBUTE=mail + - PENPOT_LDAP_FULLNAME_ATTRIBUTE=displayName + - PENPOT_LDAP_AVATAR_ATTRIBUTE=jpegPhoto postgres: image: postgres:13 @@ -65,3 +87,24 @@ services: hostname: "penpot-devenv-redis" container_name: "penpot-devenv-redis" restart: always + + mailer: + image: sj26/mailcatcher:latest + hostname: mautic-mailer + container_name: mautic-mailer + restart: always + expose: + - '1025' + ports: + - "1080:1080" + + ldap: + image: rroemhild/test-openldap:2.1 + container_name: mautic-ldap + hostname: mautic-ldap + expose: + - '10389' + - '10636' + ports: + - "10389:10389" + - "10636:10636" From dc69d0c7f435f3a5eb2c7e80100c3fcce568236b Mon Sep 17 00:00:00 2001 From: Fabien Basmaison Date: Sun, 7 Feb 2021 16:30:09 +0100 Subject: [PATCH 24/90] :sparkles: Improve French translation strings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://unicode-table.com/en/202F/ for the character to add before `!`, `?`, `;`, `:` and `»`, and after `«`. fix: Typography Replace `...` with `…` for all languages. In French: - Replace `'` (quote) with `’` (apostrophe). - Replace `“` and ” with `«` and `»`. - Replace `-` (hyphens) with `‑` (non‑breaking hyphens). - Fix a few grammar issues. - Replace `Editer` with `Modifier`. - Replace `Espacement des lettres` with `Crénage`; shorter term for “kerning”. - Add accents on uppercase letters. Fix a string in French. Missed two replacements in French. Add missing changes: - French typographic quotes. - Crénage Addresses https://github.com/penpot/penpot/pull/591#pullrequestreview-585038080 Update locales: - Fix some typos in English (dowload, reasign). - Fix some grammar. - _Accord de proximité_ on one occasion. (masculine + feminine + adjective = feminine adjective). - “Soulignage” and “Barré” (I looked at LibreOffice to see how they were doing it). - Consistent use of “Êtes‑vous sûr de vouloir ”. - bibliothèque partagée: Bibliothèque Partagée. - « Mise à jour » to use a noun that is not gender ambiguous. - “Disposition” changed to “Mise en page” (could be “Composition”, although more ambiguous with other terms). - Hauteur de ligne: Interlignage. - Crénage: [Interlettrage](https://fr.wikipedia.org/wiki/Interlettre) which is more what a typographer would do based on the existing kerning of the font. - Première lettre en majuscule: Premières Lettres en [Capitales](https://fr.wikipedia.org/wiki/Capitale_et_majuscule) (to illustrate the result). - Quitter: Se déconnecter (clearer about the outcome of the action). - Use of “a” for the title and “the” for the confirmation. - Couche: Calque. Update a missed string for consistency. [L10N] Update some French terms. --- CHANGES.md | 1 + frontend/resources/locales.json | 368 ++++++++++++++++---------------- 2 files changed, 185 insertions(+), 184 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 7cac817fe..e7b8809af 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -21,6 +21,7 @@ - Properly handle errors on github, gitlab and ldap auth backends. - Properly mark profile auth backend (on first register/ auth with 3rd party auth provider). - Fix corner cases on invitation/signup flows. +- Add more improvements to french translation strings. ## 1.2.0-alpha diff --git a/frontend/resources/locales.json b/frontend/resources/locales.json index 09c494db3..b0e2ca50a 100644 --- a/frontend/resources/locales.json +++ b/frontend/resources/locales.json @@ -3,7 +3,7 @@ "used-in" : [ "src/app/main/ui/auth/register.cljs:128" ], "translations" : { "en" : "Already have an account?", - "fr" : "Vous avez déjà un compte?", + "fr" : "Vous avez déjà un compte ?", "ru" : "Уже есть аккаунт?", "es" : "¿Tienes ya una cuenta?" } @@ -12,7 +12,7 @@ "used-in" : [ "src/app/main/ui/auth/recovery.cljs:77" ], "translations" : { "en" : "Confirm password", - "fr" : "Confirmez mot de passe", + "fr" : "Confirmez le mot de passe", "ru" : "Подтвердите пароль", "es" : "Confirmar contraseña" } @@ -21,7 +21,7 @@ "used-in" : [ "src/app/main/ui/auth/login.cljs:161", "src/app/main/ui/auth/register.cljs:138" ], "translations" : { "en" : "Create demo account", - "fr" : "Vous voulez juste essayer?", + "fr" : "Créer un compte de démonstration", "ru" : "Хотите попробовать?", "es" : "Crear cuanta de prueba" } @@ -30,29 +30,29 @@ "used-in" : [ "src/app/main/ui/auth/login.cljs:158", "src/app/main/ui/auth/register.cljs:135" ], "translations" : { "en" : "Just wanna try it?", - "fr" : "Vous voulez juste essayer?", + "fr" : "Vous voulez juste essayer ?", "ru" : "Хотите попробовать?", "es" : "¿Quieres probar?" } }, "auth.verification-email-sent": { "translations": { - "en": "We've sent a verification email to", - "fr": "Nous avons envoyé un e-mail de vérification à" + "en" : "We've sent a verification email to", + "fr" : "Nous avons envoyé un e-mail de vérification à" } }, "auth.check-your-email": { "translations": { - "en": "Check your email and click on the link to verify and start using Penpot.", - "fr": "Vérifiez votre email et cliquez sur le lien pour vérifier et commencer à utiliser Penpot." + "en" : "Check your email and click on the link to verify and start using Penpot.", + "fr" : "Vérifiez votre e‑mail et cliquez sur le lien pour vérifier et commencer à utiliser Penpot." } }, "auth.demo-warning" : { "used-in" : [ "src/app/main/ui/auth/register.cljs:33" ], "translations" : { "en" : "This is a DEMO service, DO NOT USE for real work, the projects will be periodicaly wiped.", - "fr" : "Il s'agit d'un service DEMO, NE PAS UTILISER pour un travail réel, les projets seront périodiquement supprimés.", + "fr" : "Il s’agit d’un service DEMO, NE PAS UTILISER pour un travail réel, les projets seront périodiquement supprimés.", "ru" : "Это ДЕМОНСТРАЦИЯ, НЕ ИСПОЛЬЗУЙТЕ для работы, проекты будут периодически удаляться.", "es" : "Este es un servicio de DEMOSTRACIÓN. NO USAR para trabajo real, los proyectos serán borrados periodicamente." } @@ -61,7 +61,7 @@ "used-in" : [ "src/app/main/ui/auth/login.cljs:99", "src/app/main/ui/auth/register.cljs:101", "src/app/main/ui/auth/recovery_request.cljs:47" ], "translations" : { "en" : "Email", - "fr" : "Adresse email", + "fr" : "Adresse e‑mail", "ru" : "Email", "es" : "Correo electrónico" } @@ -70,7 +70,7 @@ "used-in" : [ "src/app/main/ui/auth/login.cljs:128" ], "translations" : { "en" : "Forgot password?", - "fr" : "Mot de passe oublié?", + "fr" : "Mot de passe oublié ?", "ru" : "Забыли пароль?", "es" : "¿Olvidaste tu contraseña?" } @@ -88,7 +88,7 @@ "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs:68" ], "translations" : { "en" : "Go back!", - "fr" : "Retour!", + "fr" : "Retour !", "ru" : "Назад!", "es" : "Volver" } @@ -97,7 +97,7 @@ "used-in" : [ "src/app/main/ui/auth.cljs:35" ], "translations" : { "en" : "Goodbye!", - "fr" : "Au revoir!", + "fr" : "Au revoir !", "ru" : "Пока!", "es" : "¡Adiós!" } @@ -124,7 +124,7 @@ "used-in" : [ "src/app/main/ui/auth/login.cljs:120" ], "translations" : { "en" : "Enter your details below", - "fr" : "Entrez vos informations ci-dessous", + "fr" : "Entrez vos informations ci‑dessous", "ru" : "Введите информацию о себе ниже", "es" : "Introduce tus datos aquí" } @@ -133,7 +133,7 @@ "used-in" : [ "src/app/main/ui/auth/login.cljs:119" ], "translations" : { "en" : "Great to see you again!", - "fr" : "Ravi de vous revoir!", + "fr" : "Ravi de vous revoir !", "ru" : "Рады видеть Вас снова!", "es" : "Encantados de volverte a ver" } @@ -176,16 +176,16 @@ }, "auth.notifications.profile-not-verified": { "translations": { - "en": "Profile is not verified, please verify profile before continue.", - "fr": "Le profil n'est pas vérifié, veuillez vérifier le profil avant de continuer.", - "es": "El perfil aun no ha sido verificado, por favor valida el perfil antes de continuar." + "en" : "Profile is not verified, please verify profile before continue.", + "fr" : "Le profil n’est pas vérifié. Veuillez vérifier le profil avant de continuer.", + "es" : "El perfil aun no ha sido verificado, por favor valida el perfil antes de continuar." } }, "auth.notifications.invalid-token-error" : { "used-in" : [ "src/app/main/ui/auth/recovery.cljs:47" ], "translations" : { "en" : "The recovery token is invalid.", - "fr" : "Le code de récupération n'est pas valide.", + "fr" : "Le code de récupération n’est pas valide.", "ru" : "Неверный код восстановления.", "es" : "El código de recuperación no es válido." } @@ -212,7 +212,7 @@ "used-in" : [ "src/app/main/ui/auth/verify_token.cljs:55", "src/app/main/ui/auth/register.cljs:50" ], "translations" : { "en" : "Joined the team succesfully", - "fr" : "Équipe rejoint avec succès", + "fr" : "Vous avez rejoint l’équipe avec succès", "es" : "Te uniste al equipo" } }, @@ -247,7 +247,7 @@ "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs:62" ], "translations" : { "en" : "We'll send you an email with instructions", - "fr" : "Nous vous enverrons un e-mail avec des instructions", + "fr" : "Nous vous enverrons un e‑mail avec des instructions", "ru" : "Письмо с инструкциями отправлено на почту.", "es" : "Te enviaremos un correo electrónico con instrucciones" } @@ -256,7 +256,7 @@ "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs:61" ], "translations" : { "en" : "Forgot password?", - "fr" : "Vous avez oublié votre mot de passe?", + "fr" : "Mot de passe oublié ?", "ru" : "Забыли пароль?", "es" : "¿Olvidaste tu contraseña?" } @@ -274,7 +274,7 @@ "used-in" : [ "src/app/main/ui/auth/login.cljs:131" ], "translations" : { "en" : "No account yet?", - "fr" : "Pas encore de compte?", + "fr" : "Pas encore de compte ?", "ru" : "Еще нет аккаунта?", "es" : "¿No tienes una cuenta?" } @@ -292,7 +292,7 @@ "used-in" : [ "src/app/main/ui/auth/register.cljs:118" ], "translations" : { "en" : "It's free, it's Open Source", - "fr" : "C'est gratuit, c'est Open Source", + "fr" : "C’est gratuit, c’est Open Source", "ru" : "Это бесплатно, это Open Source", "es" : "Es gratis, es Open Source" } @@ -328,7 +328,7 @@ "used-in" : [ "src/app/main/ui/settings/profile.cljs:79" ], "translations" : { "en" : "Change email", - "fr" : "Changer adresse e-mail", + "fr" : "Changer adresse e‑mail", "ru" : "Сменить email адрес", "es" : "Cambiar correo" } @@ -353,7 +353,7 @@ "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:325" ], "translations" : { "en" : "Delete team", - "fr" : "Supprimer l'équipe", + "fr" : "Supprimer l’équipe", "es" : "Eliminar equipo" } }, @@ -370,7 +370,7 @@ "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:188" ], "translations" : { "en" : "You still have no files here", - "fr" : "Vous n'avez encore aucun fichier ici", + "fr" : "Vous n’avez encore aucun fichier ici", "ru" : "Файлов пока нет", "es" : "Todavía no hay ningún archivo aquí" } @@ -379,7 +379,7 @@ "used-in" : [ "src/app/main/ui/dashboard/team.cljs:72" ], "translations" : { "en" : "Invite to team", - "fr" : "Inviter à l'équipe", + "fr" : "Inviter dans l’équipe", "es" : "Invitar al equipo" } }, @@ -387,7 +387,7 @@ "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:318", "src/app/main/ui/dashboard/sidebar.cljs:321" ], "translations" : { "en" : "Leave team", - "fr" : "Quitter l'équipe", + "fr" : "Quitter l’équipe", "es" : "Abandonar equipo" } }, @@ -403,7 +403,7 @@ "dashboard.library.add-item.icons" : { "translations" : { "en" : "+ New icon", - "fr" : "+ Nouvel icône", + "fr" : "+ Nouvelle icône", "ru" : "+ Новая иконка", "es" : "+ Nuevo icono" }, @@ -430,7 +430,7 @@ "dashboard.library.add-library.icons" : { "translations" : { "en" : "+ New icon library", - "fr" : "+ Nouvelle bibliothèque d'icônes", + "fr" : "+ Nouvelle bibliothèque d’icônes", "ru" : "+ Новая библиотека иконок", "es" : "+ Nueva biblioteca de iconos" }, @@ -439,7 +439,7 @@ "dashboard.library.add-library.images" : { "translations" : { "en" : "+ New image library", - "fr" : "+ Nouvelle bibliothèque d'image", + "fr" : "+ Nouvelle bibliothèque d’images", "ru" : "+ Новая библиотека изображений", "es" : "+ Nueva biblioteca de imágenes" }, @@ -484,9 +484,9 @@ "dashboard.loading-files" : { "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:194" ], "translations" : { - "en" : "loading your files ...", - "fr" : "chargement de vos fichiers ...", - "es" : "cargando tus ficheros ..." + "en" : "loading your files …", + "fr" : "chargement de vos fichiers…", + "es" : "cargando tus ficheros …" } }, "dashboard.new-file" : { @@ -511,7 +511,7 @@ "used-in" : [ "src/app/main/ui/dashboard/search.cljs:54" ], "translations" : { "en" : "No matches found for “%s“", - "fr" : "Aucune correspondance pour “%s“", + "fr" : "Aucune correspondance pour « %s »", "ru" : "Совпадений для “%s“ не найдено", "es" : "No se encuentra “%s“" } @@ -528,7 +528,7 @@ "used-in" : [ "src/app/main/ui/auth/verify_token.cljs:42" ], "translations" : { "en" : "Your email address has been updated successfully", - "fr" : "Votre adresse e-mail a été mise à jour avec succès", + "fr" : "Votre adresse e‑mail a été mise à jour avec succès", "ru" : "Ваш email адрес успешно обновлен", "es" : "Tu dirección de correo ha sido actualizada" } @@ -537,7 +537,7 @@ "used-in" : [ "src/app/main/ui/auth/verify_token.cljs:36" ], "translations" : { "en" : "Your email address has been verified successfully", - "fr" : "Votre adresse e-mail a été vérifiée avec succès", + "fr" : "Votre adresse e‑mail a été vérifiée avec succès", "ru" : "Ваш email адрес успешно подтвержден", "es" : "Tu dirección de correo ha sido verificada" } @@ -546,7 +546,7 @@ "used-in" : [ "src/app/main/ui/settings/password.cljs:36" ], "translations" : { "en" : "Password saved successfully!", - "fr" : "Mot de passe enregistré avec succès!", + "fr" : "Mot de passe enregistré avec succès !", "ru" : "Пароль успешно сохранен!", "es" : "¡Contraseña guardada!" } @@ -563,7 +563,7 @@ "used-in" : [ "src/app/main/ui/settings/password.cljs:76" ], "translations" : { "en" : "Change password", - "fr" : "Changement de mot de passe", + "fr" : "Changer le mot de passe", "ru" : "Изменить пароль", "es" : "Cambiar contraseña" } @@ -581,7 +581,7 @@ "used-in" : [ "src/app/main/ui/dashboard/team.cljs:202" ], "translations" : { "en" : "Promote to owner", - "fr" : "Promouvoir en propriétaire", + "fr" : "Promouvoir propriétaire", "es" : "Promover a dueño" } }, @@ -589,7 +589,7 @@ "used-in" : [ "src/app/main/ui/settings/profile.cljs:87" ], "translations" : { "en" : "Want to remove your account?", - "fr" : "Vous souhaitez supprimer votre compte?", + "fr" : "Vous souhaitez supprimer votre compte ?", "ru" : "Хотите удалить свой аккаунт?", "es" : "¿Quieres borrar tu cuenta?" } @@ -606,26 +606,26 @@ "dashboard.search-placeholder" : { "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:120" ], "translations" : { - "en" : "Search...", - "fr" : "Rechercher...", - "ru" : "Поиск ...", - "es" : "Buscar..." + "en" : "Search…", + "fr" : "Rechercher…", + "ru" : "Поиск …", + "es" : "Buscar…" } }, "dashboard.searching-for" : { "used-in" : [ "src/app/main/ui/dashboard/search.cljs:49" ], "translations" : { - "en" : "Searching for “%s“...", - "fr" : "Recherche de “%s“...", - "ru" : "Ищу “%s“...", - "es" : "Buscando “%s“..." + "en" : "Searching for “%s“…", + "fr" : "Recherche de « %s »…", + "ru" : "Ищу “%s“…", + "es" : "Buscando “%s“…" } }, "dashboard.select-ui-language" : { "used-in" : [ "src/app/main/ui/settings/options.cljs:61" ], "translations" : { "en" : "Select UI language", - "fr" : "Sélectionner la langue de l'interface", + "fr" : "Sélectionnez la langue de l’interface", "ru" : "Выберите язык интерфейса", "es" : "Cambiar el idioma de la interfaz" } @@ -660,7 +660,7 @@ "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:156" ], "translations" : { "en" : "Switch team", - "fr" : "Changer d'équipe", + "fr" : "Changer d’équipe", "es" : "Cambiar equipo" } }, @@ -668,7 +668,7 @@ "used-in" : [ "src/app/main/ui/dashboard/team.cljs:288" ], "translations" : { "en" : "Team info", - "fr" : "Information de l'équipe", + "fr" : "Information de l’équipe", "es" : "Información del equipo" } }, @@ -676,7 +676,7 @@ "used-in" : [ "src/app/main/ui/dashboard/team.cljs:299" ], "translations" : { "en" : "Team members", - "fr" : "Membres de l'équipe", + "fr" : "Membres de l’équipe", "es" : "Integrantes del equipo" } }, @@ -684,7 +684,7 @@ "used-in" : [ "src/app/main/ui/dashboard/team.cljs:308" ], "translations" : { "en" : "Team projects", - "fr" : "Projets de l'équipe", + "fr" : "Projets de l’équipe", "es" : "Proyectos del equipo" } }, @@ -692,7 +692,7 @@ "used-in" : [ "src/app/main/ui/settings/options.cljs:65" ], "translations" : { "en" : "UI theme", - "fr" : "Thème de l'interface", + "fr" : "Thème de l’interface", "ru" : "Тема интерфейса пользователя", "es" : "Tema visual" } @@ -736,7 +736,7 @@ "used-in" : [ "src/app/main/ui/settings/profile.cljs:74" ], "translations" : { "en" : "Email", - "fr" : "E-mail", + "fr" : "E‑mail", "ru" : "Email", "es" : "Correo" } @@ -816,7 +816,7 @@ "used-in" : [ "src/app/main/ui/confirm.cljs:38", "src/app/main/ui/confirm.cljs:42" ], "translations" : { "en" : "Are you sure?", - "fr" : "Êtes-vous sûr?", + "fr" : "Êtes‑vous sûr ?", "ru" : "Вы уверены?", "es" : "¿Seguro?" } @@ -825,7 +825,7 @@ "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:59" ], "translations" : { "en" : "Updated: %s", - "fr" : "Mis à jour: %s", + "fr" : "Mise à jour : %s", "ru" : "Обновлено: %s", "es" : "Actualizado: %s" } @@ -871,7 +871,7 @@ "used-in" : [ "src/app/main/ui/auth/login.cljs:89" ], "translations" : { "en" : "Username or password seems to be wrong.", - "fr" : "Le nom d'utilisateur ou le mot de passe semble être faux.", + "fr" : "Le nom d’utilisateur ou le mot de passe semble être faux.", "ru" : "Неверное имя пользователя или пароль.", "es" : "El nombre o la contraseña parece incorrecto." } @@ -889,7 +889,7 @@ "used-in" : [ "src/app/main/ui/settings/change_email.cljs:47", "src/app/main/ui/auth/verify_token.cljs:80" ], "translations" : { "en" : "Email already used", - "fr" : "Adresse e-mail déjà utilisée", + "fr" : "Adresse e‑mail déjà utilisée", "ru" : "Такой email уже используется", "es" : "Este correo ya está en uso" } @@ -898,7 +898,7 @@ "used-in" : [ "src/app/main/ui/auth/verify_token.cljs:85" ], "translations" : { "en" : "Email already validated.", - "fr" : "Adresse e-mail déjà validé.", + "fr" : "Adresse e‑mail déjà validée.", "ru" : "Электронная почта уже подтверждена.", "es" : "Este correo ya está validado." } @@ -907,7 +907,7 @@ "used-in" : [ "src/app/main/ui/settings/change_email.cljs:37" ], "translations" : { "en" : "Confirmation email must match", - "fr" : "L'adresse e-mail de confirmation doit correspondre", + "fr" : "L’adresse e‑mail de confirmation doit correspondre", "ru" : "Email для подтверждения должен совпадать", "es" : "El correo de confirmación debe coincidir" } @@ -916,7 +916,7 @@ "used-in" : [ "src/app/main/ui/settings/options.cljs:32", "src/app/main/ui/settings/profile.cljs:42", "src/app/main/ui/auth/verify_token.cljs:89" ], "translations" : { "en" : "Something wrong has happened.", - "fr" : "Quelque chose c'est mal passé.", + "fr" : "Un problème s’est produit.", "ru" : "Что-то пошло не так.", "es" : "Ha ocurrido algún error." } @@ -925,7 +925,7 @@ "used-in" : [ "src/app/main/data/media.cljs:55" ], "translations" : { "en" : "The image format is not supported (must be svg, jpg or png).", - "fr" : "Le format d'image n'est pas supporté (doit être svg, jpg ou png).", + "fr" : "Le format d’image n’est pas supporté (doit être svg, jpg ou png).", "ru" : "Формат изображения не поддерживается (должен быть svg, jpg или png).", "es" : "No se reconoce el formato de imagen (debe ser svg, jpg o png)." } @@ -934,7 +934,7 @@ "used-in" : [ "src/app/main/data/media.cljs:53" ], "translations" : { "en" : "The image is too large to be inserted (must be under 5mb).", - "fr" : "L'image est trop grande (doit être inférieure à 5 Mo).", + "fr" : "L’image est trop grande (doit être inférieure à 5 Mo).", "ru" : "Изображение слишком большое для вставки (должно быть меньше 5mb).", "es" : "La imagen es demasiado grande (debe tener menos de 5mb)." } @@ -943,7 +943,7 @@ "used-in" : [ "src/app/main/data/media.cljs:78", "src/app/main/data/workspace/persistence.cljs:426" ], "translations" : { "en" : "Seems that the contents of the image does not match the file extension.", - "fr" : "Il semble que le contenu de l'image ne correspond pas à l'extension de fichier.", + "fr" : "Il semble que le contenu de l’image ne correspond pas à l’extension de fichier.", "ru" : "", "es" : "Parece que el contenido de la imagen no coincide con la etensión del archivo." } @@ -952,7 +952,7 @@ "used-in" : [ "src/app/main/data/media.cljs:75", "src/app/main/data/workspace/persistence.cljs:423" ], "translations" : { "en" : "Seems that this is not a valid image.", - "fr" : "Il semble que ce n'est pas une image valide.", + "fr" : "L’image ne semble pas être valide.", "ru" : "", "es" : "Parece que no es una imagen válida." } @@ -988,7 +988,7 @@ "used-in" : [ "src/app/main/ui/auth/register.cljs:39" ], "translations" : { "en" : "The registration is currently disabled.", - "fr" : "L'enregistrement est actuellement désactivé.", + "fr" : "L’enregistrement est actuellement désactivé.", "ru" : "Регистрация сейчас отключена.", "es" : "El registro está actualmente desactivado." } @@ -997,7 +997,7 @@ "used-in" : [ "src/app/main/data/media.cljs:81", "src/app/main/ui/auth/register.cljs:45", "src/app/main/ui/workspace/sidebar/options/exports.cljs:75", "src/app/main/ui/handoff/exports.cljs:41" ], "translations" : { "en" : "An unexpected error occurred.", - "fr" : "Une erreur inattendue c'est produite", + "fr" : "Une erreur inattendue s’est produite", "ru" : "Произошла ошибка.", "es" : "Ha ocurrido un error inesperado." } @@ -1006,7 +1006,7 @@ "used-in" : [ "src/app/main/ui/settings/password.cljs:28" ], "translations" : { "en" : "Old password is incorrect", - "fr" : "L'ancien mot de passe est incorrect", + "fr" : "L’ancien mot de passe est incorrect", "ru" : "Старый пароль неверный", "es" : "La contraseña anterior no es correcta" } @@ -1087,7 +1087,7 @@ "used-in" : [ "src/app/main/ui/settings/password.cljs:31" ], "translations" : { "en" : "An error has occurred", - "fr" : "Une erreur c'est produite", + "fr" : "Une erreur s’est produite", "ru" : "Произошла ошибка", "es" : "Ha ocurrido un error" } @@ -1151,8 +1151,8 @@ "handoff.attributes.image.download" : { "used-in" : [ "src/app/main/ui/handoff/attributes/image.cljs:50" ], "translations" : { - "en" : "Dowload source image", - "fr" : "Télécharger l'image source", + "en" : "Download source image", + "fr" : "Télécharger l’image source", "es" : "Descargar imagen original" } }, @@ -1176,7 +1176,7 @@ "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs:76" ], "translations" : { "en" : "Layout", - "fr" : "Disposition", + "fr" : "Mise en page", "es" : "Estructura" } }, @@ -1288,7 +1288,7 @@ "used-in" : [ "src/app/main/ui/handoff/attributes/stroke.cljs:75" ], "translations" : { "en" : "Stroke", - "fr" : "Trait", + "fr" : "Contour", "es" : "Borde" } }, @@ -1319,7 +1319,7 @@ "handoff.attributes.stroke.style.dashed" : { "translations" : { "en" : "Dashed", - "fr" : "Tiret", + "fr" : "Tirets", "es" : "Discontinuo" }, "unused" : true @@ -1360,7 +1360,7 @@ "used-in" : [ "src/app/main/ui/handoff/attributes/stroke.cljs:63" ], "translations" : { "en" : "Width", - "fr" : "Largeur", + "fr" : "Épaisseur", "es" : "Ancho" } }, @@ -1400,7 +1400,7 @@ "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs:144" ], "translations" : { "en" : "Letter Spacing", - "fr" : "Espacement des lettres", + "fr" : "Interlettrage", "es" : "Espaciado de letras" } }, @@ -1408,7 +1408,7 @@ "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs:138" ], "translations" : { "en" : "Line Height", - "fr" : "Hauteur de ligne", + "fr" : "Interlignage", "es" : "Interlineado" } }, @@ -1439,7 +1439,7 @@ "handoff.attributes.typography.text-decoration.underline" : { "translations" : { "en" : "Underline", - "fr" : "Sousligné", + "fr" : "Soulignage", "es" : "Subrayar" }, "unused" : true @@ -1471,7 +1471,7 @@ "handoff.attributes.typography.text-transform.titlecase" : { "translations" : { "en" : "Title Case", - "fr" : "Première lettre en majuscule", + "fr" : "Premières Lettres en Capitales", "es" : "Primera en mayúscula" }, "unused" : true @@ -1479,7 +1479,7 @@ "handoff.attributes.typography.text-transform.uppercase" : { "translations" : { "en" : "Upper Case", - "fr" : "Majuscule", + "fr" : "Capitales", "es" : "Mayúsculas" }, "unused" : true @@ -1609,7 +1609,7 @@ "used-in" : [ "src/app/main/ui/static.cljs:58" ], "translations" : { "en" : "Looks like you need to wait a bit and retry; we are performing small maintenance of our servers.", - "fr" : "Il semble que vous deviez attendre un peu et réessayer; nous effectuons une petite maintenance de nos serveurs.", + "fr" : "Il semble que vous deviez attendre un peu et réessayer ; nous effectuons une petite maintenance de nos serveurs.", "es" : "Parece que necesitas esperar un poco y volverlo a intentar; estamos realizando operaciones de mantenimiento en nuestros servidores." } }, @@ -1642,7 +1642,7 @@ "used-in" : [ "src/app/main/ui/settings/password.cljs:93" ], "translations" : { "en" : "Confirm password", - "fr" : "Confirmer mot de passe", + "fr" : "Confirmer le mot de passe", "ru" : "Подтвердите пароль", "es" : "Confirmar contraseña" } @@ -1668,7 +1668,7 @@ "used-in" : [ "src/app/main/ui/comments.cljs:278" ], "translations" : { "en" : "Delete comment", - "fr" : "Supprimer commentaire", + "fr" : "Supprimer le commentaire", "es" : "Eliminar comentario" } }, @@ -1693,7 +1693,7 @@ "used-in" : [ "src/app/main/ui/comments.cljs:275" ], "translations" : { "en" : "Edit", - "fr" : "Editer", + "fr" : "Modifier", "es" : "Editar" } }, @@ -1701,7 +1701,7 @@ "used-in" : [ "src/app/main/ui/dashboard/team.cljs:86", "src/app/main/ui/dashboard/team.cljs:181", "src/app/main/ui/dashboard/team.cljs:195" ], "translations" : { "en" : "Editor", - "fr" : "Editeur", + "fr" : "Éditeur", "es" : "Editor" } }, @@ -1709,7 +1709,7 @@ "used-in" : [ "src/app/main/ui/dashboard/team.cljs:116", "src/app/main/ui/dashboard/team.cljs:221" ], "translations" : { "en" : "Email", - "fr" : "Adresse email", + "fr" : "Adresse e‑mail", "ru" : "Email", "es" : "Correo electrónico" } @@ -1735,7 +1735,7 @@ "used-in" : [ "src/app/main/ui/static.cljs:92" ], "translations" : { "en" : "Something bad happened. Please retry the operation and if the problem persists, contact with support.", - "fr" : "Quelque chose d'étrange est arrivé. Veuillez réessayer l'opération, et si le problème persiste, contactez le service technique.", + "fr" : "Un problème s’est produit. Veuillez réessayer l’opération et, si le problème persiste, contacter le service technique.", "es" : "Ha ocurrido algo extraño. Por favor, reintenta la operación, y si el problema persiste, contacta con el servicio técnico." } }, @@ -1760,7 +1760,7 @@ "used-in" : [ "src/app/main/ui/settings.cljs:31", "src/app/main/ui/dashboard/sidebar.cljs:468" ], "translations" : { "en" : "Logout", - "fr" : "Quitter", + "fr" : "Se déconnecter", "ru" : "Выход", "es" : "Salir" } @@ -1795,7 +1795,7 @@ "used-in" : [ "src/app/main/ui/workspace/comments.cljs:186", "src/app/main/ui/dashboard/comments.cljs:96" ], "translations" : { "en" : "You have no pending comment notifications", - "fr" : "Vous n'avez aucune notification de commentaire en attente", + "fr" : "Vous n’avez aucune notification de commentaire en attente", "es" : "No tienes notificaciones de comentarios pendientes" } }, @@ -1811,7 +1811,7 @@ "used-in" : [ "src/app/main/ui/static.cljs:40" ], "translations" : { "en" : "This page might not exist or you don’t have permissions to access to it.", - "fr" : "Cette page n'existe pas ou vous ne disposez pas des permissions nécessaires pour y accéder.", + "fr" : "Cette page n’existe pas ou vous ne disposez pas des permissions nécessaires pour y accéder.", "es" : "Esta página no existe o no tienes permisos para verla." } }, @@ -1819,7 +1819,7 @@ "used-in" : [ "src/app/main/ui/static.cljs:39" ], "translations" : { "en" : "Oops!", - "fr" : "Oups!", + "fr" : "Oups !", "es" : "¡Huy!" } }, @@ -1852,7 +1852,7 @@ "used-in" : [ "src/app/main/ui/workspace/comments.cljs:162" ], "translations" : { "en" : "Only yours", - "fr" : "Seulement les votres", + "fr" : "Seulement les vôtres", "es" : "Sólo los tuyos" } }, @@ -2037,7 +2037,7 @@ "used-in" : [ "src/app/main/ui/static.cljs:45" ], "translations" : { "en" : "Sign out", - "fr" : "Quitter", + "fr" : "Se déconnecter", "ru" : "Выход", "es" : "Salir" } @@ -2055,7 +2055,7 @@ "used-in" : [ "src/app/main/ui/dashboard/team.cljs:184" ], "translations" : { "en" : "Viewer", - "fr" : "Téléspectateur", + "fr" : "Spectateur", "es" : "Visualizador" } }, @@ -2070,10 +2070,10 @@ "media.loading" : { "used-in" : [ "src/app/main/data/media.cljs:60", "src/app/main/data/workspace/persistence.cljs:504", "src/app/main/data/workspace/persistence.cljs:559" ], "translations" : { - "en" : "Loading image...", - "fr" : "Chargement de l'image...", - "ru" : "Загружаю изображение...", - "es" : "Cargando imagen..." + "en" : "Loading image…", + "fr" : "Chargement de l’image…", + "ru" : "Загружаю изображение…", + "es" : "Cargando imagen…" } }, "modal.create-color.new-color" : { @@ -2098,7 +2098,7 @@ "used-in" : [ "src/app/main/ui/workspace/header.cljs:112", "src/app/main/ui/dashboard/grid.cljs:114" ], "translations" : { "en" : "Once added as Shared Library, the assets of this file library will be available to be used among the rest of your files.", - "fr" : "Une fois ajoutés en tant que Bibliothèque Partagée, les ressources de cette bibliothèque de fichiers seront disponibles pour être utilisés parmi le reste de vos fichiers.", + "fr" : "Une fois ajoutées en tant que Bibliothèque Partagée, les ressources de cette bibliothèque de fichiers seront disponibles pour être utilisées parmi le reste de vos fichiers.", "ru" : "", "es" : "Una vez añadido como Biblioteca Compartida, los recursos de este archivo estarán disponibles para ser usado por el resto de tus archivos." } @@ -2107,7 +2107,7 @@ "used-in" : [ "src/app/main/ui/workspace/header.cljs:111", "src/app/main/ui/dashboard/grid.cljs:113" ], "translations" : { "en" : "Add “%s” as Shared Library", - "fr" : "Ajouter “%s” comme Bibliothèque Partagée", + "fr" : "Ajouter « %s » comme Bibliothèque Partagée", "ru" : "", "es" : "Añadir “%s” como Biblioteca Compartida" } @@ -2116,7 +2116,7 @@ "used-in" : [ "src/app/main/ui/settings/change_email.cljs:103" ], "translations" : { "en" : "Verify new email", - "fr" : "Vérifier la nouvelle adresse e-mail", + "fr" : "Vérifier la nouvelle adresse e‑mail", "ru" : "Подтвердить новый email адрес", "es" : "Verificar el nuevo correo" } @@ -2125,7 +2125,7 @@ "used-in" : [ "src/app/main/ui/settings/change_email.cljs:93" ], "translations" : { "en" : "We'll send you an email to your current email “%s” to verify your identity.", - "fr" : "Nous vous enverrons un e-mail à votre adresse actuelle “%s” pour vérifier votre identité.", + "fr" : "Nous enverrons un e‑mail à votre adresse actuelle « %s » pour vérifier votre identité.", "ru" : "Мы отправим письмо для подтверждения подлиности на текущий email адрес “%s”.", "es" : "Enviaremos un mensaje a tu correo actual “%s” para verificar tu identidad." } @@ -2134,7 +2134,7 @@ "used-in" : [ "src/app/main/ui/settings/change_email.cljs:98" ], "translations" : { "en" : "New email", - "fr" : "Nouvel e-mail", + "fr" : "Nouvel e‑mail", "ru" : "Новый email адрес", "es" : "Nuevo correo" } @@ -2143,7 +2143,7 @@ "used-in" : [ "src/app/main/ui/settings/change_email.cljs:109" ], "translations" : { "en" : "Change email", - "fr" : "Changer adresse e-mail", + "fr" : "Changer adresse e‑mail", "ru" : "Сменить email адрес", "es" : "Cambiar correo" } @@ -2152,7 +2152,7 @@ "used-in" : [ "src/app/main/ui/settings/change_email.cljs:86" ], "translations" : { "en" : "Change your email", - "fr" : "Changer adresse e-mail", + "fr" : "Changez votre adresse e‑mail", "ru" : "Сменить email адрес", "es" : "Cambiar tu correo" } @@ -2170,7 +2170,7 @@ "used-in" : [ "src/app/main/ui/settings/delete_account.cljs:67" ], "translations" : { "en" : "Yes, delete my account", - "fr" : "Oui, supprimez mon compte", + "fr" : "Oui, supprimer mon compte", "ru" : "Да, удалить мой аккаунт", "es" : "Si, borrar mi cuenta" } @@ -2179,7 +2179,7 @@ "used-in" : [ "src/app/main/ui/settings/delete_account.cljs:62" ], "translations" : { "en" : "By removing your account you’ll lose all your current projects and archives.", - "fr" : "En supprimant votre compte, vous perdrez tous vos projets et archives actuels.", + "fr" : "En supprimant votre compte, vous perdrez tous vos projets et archives actuelles.", "ru" : "Удалив аккаунт Вы потеряете все прокты и архивы.", "es" : "Si borras tu cuenta perderás todos tus proyectos y archivos." } @@ -2188,7 +2188,7 @@ "used-in" : [ "src/app/main/ui/settings/delete_account.cljs:55" ], "translations" : { "en" : "Are you sure you want to delete your account?", - "fr" : "Voulez-vous vraiment supprimer votre compte?", + "fr" : "Êtes‑vous sûr de vouloir supprimer votre compte ?", "ru" : "Вы уверены, что хотите удалить аккаунт?", "es" : "¿Seguro que quieres borrar tu cuenta?" } @@ -2205,7 +2205,7 @@ "used-in" : [ "src/app/main/ui/comments.cljs:226" ], "translations" : { "en" : "Are you sure you want to delete this conversation? All comments in this thread will be deleted.", - "fr" : "Voulez-vous vraiment supprimer cette conversation? Tous les commentaires de ce fil seront supprimés.", + "fr" : "Êtes‑vous sûr de vouloir supprimer cette conversation ? Tous les commentaires de ce fil seront supprimés.", "es" : "¿Seguro que quieres eliminar esta conversación? Todos los comentarios en este hilo serán eliminados." } }, @@ -2213,7 +2213,7 @@ "used-in" : [ "src/app/main/ui/comments.cljs:225" ], "translations" : { "en" : "Delete conversation", - "fr" : "Supprimer la conversation", + "fr" : "Supprimer une conversation", "es" : "Eliminar conversación" } }, @@ -2229,7 +2229,7 @@ "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:81" ], "translations" : { "en" : "Are you sure you want to delete this file?", - "fr" : "Êtes-vous sûr de vouloir supprimer ce fichier?", + "fr" : "Êtes‑vous sûr de vouloir supprimer ce fichier ?", "es" : "¿Seguro que quieres eliminar este archivo?" } }, @@ -2237,7 +2237,7 @@ "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:80" ], "translations" : { "en" : "Deleting file", - "fr" : "Supprimer le fichier", + "fr" : "Supprimer un fichier", "es" : "Eliminando archivo" } }, @@ -2245,7 +2245,7 @@ "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs:60" ], "translations" : { "en" : "Are you sure you want to delete this page?", - "fr" : "Êtes-vous sûr de vouloir supprimer cette page?", + "fr" : "Êtes‑vous sûr de vouloir supprimer cette page ?", "es" : "¿Seguro que quieres borrar esta página?" } }, @@ -2253,7 +2253,7 @@ "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs:59" ], "translations" : { "en" : "Delete page", - "fr" : "Supprimer la page", + "fr" : "Supprimer une page", "es" : "Borrar página" } }, @@ -2269,7 +2269,7 @@ "used-in" : [ "src/app/main/ui/dashboard/files.cljs:57" ], "translations" : { "en" : "Are you sure you want to delete this project?", - "fr" : "Êtes-vous sûr de vouloir supprimer ce projet?", + "fr" : "Êtes‑vous sûr de vouloir supprimer ce projet ?", "es" : "¿Seguro que quieres eliminar este proyecto?" } }, @@ -2277,7 +2277,7 @@ "used-in" : [ "src/app/main/ui/dashboard/files.cljs:56" ], "translations" : { "en" : "Delete project", - "fr" : "Supprimer le projet", + "fr" : "Supprimer un projet", "es" : "Eliminar proyecto" } }, @@ -2285,7 +2285,7 @@ "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:301" ], "translations" : { "en" : "Delete team", - "fr" : "Supprimer l'équipe", + "fr" : "Supprimer l’équipe", "es" : "Eliminar equipo" } }, @@ -2293,7 +2293,7 @@ "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:300" ], "translations" : { "en" : "Are you sure you want to delete this team? All projects and files associated with team will be permanently deleted.", - "fr" : "Voulez-vous vraiment supprimer cette équipe? Tous les projets et fichiers associés à l'équipe seront définitivement supprimés.", + "fr" : "Êtes‑vous sûr de vouloir supprimer cette équipe ? Tous les projets et fichiers associés à l’équipe seront définitivement supprimés.", "es" : "¿Seguro que quieres eliminar este equipo? Todos los proyectos y archivos asociados con el equipo serán eliminados permamentemente." } }, @@ -2301,7 +2301,7 @@ "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:299" ], "translations" : { "en" : "Deleting team", - "fr" : "Suppression de l'équipe", + "fr" : "Suppression d’une équipe", "es" : "Eliminando equipo" } }, @@ -2317,7 +2317,7 @@ "used-in" : [ "src/app/main/ui/dashboard/team.cljs:163" ], "translations" : { "en" : "Are you sure you want to delete this member from the team?", - "fr" : "Voulez-vous vraiment supprimer ce membre de l'équipe?", + "fr" : "Êtes‑vous sûr de vouloir supprimer ce membre de l’équipe ?", "es" : "¿Seguro que quieres eliminar este integrante del equipo?" } }, @@ -2325,7 +2325,7 @@ "used-in" : [ "src/app/main/ui/dashboard/team.cljs:162" ], "translations" : { "en" : "Delete team member", - "fr" : "Supprimer le membre de l'équipe", + "fr" : "Supprimer un membre d’équipe", "es" : "Eliminar integrante del equipo" } }, @@ -2333,7 +2333,7 @@ "used-in" : [ "src/app/main/ui/dashboard/team.cljs:112" ], "translations" : { "en" : "Invite to join the team", - "fr" : "Inviter à rejoindre l'équipe", + "fr" : "Inviter à rejoindre l’équipe", "es" : "Invitar a unirse al equipo" } }, @@ -2349,7 +2349,7 @@ "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:205" ], "translations" : { "en" : "Select other member to promote before leave", - "fr" : "Sélectionnez un autre membre à promouvoir avant de partir", + "fr" : "Sélectionnez un autre membre à promouvoir avant de quitter l’équipe", "es" : "Promociona otro miembro a dueño antes de abandonar el equipo" } }, @@ -2381,7 +2381,7 @@ "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:276" ], "translations" : { "en" : "Leave team", - "fr" : "Quitter l'équipe", + "fr" : "Quitter l’équipe", "es" : "Abandonar el equipo" } }, @@ -2389,7 +2389,7 @@ "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:275" ], "translations" : { "en" : "Are you sure you want to leave this team?", - "fr" : "Êtes-vous sûr de vouloir quitter cette équipe?", + "fr" : "Êtes‑vous sûr de vouloir quitter cette équipe ?", "es" : "¿Seguro que quieres abandonar este equipo?" } }, @@ -2397,7 +2397,7 @@ "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:274" ], "translations" : { "en" : "Leaving team", - "fr" : "Quitter l'équipe", + "fr" : "Quitter l’équipe", "es" : "Abandonando el equipo" } }, @@ -2413,7 +2413,7 @@ "used-in" : [ "src/app/main/ui/dashboard/team.cljs:150" ], "translations" : { "en" : "Are you sure you want to promote this user to owner?", - "fr" : "Voulez-vous vraiment promouvoir cet utilisateur en propriétaire?", + "fr" : "Êtes‑vous sûr de vouloir promouvoir cette personne propriétaire ?", "es" : "¿Seguro que quieres promocionar este usuario a dueño?" } }, @@ -2421,7 +2421,7 @@ "used-in" : [ "src/app/main/ui/dashboard/team.cljs:149" ], "translations" : { "en" : "Promote to owner", - "fr" : "Promouvoir en propriétaire", + "fr" : "Promouvoir propriétaire", "es" : "Promocionar a dueño" } }, @@ -2447,7 +2447,7 @@ "used-in" : [ "src/app/main/ui/workspace/header.cljs:124", "src/app/main/ui/dashboard/grid.cljs:129" ], "translations" : { "en" : "Remove “%s” as Shared Library", - "fr" : "Retirer “%s” en tant que Bibliothèque Partagée", + "fr" : "Retirer « %s » en tant que Bibliothèque Partagée", "ru" : "", "es" : "Añadir “%s” como Biblioteca Compartida" } @@ -2474,7 +2474,7 @@ "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:93", "src/app/main/ui/workspace/sidebar/options/component.cljs:70" ], "translations" : { "en" : "You are about to update a component in a shared library. This may affect other files that use it.", - "fr" : "Vous êtes sur le point de mettre à jour un composant dans une bibliothèque partagée. Cela peut affecter d'autres fichiers qui l'utilisent.", + "fr" : "Vous êtes sur le point de mettre à jour le composant d’une Bibliothèque Partagée. Cela peut affecter d’autres fichiers qui l’utilisent.", "ru" : "", "es" : "Vas a actualizar un componente en una librería compartida. Esto puede afectar a otros archivos que la usen." } @@ -2483,7 +2483,7 @@ "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:92", "src/app/main/ui/workspace/sidebar/options/component.cljs:69" ], "translations" : { "en" : "Update a component in a shared library", - "fr" : "Actualiser un composant dans une bibliothèque", + "fr" : "Actualiser le composant d’une bibliothèque", "ru" : "", "es" : "Actualizar un componente en librería" } @@ -2491,7 +2491,7 @@ "notifications.profile-deletion-not-allowed" : { "used-in" : [ "src/app/main/ui/settings/delete_account.cljs:28" ], "translations" : { - "en" : "You can't delete you profile. Reasign your teams before proceed.", + "en" : "You can't delete you profile. Reassign your teams before proceed.", "fr" : "Vous ne pouvez pas supprimer votre profil. Réassignez vos équipes avant de continuer.", "ru" : "Вы не можете удалить профиль. Сначала смените команду.", "es" : "No puedes borrar tu perfil. Reasigna tus equipos antes de seguir." @@ -2501,7 +2501,7 @@ "used-in" : [ "src/app/main/ui/settings/options.cljs:36", "src/app/main/ui/settings/profile.cljs:38" ], "translations" : { "en" : "Profile saved successfully!", - "fr" : "Profil enregistré avec succès!", + "fr" : "Profil enregistré avec succès !", "ru" : "Профиль успешно сохранен!", "es" : "Perfil guardado correctamente!" } @@ -2510,7 +2510,7 @@ "used-in" : [ "src/app/main/ui/settings/change_email.cljs:56", "src/app/main/ui/auth/register.cljs:54" ], "translations" : { "en" : "Verification email sent to %s. Check your email!", - "fr" : "E-mail de vérification envoyé à %s. Vérifiez votre email!", + "fr" : "E‑mail de vérification envoyé à %s. Vérifiez votre e‑mail !", "es" : "Verificación de email enviada a %s. Comprueba tu correo." } }, @@ -2518,7 +2518,7 @@ "used-in" : [ "src/app/main/ui/auth/recovery.cljs:95" ], "translations" : { "en" : "Go to login", - "fr" : "Aller à la connexion", + "fr" : "Aller à la page de connexion", "ru" : null, "es" : null } @@ -2544,7 +2544,7 @@ "settings.teams" : { "translations" : { "en" : "TEAMS", - "fr" : "EQUIPES", + "fr" : "ÉQUIPES", "ru" : "КОМАНДЫ", "es" : "EQUIPOS" }, @@ -2581,7 +2581,7 @@ "used-in" : [ "src/app/main/ui/viewer/header.cljs:266" ], "translations" : { "en" : "Edit page", - "fr" : "Editer la page", + "fr" : "Modifier la page", "ru" : "Редактировать страницу", "es" : "Editar página" } @@ -2599,7 +2599,7 @@ "used-in" : [ "src/app/main/ui/viewer/header.cljs:93" ], "translations" : { "en" : "Copy link", - "fr" : "Copier lien", + "fr" : "Copier le lien", "ru" : "Копировать ссылку", "es" : "Copiar enlace" } @@ -2608,7 +2608,7 @@ "used-in" : [ "src/app/main/ui/viewer/header.cljs:102" ], "translations" : { "en" : "Create link", - "fr" : "Créer lien", + "fr" : "Créer le lien", "ru" : "Создать ссылку", "es" : "Crear enlace" } @@ -2680,7 +2680,7 @@ "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:53" ], "translations" : { "en" : "Align horizontal center", - "fr" : "Aligner au centre", + "fr" : "Aligner horizontalement au centre", "ru" : "Выровнять по горизонтали", "es" : "Alinear al centro" } @@ -2689,7 +2689,7 @@ "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:65" ], "translations" : { "en" : "Distribute horizontal spacing", - "fr" : "Répartir l'espacement horizontal", + "fr" : "Répartir l’espacement horizontal", "ru" : "Распределить горизонтальное пространство", "es" : "Distribuir espacio horizontal" } @@ -2725,7 +2725,7 @@ "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:78" ], "translations" : { "en" : "Align vertical center", - "fr" : "Aligner au centre", + "fr" : "Aligner verticalement au centre", "ru" : "Выровнять по вертикали", "es" : "Alinear al centro" } @@ -2734,7 +2734,7 @@ "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:90" ], "translations" : { "en" : "Distribute vertical spacing", - "fr" : "Répartir l'espacement vertical", + "fr" : "Répartir l’espacement vertical", "ru" : "Распределить вертикальное пространство", "es" : "Distribuir espacio vertical" } @@ -2824,7 +2824,7 @@ "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:374", "src/app/main/ui/workspace/sidebar/assets.cljs:503" ], "translations" : { "en" : "Edit", - "fr" : "Éditer", + "fr" : "Modifier", "ru" : "", "es" : "Editar" } @@ -2936,7 +2936,7 @@ "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs:292" ], "translations" : { "en" : "Letter Spacing", - "fr" : "Espacement des lettres", + "fr" : "Interlettrage", "es" : "Interletrado" } }, @@ -2944,7 +2944,7 @@ "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs:288" ], "translations" : { "en" : "Line Height", - "fr" : "Hauteur de ligne", + "fr" : "Interlignage", "es" : "Interlineado" } }, @@ -2984,7 +2984,7 @@ "used-in" : [ "src/app/main/ui/workspace/header.cljs:220" ], "translations" : { "en" : "Disable dynamic alignment", - "fr" : "Désactiver l'alignement dynamique", + "fr" : "Désactiver l’alignement dynamique", "ru" : "Отключить активное выравнивание", "es" : "Desactivar alineamiento dinámico" } @@ -2993,7 +2993,7 @@ "used-in" : [ "src/app/main/ui/workspace/header.cljs:188" ], "translations" : { "en" : "Disable snap to grid", - "fr" : "Désactiver l'alignement sur la grille", + "fr" : "Désactiver l’alignement sur la grille", "ru" : "Отключить привязку к сетке", "es" : "Desactivar alinear a la rejilla" } @@ -3002,7 +3002,7 @@ "used-in" : [ "src/app/main/ui/workspace/header.cljs:221" ], "translations" : { "en" : "Enable dynamic aligment", - "fr" : "Activer l'alignement dynamique", + "fr" : "Activer l’alignement dynamique", "ru" : "Включить активное выравнивание", "es" : "Activar alineamiento dinámico" } @@ -3038,7 +3038,7 @@ "used-in" : [ "src/app/main/ui/workspace/header.cljs:195" ], "translations" : { "en" : "Hide layers", - "fr" : "Masquer les couches", + "fr" : "Masquer les calques", "ru" : "Спрятать слои", "es" : "Ocultar capas" } @@ -3065,7 +3065,7 @@ "used-in" : [ "src/app/main/ui/workspace/header.cljs:214" ], "translations" : { "en" : "Select all", - "fr" : "Sélectionner tout", + "fr" : "Tout sélectionner", "ru" : "", "es" : "Seleccionar todo" } @@ -3092,7 +3092,7 @@ "used-in" : [ "src/app/main/ui/workspace/header.cljs:196" ], "translations" : { "en" : "Show layers", - "fr" : "Montrer les couches", + "fr" : "Montrer les calques", "ru" : "Показать слои", "es" : "Mostrar capas" } @@ -3119,7 +3119,7 @@ "used-in" : [ "src/app/main/ui/workspace/header.cljs:58" ], "translations" : { "en" : "Error on saving", - "fr" : "Erreur d'enregistrement", + "fr" : "Erreur d’enregistrement", "es" : "Error al guardar" } }, @@ -3151,7 +3151,7 @@ "used-in" : [ "src/app/main/ui/workspace/header.cljs:279" ], "translations" : { "en" : "View mode (%s)", - "fr" : "Mode visualisation (%s)", + "fr" : "Mode spectateur (%s)", "ru" : "Режим просмотра (%s)", "es" : "Modo de visualización (%s)" } @@ -3272,7 +3272,7 @@ "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:134" ], "translations" : { "en" : "There are no Shared Libraries that need update", - "fr" : "Aucune Bibliothèque Partagée n'a besoin d'être mise à jour", + "fr" : "Aucune Bibliothèque Partagée n’a besoin d’être mise à jour", "ru" : "", "es" : "No hay bibliotecas que necesiten ser actualizadas" } @@ -3281,7 +3281,7 @@ "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:122" ], "translations" : { "en" : "No matches found for “%s“", - "fr" : "Aucune correspondance pour “%s“", + "fr" : "Aucune correspondance pour « %s »", "ru" : "Совпадений для “%s“ не найдено", "es" : "No se encuentra “%s“" } @@ -3290,7 +3290,7 @@ "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:121" ], "translations" : { "en" : "There are no Shared Libraries available", - "fr" : "Aucune bibliothèque partagée disponible", + "fr" : "Aucune Bibliothèque Partagée disponible", "ru" : "", "es" : "No hay bibliotecas compartidas disponibles" } @@ -3299,7 +3299,7 @@ "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:99" ], "translations" : { "en" : "Search shared libraries", - "fr" : "Rechercher des bibliothèques partagées", + "fr" : "Rechercher des Bibliothèques Partagées", "ru" : "", "es" : "Buscar bibliotecas compartidas" } @@ -3420,7 +3420,7 @@ "workspace.options.blur-options.layer-blur" : { "translations" : { "en" : "Layer", - "fr" : "Couche", + "fr" : "Calque", "es" : "Capa" }, "unused" : true @@ -3453,7 +3453,7 @@ "used-in" : [ "src/app/main/ui/workspace/sidebar/options/page.cljs:45" ], "translations" : { "en" : "Canvas background", - "fr" : "Couleur de fond", + "fr" : "Couleur de fond du canvas", "ru" : "Фон холста", "es" : "Color de fondo" } @@ -3504,9 +3504,9 @@ "workspace.options.exporting-object" : { "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs:165", "src/app/main/ui/handoff/exports.cljs:130" ], "translations" : { - "en" : "Exporting...", - "fr" : "Export...", - "ru" : "Экспортирую...", + "en" : "Exporting…", + "fr" : "Export en cours…", + "ru" : "Экспортирую…", "es" : "Exportando" } }, @@ -3703,7 +3703,7 @@ "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:239" ], "translations" : { "en" : "Grid & Layouts", - "fr" : "Grille & couches", + "fr" : "Grille & Calques", "ru" : "Сетка и Макеты", "es" : "Rejilla & Estructuras" } @@ -3928,7 +3928,7 @@ "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:162" ], "translations" : { "en" : "Dashed", - "fr" : "Tiré", + "fr" : "Tirets", "ru" : "Пунктирный", "es" : "Rayado" } @@ -4018,7 +4018,7 @@ "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:107" ], "translations" : { "en" : "Align middle", - "fr" : "Aligner au milieu", + "fr" : "Aligner verticalement au milieu", "ru" : "Выравнивание по центру", "es" : "Alinear al centro" } @@ -4078,7 +4078,7 @@ "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs:154" ], "translations" : { "en" : "Letter Spacing", - "fr" : "Espacement des lettres", + "fr" : "Interlettrage", "ru" : "Межсимвольный интервал", "es" : "Espaciado entre letras" } @@ -4087,7 +4087,7 @@ "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs:141" ], "translations" : { "en" : "Line height", - "fr" : "Hauteur de ligne", + "fr" : "Interlignage", "ru" : "Высота строки", "es" : "Altura de línea" } @@ -4158,8 +4158,8 @@ "workspace.options.text-options.titlecase" : { "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs:191" ], "translations" : { - "en" : "Titlecase", - "fr" : "Titre", + "en" : "Title Case", + "fr" : "Premières Lettres en Capitales", "ru" : "Каждое слово с заглавной буквы", "es" : "Título" } @@ -4168,7 +4168,7 @@ "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:159" ], "translations" : { "en" : "Underline", - "fr" : "Souligner", + "fr" : "Soulignage", "ru" : "Подчеркнутый", "es" : "Subrayado" } @@ -4195,7 +4195,7 @@ "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs:55" ], "translations" : { "en" : "Use the play button at the header to run the prototype view.", - "fr" : "Utilisez le bouton de lecture dans l'en-tête pour exécuter la vue du prototype.", + "fr" : "Utilisez le bouton de lecture dans l’en‑tête pour exécuter la vue du prototype.", "ru" : "Используй кнопку запуск в заголовке чтобы перейти на экран прототипа.", "es" : "Usa el botón de play de la cabecera para arrancar la vista de prototipo." } @@ -4204,7 +4204,7 @@ "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:124" ], "translations" : { "en" : "Send to back", - "fr" : "Mettre en arrière plan", + "fr" : "Envoyer au fond", "es" : "Enviar al fondo" } }, @@ -4212,7 +4212,7 @@ "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:121" ], "translations" : { "en" : "Send backward", - "fr" : "Reculer", + "fr" : "Éloigner", "es" : "Enviar atrás" } }, @@ -4252,7 +4252,7 @@ "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:180", "src/app/main/ui/workspace/context_menu.cljs:190", "src/app/main/ui/workspace/sidebar/options/component.cljs:95", "src/app/main/ui/workspace/sidebar/options/component.cljs:100" ], "translations" : { "en" : "Detach instance", - "fr" : "Détacher l'instance", + "fr" : "Détacher l’instance", "es" : "Desacoplar instancia" } }, @@ -4276,7 +4276,7 @@ "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:118" ], "translations" : { "en" : "Bring to front", - "fr" : "Mettre au premier plan", + "fr" : "Amener au premier plan", "es" : "Mover al frente" } }, @@ -4405,7 +4405,7 @@ "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:112" ], "translations" : { "en" : "Layers (%s)", - "fr" : "Couches (%s)", + "fr" : "Calques (%s)", "es" : "Capas (%s)" } }, @@ -4529,7 +4529,7 @@ "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs:293" ], "translations" : { "en" : "There are no history changes so far", - "fr" : "Il n'y a aucun changement dans l'historique", + "fr" : "Il n’y a aucun changement dans l’historique pour l’instant", "es" : "Todavía no hay cambios en el histórico" } }, @@ -4600,7 +4600,7 @@ "workspace.undo.entry.multiple.group" : { "translations" : { "en" : "groups", - "fr" : "grouprs", + "fr" : "groupes", "es" : "grupos" }, "unused" : true @@ -4696,7 +4696,7 @@ "workspace.undo.entry.single.color" : { "translations" : { "en" : "color asset", - "fr" : "culeur", + "fr" : "couleur", "es" : "color" }, "unused" : true @@ -4776,7 +4776,7 @@ "workspace.undo.entry.single.rect" : { "translations" : { "en" : "rectangle", - "fr" : "Rectangle", + "fr" : "rectangle", "es" : "rectángulo" }, "unused" : true From abb8d8502b03803d48794779930ccb6c100ccc8f Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 16 Feb 2021 20:04:32 +0100 Subject: [PATCH 25/90] :sparkles: Remove line numbers from locales.json This will help to avoid unnecesary conflicts. --- backend/dev/user.clj | 2 +- frontend/locales.clj | 35 +- frontend/package.json | 2 +- frontend/resources/locales.json | 1364 +++++++++++++------------------ 4 files changed, 602 insertions(+), 801 deletions(-) diff --git a/backend/dev/user.clj b/backend/dev/user.clj index 85b53afb5..5b861a9fa 100644 --- a/backend/dev/user.clj +++ b/backend/dev/user.clj @@ -14,7 +14,7 @@ [app.main :as main] [app.util.time :as dt] [app.util.transit :as t] - [clojure.data.json :as json] + [app.util.json :as json] [clojure.java.io :as io] [clojure.pprint :refer [pprint]] [clojure.repl :refer :all] diff --git a/frontend/locales.clj b/frontend/locales.clj index e5eb86780..003da68e3 100644 --- a/frontend/locales.clj +++ b/frontend/locales.clj @@ -12,7 +12,9 @@ 'java.nio.file.Path 'java.nio.file.Files 'java.nio.file.SimpleFileVisitor - 'java.nio.file.FileVisitResult) + 'java.nio.file.FileVisitResult + 'com.fasterxml.jackson.databind.ObjectMapper + 'com.fasterxml.jackson.databind.SerializationFeature) (defmulti task first) @@ -62,7 +64,7 @@ (defn- read-json-file [path] (when (fs/regular-file? path) - (let [content (json/read-value (slurp (io/as-file path)))] + (let [content (json/read-value (io/as-file path))] (into (sorted-map) content)))) (defn- read-edn-file @@ -74,7 +76,7 @@ (defn- add-translation [data {:keys [code file line] :as translation}] - (let [rpath (str file ":" line)] + (let [rpath (str file)] (if (contains? data code) (update data code (fn [state] (if (get state "permanent") @@ -121,29 +123,20 @@ (first r) (rest r))))) -(defn- synchronize-legacy-translations - [data legacy-data lang] - (reduce-kv (fn [data k v] - (if (contains? data k) - (update-in data [k "translations"] assoc lang v) - data)) - data - legacy-data)) - (defn- write-result! [data output-path] (binding [*out* (io/writer (fs/path output-path))] - (let [mapper (json/object-mapper {:pretty true})] + (let [mapper (doto (ObjectMapper.) + (.enable SerializationFeature/ORDER_MAP_ENTRIES_BY_KEYS)) + mapper (json/object-mapper {:pretty true :mapper mapper})] (println (json/write-value-as-string data mapper)) (flush)))) (defn- update-translations [{:keys [find-directory output-path] :as props}] - (let [ - data (read-json-file output-path) + (let [data (read-json-file output-path) translations (collect-translations find-directory) - data (synchronize-translations data translations) - ] + data (synchronize-translations data translations)] (write-result! data output-path))) (defmethod task "collect" @@ -151,12 +144,4 @@ (update-translations {:find-directory in-path :output-path out-path})) - -(defmethod task "merge-with-legacy" - [[_ path lang legacy-path]] - (let [ldata (read-edn-file legacy-path) - data (read-json-file path) - data (synchronize-legacy-translations data ldata lang)] - (write-result! data path))) - (task *command-line-args*) diff --git a/frontend/package.json b/frontend/package.json index 112e8669f..fa6e8c17f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -12,7 +12,7 @@ "defaults" ], "scripts": { - "collect-locales": "clojure -Adev locales.clj collect src/app/main/ resources/locales.json" + "collect-locales": "clojure -M:dev locales.clj collect src/app/main/ resources/locales.json" }, "devDependencies": { "autoprefixer": "^10.1.0", diff --git a/frontend/resources/locales.json b/frontend/resources/locales.json index b0e2ca50a..8b004f47c 100644 --- a/frontend/resources/locales.json +++ b/frontend/resources/locales.json @@ -1,6 +1,6 @@ { "auth.already-have-account" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs:128" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { "en" : "Already have an account?", "fr" : "Vous avez déjà un compte ?", @@ -8,8 +8,15 @@ "es" : "¿Tienes ya una cuenta?" } }, + "auth.check-your-email" : { + "used-in" : [ "src/app/main/ui/auth/register.cljs" ], + "translations" : { + "en" : "Check your email and click on the link to verify and start using Penpot.", + "fr" : "Vérifiez votre e‑mail et cliquez sur le lien pour vérifier et commencer à utiliser Penpot." + } + }, "auth.confirm-password" : { - "used-in" : [ "src/app/main/ui/auth/recovery.cljs:77" ], + "used-in" : [ "src/app/main/ui/auth/recovery.cljs" ], "translations" : { "en" : "Confirm password", "fr" : "Confirmez le mot de passe", @@ -18,7 +25,7 @@ } }, "auth.create-demo-account" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs:161", "src/app/main/ui/auth/register.cljs:138" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/login.cljs" ], "translations" : { "en" : "Create demo account", "fr" : "Créer un compte de démonstration", @@ -27,7 +34,7 @@ } }, "auth.create-demo-profile" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs:158", "src/app/main/ui/auth/register.cljs:135" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/login.cljs" ], "translations" : { "en" : "Just wanna try it?", "fr" : "Vous voulez juste essayer ?", @@ -35,21 +42,8 @@ "es" : "¿Quieres probar?" } }, - "auth.verification-email-sent": { - "translations": { - "en" : "We've sent a verification email to", - "fr" : "Nous avons envoyé un e-mail de vérification à" - } - }, - - "auth.check-your-email": { - "translations": { - "en" : "Check your email and click on the link to verify and start using Penpot.", - "fr" : "Vérifiez votre e‑mail et cliquez sur le lien pour vérifier et commencer à utiliser Penpot." - } - }, "auth.demo-warning" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs:33" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { "en" : "This is a DEMO service, DO NOT USE for real work, the projects will be periodicaly wiped.", "fr" : "Il s’agit d’un service DEMO, NE PAS UTILISER pour un travail réel, les projets seront périodiquement supprimés.", @@ -58,7 +52,7 @@ } }, "auth.email" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs:99", "src/app/main/ui/auth/register.cljs:101", "src/app/main/ui/auth/recovery_request.cljs:47" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/recovery_request.cljs", "src/app/main/ui/auth/login.cljs" ], "translations" : { "en" : "Email", "fr" : "Adresse e‑mail", @@ -67,7 +61,7 @@ } }, "auth.forgot-password" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs:128" ], + "used-in" : [ "src/app/main/ui/auth/login.cljs" ], "translations" : { "en" : "Forgot password?", "fr" : "Mot de passe oublié ?", @@ -76,7 +70,7 @@ } }, "auth.fullname" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs:94" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { "en" : "Full Name", "fr" : "Nom complet", @@ -85,7 +79,7 @@ } }, "auth.go-back-to-login" : { - "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs:68" ], + "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs" ], "translations" : { "en" : "Go back!", "fr" : "Retour !", @@ -93,17 +87,8 @@ "es" : "Volver" } }, - "auth.goodbye-title" : { - "used-in" : [ "src/app/main/ui/auth.cljs:35" ], - "translations" : { - "en" : "Goodbye!", - "fr" : "Au revoir !", - "ru" : "Пока!", - "es" : "¡Adiós!" - } - }, "auth.login-here" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs:131" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { "en" : "Login here", "fr" : "Se connecter ici", @@ -112,7 +97,7 @@ } }, "auth.login-submit" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs:108" ], + "used-in" : [ "src/app/main/ui/auth/login.cljs" ], "translations" : { "en" : "Sign in", "fr" : "Se connecter", @@ -121,7 +106,7 @@ } }, "auth.login-subtitle" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs:120" ], + "used-in" : [ "src/app/main/ui/auth/login.cljs" ], "translations" : { "en" : "Enter your details below", "fr" : "Entrez vos informations ci‑dessous", @@ -130,7 +115,7 @@ } }, "auth.login-title" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs:119" ], + "used-in" : [ "src/app/main/ui/auth/login.cljs" ], "translations" : { "en" : "Great to see you again!", "fr" : "Ravi de vous revoir !", @@ -139,7 +124,7 @@ } }, "auth.login-with-github-submit" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs:153" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/login.cljs" ], "translations" : { "en" : "Login with Github", "fr" : "Se connecter via Github", @@ -148,7 +133,7 @@ } }, "auth.login-with-gitlab-submit" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs:146" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/login.cljs" ], "translations" : { "en" : "Login with Gitlab", "fr" : "Se connecter via Gitlab", @@ -157,7 +142,7 @@ } }, "auth.login-with-ldap-submit" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs:112" ], + "used-in" : [ "src/app/main/ui/auth/login.cljs" ], "translations" : { "en" : "Sign in with LDAP", "fr" : "Se connecter via LDAP", @@ -166,7 +151,7 @@ } }, "auth.new-password" : { - "used-in" : [ "src/app/main/ui/auth/recovery.cljs:72" ], + "used-in" : [ "src/app/main/ui/auth/recovery.cljs" ], "translations" : { "en" : "Type a new password", "fr" : "Saisissez un nouveau mot de passe", @@ -174,15 +159,8 @@ "es" : "Introduce la nueva contraseña" } }, - "auth.notifications.profile-not-verified": { - "translations": { - "en" : "Profile is not verified, please verify profile before continue.", - "fr" : "Le profil n’est pas vérifié. Veuillez vérifier le profil avant de continuer.", - "es" : "El perfil aun no ha sido verificado, por favor valida el perfil antes de continuar." - } - }, "auth.notifications.invalid-token-error" : { - "used-in" : [ "src/app/main/ui/auth/recovery.cljs:47" ], + "used-in" : [ "src/app/main/ui/auth/recovery.cljs" ], "translations" : { "en" : "The recovery token is invalid.", "fr" : "Le code de récupération n’est pas valide.", @@ -191,7 +169,7 @@ } }, "auth.notifications.password-changed-succesfully" : { - "used-in" : [ "src/app/main/ui/auth/recovery.cljs:51" ], + "used-in" : [ "src/app/main/ui/auth/recovery.cljs" ], "translations" : { "en" : "Password successfully changed", "fr" : "Mot de passe changé avec succès", @@ -199,8 +177,16 @@ "es" : "La contraseña ha sido cambiada" } }, + "auth.notifications.profile-not-verified" : { + "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs" ], + "translations" : { + "en" : "Profile is not verified, please verify profile before continue.", + "fr" : "Le profil n’est pas vérifié. Veuillez vérifier le profil avant de continuer.", + "es" : "El perfil aun no ha sido verificado, por favor valida el perfil antes de continuar." + } + }, "auth.notifications.recovery-token-sent" : { - "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs:30" ], + "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs" ], "translations" : { "en" : "Password recovery link sent to your inbox.", "fr" : "Lien de récupération de mot de passe envoyé.", @@ -209,7 +195,7 @@ } }, "auth.notifications.team-invitation-accepted" : { - "used-in" : [ "src/app/main/ui/auth/verify_token.cljs:55", "src/app/main/ui/auth/register.cljs:50" ], + "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ], "translations" : { "en" : "Joined the team succesfully", "fr" : "Vous avez rejoint l’équipe avec succès", @@ -217,7 +203,7 @@ } }, "auth.password" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs:106", "src/app/main/ui/auth/register.cljs:106" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/login.cljs" ], "translations" : { "en" : "Password", "fr" : "Mot de passe", @@ -226,7 +212,7 @@ } }, "auth.password-length-hint" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs:105" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { "en" : "At least 8 characters", "fr" : "Au moins 8 caractères", @@ -235,7 +221,7 @@ } }, "auth.recovery-request-submit" : { - "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs:52" ], + "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs" ], "translations" : { "en" : "Recover Password", "fr" : "Récupérer le mot de passe", @@ -244,7 +230,7 @@ } }, "auth.recovery-request-subtitle" : { - "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs:62" ], + "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs" ], "translations" : { "en" : "We'll send you an email with instructions", "fr" : "Nous vous enverrons un e‑mail avec des instructions", @@ -253,7 +239,7 @@ } }, "auth.recovery-request-title" : { - "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs:61" ], + "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs" ], "translations" : { "en" : "Forgot password?", "fr" : "Mot de passe oublié ?", @@ -262,7 +248,7 @@ } }, "auth.recovery-submit" : { - "used-in" : [ "src/app/main/ui/auth/recovery.cljs:80" ], + "used-in" : [ "src/app/main/ui/auth/recovery.cljs" ], "translations" : { "en" : "Change your password", "fr" : "Changez votre mot de passe", @@ -271,7 +257,7 @@ } }, "auth.register" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs:131" ], + "used-in" : [ "src/app/main/ui/auth/login.cljs" ], "translations" : { "en" : "No account yet?", "fr" : "Pas encore de compte ?", @@ -280,7 +266,7 @@ } }, "auth.register-submit" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs:134", "src/app/main/ui/auth/register.cljs:110" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/login.cljs" ], "translations" : { "en" : "Create an account", "fr" : "Créer un compte", @@ -289,7 +275,7 @@ } }, "auth.register-subtitle" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs:118" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { "en" : "It's free, it's Open Source", "fr" : "C’est gratuit, c’est Open Source", @@ -298,7 +284,7 @@ } }, "auth.register-title" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs:117" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { "en" : "Create an account", "fr" : "Créer un compte", @@ -307,7 +293,7 @@ } }, "auth.sidebar-tagline" : { - "used-in" : [ "src/app/main/ui/auth.cljs:46" ], + "used-in" : [ "src/app/main/ui/auth.cljs" ], "translations" : { "en" : "The open-source solution for design and prototyping.", "fr" : "La solution Open Source pour la conception et le prototypage.", @@ -315,8 +301,15 @@ "es" : "La solución de código abierto para diseñar y prototipar" } }, + "auth.verification-email-sent" : { + "used-in" : [ "src/app/main/ui/auth/register.cljs" ], + "translations" : { + "en" : "We've sent a verification email to", + "fr" : "Nous avons envoyé un e-mail de vérification à" + } + }, "dashboard.add-shared" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:228", "src/app/main/ui/dashboard/grid.cljs:182" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { "en" : "Add as Shared Library", "fr" : "Ajouter une Bibliothèque Partagée", @@ -325,7 +318,7 @@ } }, "dashboard.change-email" : { - "used-in" : [ "src/app/main/ui/settings/profile.cljs:79" ], + "used-in" : [ "src/app/main/ui/settings/profile.cljs" ], "translations" : { "en" : "Change email", "fr" : "Changer adresse e‑mail", @@ -334,7 +327,7 @@ } }, "dashboard.create-new-team" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:171" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "+ Create new team", "fr" : "+ Créer nouvelle équipe", @@ -342,7 +335,7 @@ } }, "dashboard.default-team-name" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:341" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Your Penpot", "fr" : "Votre Penpot", @@ -350,7 +343,7 @@ } }, "dashboard.delete-team" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:325" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Delete team", "fr" : "Supprimer l’équipe", @@ -358,7 +351,7 @@ } }, "dashboard.draft-title" : { - "used-in" : [ "src/app/main/ui/dashboard/files.cljs:72" ], + "used-in" : [ "src/app/main/ui/dashboard/files.cljs" ], "translations" : { "en" : "Draft", "fr" : "Brouillon", @@ -367,7 +360,7 @@ } }, "dashboard.empty-files" : { - "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:188" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { "en" : "You still have no files here", "fr" : "Vous n’avez encore aucun fichier ici", @@ -376,7 +369,7 @@ } }, "dashboard.invite-profile" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:72" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Invite to team", "fr" : "Inviter dans l’équipe", @@ -384,7 +377,7 @@ } }, "dashboard.leave-team" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:318", "src/app/main/ui/dashboard/sidebar.cljs:321" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Leave team", "fr" : "Quitter l’équipe", @@ -392,7 +385,7 @@ } }, "dashboard.libraries-title" : { - "used-in" : [ "src/app/main/ui/dashboard/libraries.cljs:40" ], + "used-in" : [ "src/app/main/ui/dashboard/libraries.cljs" ], "translations" : { "en" : "Shared Libraries", "fr" : "Bibliothèques Partagées", @@ -400,89 +393,8 @@ "es" : "Bibliotecas Compartidas" } }, - "dashboard.library.add-item.icons" : { - "translations" : { - "en" : "+ New icon", - "fr" : "+ Nouvelle icône", - "ru" : "+ Новая иконка", - "es" : "+ Nuevo icono" - }, - "unused" : true - }, - "dashboard.library.add-item.images" : { - "translations" : { - "en" : "+ New image", - "fr" : "+ Nouvelle image", - "ru" : "+ Новое изображение", - "es" : "+ Nueva imagen" - }, - "unused" : true - }, - "dashboard.library.add-item.palettes" : { - "translations" : { - "en" : "+ New color", - "fr" : "+ Nouvelle couleur", - "ru" : "+ Новый цвет", - "es" : "+ Nuevo color" - }, - "unused" : true - }, - "dashboard.library.add-library.icons" : { - "translations" : { - "en" : "+ New icon library", - "fr" : "+ Nouvelle bibliothèque d’icônes", - "ru" : "+ Новая библиотека иконок", - "es" : "+ Nueva biblioteca de iconos" - }, - "unused" : true - }, - "dashboard.library.add-library.images" : { - "translations" : { - "en" : "+ New image library", - "fr" : "+ Nouvelle bibliothèque d’images", - "ru" : "+ Новая библиотека изображений", - "es" : "+ Nueva biblioteca de imágenes" - }, - "unused" : true - }, - "dashboard.library.add-library.palettes" : { - "translations" : { - "en" : "+ New palette", - "fr" : "+ Nouvelle palette", - "ru" : "+ Новая палитра", - "es" : "+ Nueva paleta" - }, - "unused" : true - }, - "dashboard.library.menu.icons" : { - "translations" : { - "en" : "Icons", - "fr" : "Icônes", - "ru" : "Иконки", - "es" : "Iconos" - }, - "unused" : true - }, - "dashboard.library.menu.images" : { - "translations" : { - "en" : "Images", - "fr" : "Images", - "ru" : "Изображения", - "es" : "Imágenes" - }, - "unused" : true - }, - "dashboard.library.menu.palettes" : { - "translations" : { - "en" : "Palettes", - "fr" : "Palettes", - "ru" : "Палитры", - "es" : "Paletas" - }, - "unused" : true - }, "dashboard.loading-files" : { - "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:194" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { "en" : "loading your files …", "fr" : "chargement de vos fichiers…", @@ -490,7 +402,7 @@ } }, "dashboard.new-file" : { - "used-in" : [ "src/app/main/ui/dashboard/projects.cljs:108", "src/app/main/ui/dashboard/files.cljs:87" ], + "used-in" : [ "src/app/main/ui/dashboard/projects.cljs", "src/app/main/ui/dashboard/files.cljs" ], "translations" : { "en" : "+ New File", "fr" : "+ Nouveau fichier", @@ -499,7 +411,7 @@ } }, "dashboard.new-project" : { - "used-in" : [ "src/app/main/ui/dashboard/projects.cljs:35" ], + "used-in" : [ "src/app/main/ui/dashboard/projects.cljs" ], "translations" : { "en" : "+ New project", "fr" : "+ Nouveau projet", @@ -508,7 +420,7 @@ } }, "dashboard.no-matches-for" : { - "used-in" : [ "src/app/main/ui/dashboard/search.cljs:54" ], + "used-in" : [ "src/app/main/ui/dashboard/search.cljs" ], "translations" : { "en" : "No matches found for “%s“", "fr" : "Aucune correspondance pour « %s »", @@ -517,7 +429,7 @@ } }, "dashboard.no-projects-placeholder" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:436" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Pinned projects will appear here", "fr" : "Les projets épinglés apparaîtront ici", @@ -525,7 +437,7 @@ } }, "dashboard.notifications.email-changed-successfully" : { - "used-in" : [ "src/app/main/ui/auth/verify_token.cljs:42" ], + "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ], "translations" : { "en" : "Your email address has been updated successfully", "fr" : "Votre adresse e‑mail a été mise à jour avec succès", @@ -534,7 +446,7 @@ } }, "dashboard.notifications.email-verified-successfully" : { - "used-in" : [ "src/app/main/ui/auth/verify_token.cljs:36" ], + "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ], "translations" : { "en" : "Your email address has been verified successfully", "fr" : "Votre adresse e‑mail a été vérifiée avec succès", @@ -543,7 +455,7 @@ } }, "dashboard.notifications.password-saved" : { - "used-in" : [ "src/app/main/ui/settings/password.cljs:36" ], + "used-in" : [ "src/app/main/ui/settings/password.cljs" ], "translations" : { "en" : "Password saved successfully!", "fr" : "Mot de passe enregistré avec succès !", @@ -552,7 +464,7 @@ } }, "dashboard.num-of-members" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:305" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "%s members", "fr" : "%s membres", @@ -560,7 +472,7 @@ } }, "dashboard.password-change" : { - "used-in" : [ "src/app/main/ui/settings/password.cljs:76" ], + "used-in" : [ "src/app/main/ui/settings/password.cljs" ], "translations" : { "en" : "Change password", "fr" : "Changer le mot de passe", @@ -569,7 +481,7 @@ } }, "dashboard.projects-title" : { - "used-in" : [ "src/app/main/ui/dashboard/projects.cljs:33" ], + "used-in" : [ "src/app/main/ui/dashboard/projects.cljs" ], "translations" : { "en" : "Projects", "fr" : "Projets", @@ -578,7 +490,7 @@ } }, "dashboard.promote-to-owner" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:202" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Promote to owner", "fr" : "Promouvoir propriétaire", @@ -586,7 +498,7 @@ } }, "dashboard.remove-account" : { - "used-in" : [ "src/app/main/ui/settings/profile.cljs:87" ], + "used-in" : [ "src/app/main/ui/settings/profile.cljs" ], "translations" : { "en" : "Want to remove your account?", "fr" : "Vous souhaitez supprimer votre compte ?", @@ -595,7 +507,7 @@ } }, "dashboard.remove-shared" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:226", "src/app/main/ui/dashboard/grid.cljs:181" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { "en" : "Remove as Shared Library", "fr" : "Retirer en tant que Bibliothèque Partagée", @@ -604,7 +516,7 @@ } }, "dashboard.search-placeholder" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:120" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Search…", "fr" : "Rechercher…", @@ -613,7 +525,7 @@ } }, "dashboard.searching-for" : { - "used-in" : [ "src/app/main/ui/dashboard/search.cljs:49" ], + "used-in" : [ "src/app/main/ui/dashboard/search.cljs" ], "translations" : { "en" : "Searching for “%s“…", "fr" : "Recherche de « %s »…", @@ -622,7 +534,7 @@ } }, "dashboard.select-ui-language" : { - "used-in" : [ "src/app/main/ui/settings/options.cljs:61" ], + "used-in" : [ "src/app/main/ui/settings/options.cljs" ], "translations" : { "en" : "Select UI language", "fr" : "Sélectionnez la langue de l’interface", @@ -631,7 +543,7 @@ } }, "dashboard.select-ui-theme" : { - "used-in" : [ "src/app/main/ui/settings/options.cljs:67" ], + "used-in" : [ "src/app/main/ui/settings/options.cljs" ], "translations" : { "en" : "Select theme", "fr" : "Sélectionnez un thème", @@ -640,14 +552,14 @@ } }, "dashboard.show-all-files" : { - "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:262" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { "en" : "Show all files", "fr" : "Voir tous les fichiers", "es" : "Ver todos los ficheros" } }, - "dashboard.sidebar.recent" : { + "labels.recent" : { "translations" : { "en" : "Recent", "fr" : "Récent", @@ -657,7 +569,7 @@ "unused" : true }, "dashboard.switch-team" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:156" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Switch team", "fr" : "Changer d’équipe", @@ -665,7 +577,7 @@ } }, "dashboard.team-info" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:288" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Team info", "fr" : "Information de l’équipe", @@ -673,7 +585,7 @@ } }, "dashboard.team-members" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:299" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Team members", "fr" : "Membres de l’équipe", @@ -681,7 +593,7 @@ } }, "dashboard.team-projects" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:308" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Team projects", "fr" : "Projets de l’équipe", @@ -689,7 +601,7 @@ } }, "dashboard.theme-change" : { - "used-in" : [ "src/app/main/ui/settings/options.cljs:65" ], + "used-in" : [ "src/app/main/ui/settings/options.cljs" ], "translations" : { "en" : "UI theme", "fr" : "Thème de l’interface", @@ -698,7 +610,7 @@ } }, "dashboard.title-search" : { - "used-in" : [ "src/app/main/ui/dashboard/search.cljs:37" ], + "used-in" : [ "src/app/main/ui/dashboard/search.cljs" ], "translations" : { "en" : "Search results", "fr" : "Résultats de recherche", @@ -707,7 +619,7 @@ } }, "dashboard.type-something" : { - "used-in" : [ "src/app/main/ui/dashboard/search.cljs:44" ], + "used-in" : [ "src/app/main/ui/dashboard/search.cljs" ], "translations" : { "en" : "Type to search results", "fr" : "Écrivez pour rechercher", @@ -716,7 +628,7 @@ } }, "dashboard.update-settings" : { - "used-in" : [ "src/app/main/ui/settings/options.cljs:72", "src/app/main/ui/settings/profile.cljs:82", "src/app/main/ui/settings/password.cljs:96" ], + "used-in" : [ "src/app/main/ui/settings/profile.cljs", "src/app/main/ui/settings/password.cljs", "src/app/main/ui/settings/options.cljs" ], "translations" : { "en" : "Update settings", "fr" : "Mettre à jour les paramètres", @@ -725,7 +637,7 @@ } }, "dashboard.your-account-title" : { - "used-in" : [ "src/app/main/ui/settings.cljs:29" ], + "used-in" : [ "src/app/main/ui/settings.cljs" ], "translations" : { "en" : "Your account", "fr" : "Votre compte", @@ -733,7 +645,7 @@ } }, "dashboard.your-email" : { - "used-in" : [ "src/app/main/ui/settings/profile.cljs:74" ], + "used-in" : [ "src/app/main/ui/settings/profile.cljs" ], "translations" : { "en" : "Email", "fr" : "E‑mail", @@ -742,7 +654,7 @@ } }, "dashboard.your-name" : { - "used-in" : [ "src/app/main/ui/settings/profile.cljs:66" ], + "used-in" : [ "src/app/main/ui/settings/profile.cljs" ], "translations" : { "en" : "Your name", "fr" : "Votre nom complet", @@ -751,14 +663,14 @@ } }, "dashboard.your-penpot" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:160" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Your Penpot", "fr" : "Votre Penpot", "es" : "Tu Penpot" } }, - "ds.accept" : { + "labels.accept" : { "translations" : { "en" : "Accept", "fr" : "Accepter", @@ -767,7 +679,7 @@ }, "unused" : true }, - "ds.button.delete" : { + "labels.delete" : { "translations" : { "en" : "Delete", "fr" : "Supprimer", @@ -776,7 +688,7 @@ }, "unused" : true }, - "ds.button.rename" : { + "labels.rename" : { "translations" : { "en" : "Rename", "fr" : "Renommer", @@ -785,7 +697,7 @@ }, "unused" : true }, - "ds.button.save" : { + "labels.save" : { "translations" : { "en" : "Save", "fr" : "Enregistrer", @@ -795,7 +707,7 @@ "unused" : true }, "ds.confirm-cancel" : { - "used-in" : [ "src/app/main/ui/confirm.cljs:39" ], + "used-in" : [ "src/app/main/ui/confirm.cljs" ], "translations" : { "en" : "Cancel", "fr" : "Annuler", @@ -804,7 +716,7 @@ } }, "ds.confirm-ok" : { - "used-in" : [ "src/app/main/ui/confirm.cljs:40" ], + "used-in" : [ "src/app/main/ui/confirm.cljs" ], "translations" : { "en" : "Ok", "fr" : "Ok", @@ -813,7 +725,7 @@ } }, "ds.confirm-title" : { - "used-in" : [ "src/app/main/ui/confirm.cljs:38", "src/app/main/ui/confirm.cljs:42" ], + "used-in" : [ "src/app/main/ui/confirm.cljs", "src/app/main/ui/confirm.cljs" ], "translations" : { "en" : "Are you sure?", "fr" : "Êtes‑vous sûr ?", @@ -822,7 +734,7 @@ } }, "ds.updated-at" : { - "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:59" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { "en" : "Updated: %s", "fr" : "Mise à jour : %s", @@ -830,45 +742,8 @@ "es" : "Actualizado: %s" } }, - - - "errors.google-auth-not-enabled" : { - "translations" : { - "en" : "Authentication with google disabled on backend", - "es" : "Autenticación con google esta dehabilitada en el servidor" - } - }, - - "errors.unexpected-token" : { - "translations" : { - "en" : "Unknown token", - "es" : "Token desconocido" - } - }, - - "errors.profile-is-muted" : { - "translations" : { - "en" : "Your profile has emails muted (spam reports or high bounces).", - "es" : "Tu perfil tiene los emails silenciados (por reportes de spam o alto indice de rebote)." - } - }, - - "errors.member-is-muted" : { - "translations" : { - "en" : "The profile you inviting has emails muted (spam reports or high bounces).", - "es" : "El perfil que esta invitando tiene los emails silenciados (por reportes de spam o alto indice de rebote)." - } - }, - - "errors.email-has-permanent-bounces" : { - "translations" : { - "en" : "The email «%s» has many permanent bounce reports.", - "es" : "El email «%s» tiene varios reportes de rebote permanente." - } - }, - "errors.auth.unauthorized" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs:89" ], + "used-in" : [ "src/app/main/ui/auth/login.cljs" ], "translations" : { "en" : "Username or password seems to be wrong.", "fr" : "Le nom d’utilisateur ou le mot de passe semble être faux.", @@ -877,7 +752,7 @@ } }, "errors.clipboard-not-implemented" : { - "used-in" : [ "src/app/main/data/workspace.cljs:1394" ], + "used-in" : [ "src/app/main/data/workspace.cljs" ], "translations" : { "en" : "Your browser cannot do this operation", "fr" : "Votre navigateur ne peut pas effectuer cette opération", @@ -886,7 +761,7 @@ } }, "errors.email-already-exists" : { - "used-in" : [ "src/app/main/ui/settings/change_email.cljs:47", "src/app/main/ui/auth/verify_token.cljs:80" ], + "used-in" : [ "src/app/main/ui/auth/verify_token.cljs", "src/app/main/ui/settings/change_email.cljs" ], "translations" : { "en" : "Email already used", "fr" : "Adresse e‑mail déjà utilisée", @@ -895,7 +770,7 @@ } }, "errors.email-already-validated" : { - "used-in" : [ "src/app/main/ui/auth/verify_token.cljs:85" ], + "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ], "translations" : { "en" : "Email already validated.", "fr" : "Adresse e‑mail déjà validée.", @@ -903,8 +778,15 @@ "es" : "Este correo ya está validado." } }, + "errors.email-has-permanent-bounces" : { + "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/recovery_request.cljs", "src/app/main/ui/settings/change_email.cljs", "src/app/main/ui/dashboard/team.cljs" ], + "translations" : { + "en" : "The email «%s» has many permanent bounce reports.", + "es" : "El email «%s» tiene varios reportes de rebote permanente." + } + }, "errors.email-invalid-confirmation" : { - "used-in" : [ "src/app/main/ui/settings/change_email.cljs:37" ], + "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ], "translations" : { "en" : "Confirmation email must match", "fr" : "L’adresse e‑mail de confirmation doit correspondre", @@ -913,7 +795,7 @@ } }, "errors.generic" : { - "used-in" : [ "src/app/main/ui/settings/options.cljs:32", "src/app/main/ui/settings/profile.cljs:42", "src/app/main/ui/auth/verify_token.cljs:89" ], + "used-in" : [ "src/app/main/ui/auth/verify_token.cljs", "src/app/main/ui/settings/profile.cljs", "src/app/main/ui/settings/feedback.cljs", "src/app/main/ui/settings/feedback.cljs", "src/app/main/ui/settings/options.cljs", "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Something wrong has happened.", "fr" : "Un problème s’est produit.", @@ -921,17 +803,24 @@ "es" : "Ha ocurrido algún error." } }, + "errors.google-auth-not-enabled" : { + "used-in" : [ "src/app/main/ui/auth/login.cljs" ], + "translations" : { + "en" : "Authentication with google disabled on backend", + "es" : "Autenticación con google esta dehabilitada en el servidor" + } + }, "errors.media-format-unsupported" : { - "used-in" : [ "src/app/main/data/media.cljs:55" ], "translations" : { "en" : "The image format is not supported (must be svg, jpg or png).", "fr" : "Le format d’image n’est pas supporté (doit être svg, jpg ou png).", "ru" : "Формат изображения не поддерживается (должен быть svg, jpg или png).", "es" : "No se reconoce el formato de imagen (debe ser svg, jpg o png)." - } + }, + "unused" : true }, "errors.media-too-large" : { - "used-in" : [ "src/app/main/data/media.cljs:53" ], + "used-in" : [ "src/app/main/data/workspace/persistence.cljs" ], "translations" : { "en" : "The image is too large to be inserted (must be under 5mb).", "fr" : "L’image est trop grande (doit être inférieure à 5 Mo).", @@ -940,7 +829,7 @@ } }, "errors.media-type-mismatch" : { - "used-in" : [ "src/app/main/data/media.cljs:78", "src/app/main/data/workspace/persistence.cljs:426" ], + "used-in" : [ "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/media.cljs" ], "translations" : { "en" : "Seems that the contents of the image does not match the file extension.", "fr" : "Il semble que le contenu de l’image ne correspond pas à l’extension de fichier.", @@ -949,7 +838,7 @@ } }, "errors.media-type-not-allowed" : { - "used-in" : [ "src/app/main/data/media.cljs:75", "src/app/main/data/workspace/persistence.cljs:423" ], + "used-in" : [ "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/media.cljs" ], "translations" : { "en" : "Seems that this is not a valid image.", "fr" : "L’image ne semble pas être valide.", @@ -957,6 +846,13 @@ "es" : "Parece que no es una imagen válida." } }, + "errors.member-is-muted" : { + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], + "translations" : { + "en" : "The profile you inviting has emails muted (spam reports or high bounces).", + "es" : "El perfil que esta invitando tiene los emails silenciados (por reportes de spam o alto indice de rebote)." + } + }, "errors.network" : { "translations" : { "en" : "Unable to connect to backend server.", @@ -967,7 +863,7 @@ "unused" : true }, "errors.password-invalid-confirmation" : { - "used-in" : [ "src/app/main/ui/settings/password.cljs:58" ], + "used-in" : [ "src/app/main/ui/settings/password.cljs" ], "translations" : { "en" : "Confirmation password must match", "fr" : "Le mot de passe de confirmation doit correspondre", @@ -976,7 +872,7 @@ } }, "errors.password-too-short" : { - "used-in" : [ "src/app/main/ui/settings/password.cljs:61" ], + "used-in" : [ "src/app/main/ui/settings/password.cljs" ], "translations" : { "en" : "Password should at least be 8 characters", "fr" : "Le mot de passe doit contenir au moins 8 caractères", @@ -984,8 +880,15 @@ "es" : "La contraseña debe tener 8 caracteres como mínimo" } }, + "errors.profile-is-muted" : { + "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs", "src/app/main/ui/settings/change_email.cljs", "src/app/main/ui/dashboard/team.cljs" ], + "translations" : { + "en" : "Your profile has emails muted (spam reports or high bounces).", + "es" : "Tu perfil tiene los emails silenciados (por reportes de spam o alto indice de rebote)." + } + }, "errors.registration-disabled" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs:39" ], + "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { "en" : "The registration is currently disabled.", "fr" : "L’enregistrement est actuellement désactivé.", @@ -994,7 +897,7 @@ } }, "errors.unexpected-error" : { - "used-in" : [ "src/app/main/data/media.cljs:81", "src/app/main/ui/auth/register.cljs:45", "src/app/main/ui/workspace/sidebar/options/exports.cljs:75", "src/app/main/ui/handoff/exports.cljs:41" ], + "used-in" : [ "src/app/main/data/media.cljs", "src/app/main/ui/workspace/sidebar/options/exports.cljs", "src/app/main/ui/handoff/exports.cljs" ], "translations" : { "en" : "An unexpected error occurred.", "fr" : "Une erreur inattendue s’est produite", @@ -1002,8 +905,15 @@ "es" : "Ha ocurrido un error inesperado." } }, + "errors.unexpected-token" : { + "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ], + "translations" : { + "en" : "Unknown token", + "es" : "Token desconocido" + } + }, "errors.wrong-old-password" : { - "used-in" : [ "src/app/main/ui/settings/password.cljs:28" ], + "used-in" : [ "src/app/main/ui/settings/password.cljs" ], "translations" : { "en" : "Old password is incorrect", "fr" : "L’ancien mot de passe est incorrect", @@ -1012,70 +922,70 @@ } }, "feedback.chat-start" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs:112" ], + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Join the chat", "es" : "Unirse al chat" } }, "feedback.chat-subtitle" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs:109" ], + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Feeling like talking? Chat with us at Gitter", "es" : "¿Deseas conversar? Entra al nuestro chat de la comunidad en Gitter" } }, "feedback.description" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs:88" ], + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Description", "es" : "Descripción" } }, "feedback.discussions-go-to" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs:104" ], + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Go to discussions", "es" : "Ir a las discussiones" } }, "feedback.discussions-subtitle1" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs:99" ], + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Join Penpot team collaborative communication forum.", "es" : "Entra al foro colaborativo de Penpot" } }, "feedback.discussions-subtitle2" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs:100" ], + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "You can ask and answer questions, have open-ended conversations, and follow along on decisions affecting the project.", "es" : "" } }, "feedback.discussions-title" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs:98" ], + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Team discussions", "es" : "" } }, "feedback.subject" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs:84" ], + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Subject", "es" : "Asunto" } }, "feedback.subtitle" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs:81" ], + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Please describe the reason of your email, specifying if is an issue, an idea or a doubt. A member of our team will respond as soon as possible.", "es" : "" } }, "feedback.title" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs:80" ], + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Email", "fr" : "Adresse email", @@ -1084,7 +994,7 @@ } }, "generic.error" : { - "used-in" : [ "src/app/main/ui/settings/password.cljs:31" ], + "used-in" : [ "src/app/main/ui/settings/password.cljs" ], "translations" : { "en" : "An error has occurred", "fr" : "Une erreur s’est produite", @@ -1093,7 +1003,7 @@ } }, "handoff.attributes.blur" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/blur.cljs:34" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/blur.cljs" ], "translations" : { "en" : "Blur", "fr" : "Flou", @@ -1101,7 +1011,7 @@ } }, "handoff.attributes.blur.value" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/blur.cljs:40" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/blur.cljs" ], "translations" : { "en" : "Value", "fr" : "Valeur", @@ -1109,7 +1019,7 @@ } }, "handoff.attributes.color.hex" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/common.cljs:70" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/common.cljs" ], "translations" : { "en" : "HEX", "fr" : "HEX", @@ -1117,7 +1027,7 @@ } }, "handoff.attributes.color.hsla" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/common.cljs:76" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/common.cljs" ], "translations" : { "en" : "HSLA", "fr" : "HSLA", @@ -1125,14 +1035,14 @@ } }, "handoff.attributes.color.rgba" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/common.cljs:73" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/common.cljs" ], "translations" : { "en" : "RGBA", "fr" : "RGBA", "es" : "RGBA" } }, - "handoff.attributes.content" : { + "labels.content" : { "translations" : { "en" : "Content", "fr" : "Contenu", @@ -1141,7 +1051,7 @@ "unused" : true }, "handoff.attributes.fill" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/fill.cljs:57" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/fill.cljs" ], "translations" : { "en" : "Fill", "fr" : "Remplir", @@ -1149,7 +1059,7 @@ } }, "handoff.attributes.image.download" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/image.cljs:50" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/image.cljs" ], "translations" : { "en" : "Download source image", "fr" : "Télécharger l’image source", @@ -1157,7 +1067,7 @@ } }, "handoff.attributes.image.height" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/image.cljs:38" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/image.cljs" ], "translations" : { "en" : "Height", "fr" : "Hauteur", @@ -1165,7 +1075,7 @@ } }, "handoff.attributes.image.width" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/image.cljs:33" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/image.cljs" ], "translations" : { "en" : "Width", "fr" : "Largeur", @@ -1173,7 +1083,7 @@ } }, "handoff.attributes.layout" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs:76" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ], "translations" : { "en" : "Layout", "fr" : "Mise en page", @@ -1181,7 +1091,7 @@ } }, "handoff.attributes.layout.height" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs:43" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ], "translations" : { "en" : "Height", "fr" : "Hauteur", @@ -1189,7 +1099,7 @@ } }, "handoff.attributes.layout.left" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs:49" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ], "translations" : { "en" : "Left", "fr" : "Gauche", @@ -1197,7 +1107,7 @@ } }, "handoff.attributes.layout.radius" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs:61" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ], "translations" : { "en" : "Radius", "fr" : "Rayon", @@ -1205,7 +1115,7 @@ } }, "handoff.attributes.layout.rotation" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs:67" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ], "translations" : { "en" : "Rotation", "fr" : "Rotation", @@ -1213,7 +1123,7 @@ } }, "handoff.attributes.layout.top" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs:55" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ], "translations" : { "en" : "Top", "fr" : "Haut", @@ -1221,7 +1131,7 @@ } }, "handoff.attributes.layout.width" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs:38" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ], "translations" : { "en" : "Width", "fr" : "Largeur", @@ -1229,7 +1139,7 @@ } }, "handoff.attributes.shadow" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs:71" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ], "translations" : { "en" : "Shadow", "fr" : "Ombre", @@ -1237,7 +1147,7 @@ } }, "handoff.attributes.shadow.shorthand.blur" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs:53" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ], "translations" : { "en" : "B", "fr" : "B", @@ -1245,7 +1155,7 @@ } }, "handoff.attributes.shadow.shorthand.offset-x" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs:45" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ], "translations" : { "en" : "X", "fr" : "X", @@ -1253,7 +1163,7 @@ } }, "handoff.attributes.shadow.shorthand.offset-y" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs:49" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ], "translations" : { "en" : "Y", "fr" : "Y", @@ -1261,38 +1171,22 @@ } }, "handoff.attributes.shadow.shorthand.spread" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs:57" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ], "translations" : { "en" : "S", "fr" : "S", "es" : "S" } }, - "handoff.attributes.shadow.style.drop-shadow" : { - "translations" : { - "en" : "Drop", - "fr" : "Portée", - "es" : "Arrojar" - }, - "unused" : true - }, - "handoff.attributes.shadow.style.inner-shadow" : { - "translations" : { - "en" : "Inner", - "fr" : "Interne", - "es" : "Interna" - }, - "unused" : true - }, "handoff.attributes.stroke" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/stroke.cljs:75" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/stroke.cljs" ], "translations" : { "en" : "Stroke", "fr" : "Contour", "es" : "Borde" } }, - "handoff.attributes.stroke.alignment.center" : { + "labels.centered" : { "translations" : { "en" : "Center", "fr" : "Centré", @@ -1300,30 +1194,6 @@ }, "unused" : true }, - "handoff.attributes.stroke.alignment.inner" : { - "translations" : { - "en" : "Inner", - "fr" : "Intérieur", - "es" : "Interno" - }, - "unused" : true - }, - "handoff.attributes.stroke.alignment.outer" : { - "translations" : { - "en" : "Outer", - "fr" : "Extérieur", - "es" : "Externo" - }, - "unused" : true - }, - "handoff.attributes.stroke.style.dashed" : { - "translations" : { - "en" : "Dashed", - "fr" : "Tirets", - "es" : "Discontinuo" - }, - "unused" : true - }, "handoff.attributes.stroke.style.dotted" : { "translations" : { "en" : "Dotted", @@ -1357,7 +1227,7 @@ "unused" : true }, "handoff.attributes.stroke.width" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/stroke.cljs:63" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/stroke.cljs" ], "translations" : { "en" : "Width", "fr" : "Épaisseur", @@ -1365,7 +1235,7 @@ } }, "handoff.attributes.typography" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs:189" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ], "translations" : { "en" : "Typography", "fr" : "Typographie", @@ -1373,7 +1243,7 @@ } }, "handoff.attributes.typography.font-family" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs:120" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ], "translations" : { "en" : "Font Family", "fr" : "Police de caractères", @@ -1381,7 +1251,7 @@ } }, "handoff.attributes.typography.font-size" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs:132" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ], "translations" : { "en" : "Font Size", "fr" : "Taille de police", @@ -1389,7 +1259,7 @@ } }, "handoff.attributes.typography.font-style" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs:126" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ], "translations" : { "en" : "Font Style", "fr" : "Style de police", @@ -1397,7 +1267,7 @@ } }, "handoff.attributes.typography.letter-spacing" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs:144" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ], "translations" : { "en" : "Letter Spacing", "fr" : "Interlettrage", @@ -1405,7 +1275,7 @@ } }, "handoff.attributes.typography.line-height" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs:138" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ], "translations" : { "en" : "Line Height", "fr" : "Interlignage", @@ -1413,7 +1283,7 @@ } }, "handoff.attributes.typography.text-decoration" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs:150" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ], "translations" : { "en" : "Text Decoration", "fr" : "Décoration de texte", @@ -1445,7 +1315,7 @@ "unused" : true }, "handoff.attributes.typography.text-transform" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs:156" ], + "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ], "translations" : { "en" : "Text Transform", "fr" : "Transformation de texte", @@ -1485,7 +1355,7 @@ "unused" : true }, "handoff.tabs.code" : { - "used-in" : [ "src/app/main/ui/handoff/right_sidebar.cljs:65" ], + "used-in" : [ "src/app/main/ui/handoff/right_sidebar.cljs" ], "translations" : { "en" : "Code", "fr" : "Code", @@ -1533,7 +1403,7 @@ "unused" : true }, "handoff.tabs.code.selected.multiple" : { - "used-in" : [ "src/app/main/ui/handoff/right_sidebar.cljs:48" ], + "used-in" : [ "src/app/main/ui/handoff/right_sidebar.cljs" ], "translations" : { "en" : "%s Selected", "fr" : "%s Sélectionné", @@ -1573,7 +1443,7 @@ "unused" : true }, "handoff.tabs.info" : { - "used-in" : [ "src/app/main/ui/handoff/right_sidebar.cljs:59" ], + "used-in" : [ "src/app/main/ui/handoff/right_sidebar.cljs" ], "translations" : { "en" : "Info", "fr" : "Information", @@ -1590,7 +1460,7 @@ "unused" : true }, "labels.admin" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:85", "src/app/main/ui/dashboard/team.cljs:178", "src/app/main/ui/dashboard/team.cljs:194" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Admin", "fr" : "Administration", @@ -1598,7 +1468,7 @@ } }, "labels.all" : { - "used-in" : [ "src/app/main/ui/workspace/comments.cljs:161" ], + "used-in" : [ "src/app/main/ui/workspace/comments.cljs" ], "translations" : { "en" : "All", "fr" : "Tous", @@ -1606,7 +1476,7 @@ } }, "labels.bad-gateway.desc-message" : { - "used-in" : [ "src/app/main/ui/static.cljs:58" ], + "used-in" : [ "src/app/main/ui/static.cljs" ], "translations" : { "en" : "Looks like you need to wait a bit and retry; we are performing small maintenance of our servers.", "fr" : "Il semble que vous deviez attendre un peu et réessayer ; nous effectuons une petite maintenance de nos serveurs.", @@ -1614,7 +1484,7 @@ } }, "labels.bad-gateway.main-message" : { - "used-in" : [ "src/app/main/ui/static.cljs:57" ], + "used-in" : [ "src/app/main/ui/static.cljs" ], "translations" : { "en" : "Bad Gateway", "fr" : "Bad Gateway", @@ -1622,7 +1492,7 @@ } }, "labels.cancel" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:215" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Cancel", "fr" : "Annuler", @@ -1631,7 +1501,7 @@ } }, "labels.comments" : { - "used-in" : [ "src/app/main/ui/dashboard/comments.cljs:71" ], + "used-in" : [ "src/app/main/ui/dashboard/comments.cljs" ], "translations" : { "en" : "Comments", "fr" : "Commentaires", @@ -1639,7 +1509,7 @@ } }, "labels.confirm-password" : { - "used-in" : [ "src/app/main/ui/settings/password.cljs:93" ], + "used-in" : [ "src/app/main/ui/settings/password.cljs" ], "translations" : { "en" : "Confirm password", "fr" : "Confirmer le mot de passe", @@ -1647,8 +1517,15 @@ "es" : "Confirmar contraseña" } }, + "labels.create-team" : { + "used-in" : [ "src/app/main/ui/dashboard/team_form.cljs", "src/app/main/ui/dashboard/team_form.cljs" ], + "translations" : { + "en" : "Create new team", + "es" : "Crea un nuevo equipo" + } + }, "labels.dashboard" : { - "used-in" : [ "src/app/main/ui/settings/sidebar.cljs:62" ], + "used-in" : [ "src/app/main/ui/settings/sidebar.cljs" ], "translations" : { "en" : "Dashboard", "fr" : "Tableau de bord", @@ -1656,7 +1533,7 @@ } }, "labels.delete" : { - "used-in" : [ "src/app/main/ui/dashboard/files.cljs:85", "src/app/main/ui/dashboard/grid.cljs:179" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs", "src/app/main/ui/dashboard/files.cljs" ], "translations" : { "en" : "Delete", "fr" : "Supprimer", @@ -1665,7 +1542,7 @@ } }, "labels.delete-comment" : { - "used-in" : [ "src/app/main/ui/comments.cljs:278" ], + "used-in" : [ "src/app/main/ui/comments.cljs" ], "translations" : { "en" : "Delete comment", "fr" : "Supprimer le commentaire", @@ -1673,7 +1550,7 @@ } }, "labels.delete-comment-thread" : { - "used-in" : [ "src/app/main/ui/comments.cljs:277" ], + "used-in" : [ "src/app/main/ui/comments.cljs" ], "translations" : { "en" : "Delete thread", "fr" : "Supprimer le fil", @@ -1681,7 +1558,7 @@ } }, "labels.drafts" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:416" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Drafts", "fr" : "Brouillons", @@ -1690,7 +1567,7 @@ } }, "labels.edit" : { - "used-in" : [ "src/app/main/ui/comments.cljs:275" ], + "used-in" : [ "src/app/main/ui/comments.cljs" ], "translations" : { "en" : "Edit", "fr" : "Modifier", @@ -1698,7 +1575,7 @@ } }, "labels.editor" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:86", "src/app/main/ui/dashboard/team.cljs:181", "src/app/main/ui/dashboard/team.cljs:195" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Editor", "fr" : "Éditeur", @@ -1706,7 +1583,7 @@ } }, "labels.email" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:116", "src/app/main/ui/dashboard/team.cljs:221" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Email", "fr" : "Adresse e‑mail", @@ -1714,8 +1591,22 @@ "es" : "Correo electrónico" } }, + "labels.feedback-disabled" : { + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], + "translations" : { + "en" : "Feedback disabled", + "es" : "El modulo de recepción de opiniones esta deshabilitado." + } + }, + "labels.feedback-sent" : { + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], + "translations" : { + "en" : "Feedback sent", + "es" : "Opinión enviada" + } + }, "labels.give-feedback" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:231", "src/app/main/ui/dashboard/sidebar.cljs:471" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/settings/sidebar.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Give feedback", "fr" : "Donnez votre avis", @@ -1724,7 +1615,7 @@ } }, "labels.hide-resolved-comments" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs:176", "src/app/main/ui/workspace/comments.cljs:129" ], + "used-in" : [ "src/app/main/ui/workspace/comments.cljs", "src/app/main/ui/viewer/header.cljs" ], "translations" : { "en" : "Hide resolved comments", "fr" : "Masquer les commentaires résolus", @@ -1732,7 +1623,7 @@ } }, "labels.internal-error.desc-message" : { - "used-in" : [ "src/app/main/ui/static.cljs:92" ], + "used-in" : [ "src/app/main/ui/static.cljs" ], "translations" : { "en" : "Something bad happened. Please retry the operation and if the problem persists, contact with support.", "fr" : "Un problème s’est produit. Veuillez réessayer l’opération et, si le problème persiste, contacter le service technique.", @@ -1740,7 +1631,7 @@ } }, "labels.internal-error.main-message" : { - "used-in" : [ "src/app/main/ui/static.cljs:91" ], + "used-in" : [ "src/app/main/ui/static.cljs" ], "translations" : { "en" : "Internal Error", "fr" : "Erreur interne", @@ -1748,7 +1639,7 @@ } }, "labels.language" : { - "used-in" : [ "src/app/main/ui/settings/options.cljs:54" ], + "used-in" : [ "src/app/main/ui/settings/options.cljs" ], "translations" : { "en" : "Language", "fr" : "Langue", @@ -1757,7 +1648,7 @@ } }, "labels.logout" : { - "used-in" : [ "src/app/main/ui/settings.cljs:31", "src/app/main/ui/dashboard/sidebar.cljs:468" ], + "used-in" : [ "src/app/main/ui/settings.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Logout", "fr" : "Se déconnecter", @@ -1766,7 +1657,7 @@ } }, "labels.members" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:311", "src/app/main/ui/dashboard/team.cljs:60", "src/app/main/ui/dashboard/team.cljs:66" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Members", "fr" : "Membres", @@ -1774,7 +1665,7 @@ } }, "labels.name" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:220" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Name", "fr" : "Nom", @@ -1783,7 +1674,7 @@ } }, "labels.new-password" : { - "used-in" : [ "src/app/main/ui/settings/password.cljs:87" ], + "used-in" : [ "src/app/main/ui/settings/password.cljs" ], "translations" : { "en" : "New password", "fr" : "Nouveau mot de passe", @@ -1792,7 +1683,7 @@ } }, "labels.no-comments-available" : { - "used-in" : [ "src/app/main/ui/workspace/comments.cljs:186", "src/app/main/ui/dashboard/comments.cljs:96" ], + "used-in" : [ "src/app/main/ui/workspace/comments.cljs", "src/app/main/ui/dashboard/comments.cljs" ], "translations" : { "en" : "You have no pending comment notifications", "fr" : "Vous n’avez aucune notification de commentaire en attente", @@ -1800,7 +1691,7 @@ } }, "labels.not-found.auth-info" : { - "used-in" : [ "src/app/main/ui/static.cljs:42" ], + "used-in" : [ "src/app/main/ui/static.cljs" ], "translations" : { "en" : "You’re signed in as", "fr" : "Vous êtes connecté en tant que", @@ -1808,7 +1699,7 @@ } }, "labels.not-found.desc-message" : { - "used-in" : [ "src/app/main/ui/static.cljs:40" ], + "used-in" : [ "src/app/main/ui/static.cljs" ], "translations" : { "en" : "This page might not exist or you don’t have permissions to access to it.", "fr" : "Cette page n’existe pas ou vous ne disposez pas des permissions nécessaires pour y accéder.", @@ -1816,7 +1707,7 @@ } }, "labels.not-found.main-message" : { - "used-in" : [ "src/app/main/ui/static.cljs:39" ], + "used-in" : [ "src/app/main/ui/static.cljs" ], "translations" : { "en" : "Oops!", "fr" : "Oups !", @@ -1824,7 +1715,7 @@ } }, "labels.num-of-files" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:314" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : [ "1 file", "%s files" ], "fr" : [ "1 fichier", "%s fichiers" ], @@ -1832,7 +1723,7 @@ } }, "labels.num-of-projects" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:311" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : [ "1 project", "%s projects" ], "fr" : [ "1 projet", "%s projets" ], @@ -1840,7 +1731,7 @@ } }, "labels.old-password" : { - "used-in" : [ "src/app/main/ui/settings/password.cljs:81" ], + "used-in" : [ "src/app/main/ui/settings/password.cljs" ], "translations" : { "en" : "Old password", "fr" : "Ancien mot de passe", @@ -1849,7 +1740,7 @@ } }, "labels.only-yours" : { - "used-in" : [ "src/app/main/ui/workspace/comments.cljs:162" ], + "used-in" : [ "src/app/main/ui/workspace/comments.cljs" ], "translations" : { "en" : "Only yours", "fr" : "Seulement les vôtres", @@ -1857,7 +1748,7 @@ } }, "labels.owner" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:175", "src/app/main/ui/dashboard/team.cljs:302" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Owner", "fr" : "Propriétaire", @@ -1865,7 +1756,7 @@ } }, "labels.password" : { - "used-in" : [ "src/app/main/ui/settings/sidebar.cljs:75", "src/app/main/ui/dashboard/sidebar.cljs:465" ], + "used-in" : [ "src/app/main/ui/settings/sidebar.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Password", "fr" : "Mot de passe", @@ -1874,7 +1765,7 @@ } }, "labels.permissions" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:222" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Permissions", "fr" : "Permissions", @@ -1882,7 +1773,7 @@ } }, "labels.profile" : { - "used-in" : [ "src/app/main/ui/settings/sidebar.cljs:70", "src/app/main/ui/dashboard/sidebar.cljs:462" ], + "used-in" : [ "src/app/main/ui/settings/sidebar.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Profile", "fr" : "Profil", @@ -1891,7 +1782,7 @@ } }, "labels.projects" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:412" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Projects", "fr" : "Projets", @@ -1900,7 +1791,7 @@ } }, "labels.remove" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:92", "src/app/main/ui/dashboard/team.cljs:208" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs", "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Remove", "fr" : "Retirer", @@ -1908,36 +1799,23 @@ "es" : "Quitar" } }, - "labels.create-team": { - "translations" : { - "en" : "Create new team", - "es" : "Crea un nuevo equipo" - } - }, - - "labels.update-team": { - "translations" : { - "en" : "Update team", - "es" : "Actualiza el equipo" - } - }, - "labels.rename-team": { - "translations" : { - "en" : "Rename team", - "es" : "Renomba el equipo" - } - }, - "labels.rename" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:314", "src/app/main/ui/dashboard/files.cljs:84", "src/app/main/ui/dashboard/grid.cljs:178" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs", "src/app/main/ui/dashboard/sidebar.cljs", "src/app/main/ui/dashboard/files.cljs" ], "translations" : { "en" : "Rename", "fr" : "Renommer", "es" : "Renombrar" } }, + "labels.rename-team" : { + "used-in" : [ "src/app/main/ui/dashboard/team_form.cljs" ], + "translations" : { + "en" : "Rename team", + "es" : "Renomba el equipo" + } + }, "labels.retry" : { - "used-in" : [ "src/app/main/ui/static.cljs:62", "src/app/main/ui/static.cljs:79", "src/app/main/ui/static.cljs:96" ], + "used-in" : [ "src/app/main/ui/static.cljs", "src/app/main/ui/static.cljs", "src/app/main/ui/static.cljs" ], "translations" : { "en" : "Retry", "fr" : "Réessayer", @@ -1945,7 +1823,7 @@ } }, "labels.role" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:84" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Role", "fr" : "Rôle", @@ -1953,38 +1831,21 @@ } }, "labels.send" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs:93" ], + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Send", "es" : "Enviar" } }, "labels.sending" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs:93" ], + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Sending...", "es" : "Enviando..." } }, - - "labels.feedback-disabled" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], - "translations" : { - "en" : "Feedback disabled", - "es" : "El modulo de recepción de opiniones esta deshabilitado." - } - }, - - "labels.feedback-sent" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], - "translations" : { - "en" : "Feedback sent", - "es" : "Opinión enviada" - } - }, - "labels.service-unavailable.desc-message" : { - "used-in" : [ "src/app/main/ui/static.cljs:75" ], + "used-in" : [ "src/app/main/ui/static.cljs" ], "translations" : { "en" : "We are in programmed maintenance of our systems.", "fr" : "Nous sommes en maintenance planifiée de nos systèmes.", @@ -1992,7 +1853,7 @@ } }, "labels.service-unavailable.main-message" : { - "used-in" : [ "src/app/main/ui/static.cljs:74" ], + "used-in" : [ "src/app/main/ui/static.cljs" ], "translations" : { "en" : "Service Unavailable", "fr" : "Service non disponible", @@ -2000,7 +1861,7 @@ } }, "labels.settings" : { - "used-in" : [ "src/app/main/ui/settings/sidebar.cljs:80", "src/app/main/ui/dashboard/sidebar.cljs:312", "src/app/main/ui/dashboard/team.cljs:61", "src/app/main/ui/dashboard/team.cljs:68" ], + "used-in" : [ "src/app/main/ui/settings/sidebar.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Settings", "fr" : "Configuration", @@ -2009,7 +1870,7 @@ } }, "labels.shared-libraries" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:421" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Shared Libraries", "fr" : "Bibliothèques Partagées", @@ -2018,7 +1879,7 @@ } }, "labels.show-all-comments" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs:164", "src/app/main/ui/workspace/comments.cljs:117" ], + "used-in" : [ "src/app/main/ui/workspace/comments.cljs", "src/app/main/ui/viewer/header.cljs" ], "translations" : { "en" : "Show all comments", "fr" : "Afficher tous les commentaires", @@ -2026,7 +1887,7 @@ } }, "labels.show-your-comments" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs:169", "src/app/main/ui/workspace/comments.cljs:122" ], + "used-in" : [ "src/app/main/ui/workspace/comments.cljs", "src/app/main/ui/viewer/header.cljs" ], "translations" : { "en" : "Show only yours comments", "fr" : "Afficher uniquement vos commentaires", @@ -2034,7 +1895,7 @@ } }, "labels.sign-out" : { - "used-in" : [ "src/app/main/ui/static.cljs:45" ], + "used-in" : [ "src/app/main/ui/static.cljs" ], "translations" : { "en" : "Sign out", "fr" : "Se déconnecter", @@ -2043,7 +1904,7 @@ } }, "labels.update" : { - "used-in" : [ "src/app/main/ui/settings/profile.cljs:104" ], + "used-in" : [ "src/app/main/ui/settings/profile.cljs" ], "translations" : { "en" : "Update", "fr" : "Actualiser", @@ -2051,8 +1912,15 @@ "es" : "Actualizar" } }, + "labels.update-team" : { + "used-in" : [ "src/app/main/ui/dashboard/team_form.cljs" ], + "translations" : { + "en" : "Update team", + "es" : "Actualiza el equipo" + } + }, "labels.viewer" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:184" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Viewer", "fr" : "Spectateur", @@ -2060,7 +1928,7 @@ } }, "labels.write-new-comment" : { - "used-in" : [ "src/app/main/ui/comments.cljs:154" ], + "used-in" : [ "src/app/main/ui/comments.cljs" ], "translations" : { "en" : "Write new comment", "fr" : "Écrire un nouveau commentaire", @@ -2068,7 +1936,7 @@ } }, "media.loading" : { - "used-in" : [ "src/app/main/data/media.cljs:60", "src/app/main/data/workspace/persistence.cljs:504", "src/app/main/data/workspace/persistence.cljs:559" ], + "used-in" : [ "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/media.cljs" ], "translations" : { "en" : "Loading image…", "fr" : "Chargement de l’image…", @@ -2076,17 +1944,8 @@ "es" : "Cargando imagen…" } }, - "modal.create-color.new-color" : { - "translations" : { - "en" : "New Color", - "fr" : "Nouvelle couleur", - "ru" : "Новый цвет", - "es" : "Nuevo color" - }, - "unused" : true - }, "modals.add-shared-confirm.accept" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:114", "src/app/main/ui/dashboard/grid.cljs:116" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { "en" : "Add as Shared Library", "fr" : "Ajouter comme Bibliothèque Partagée", @@ -2095,7 +1954,7 @@ } }, "modals.add-shared-confirm.hint" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:112", "src/app/main/ui/dashboard/grid.cljs:114" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { "en" : "Once added as Shared Library, the assets of this file library will be available to be used among the rest of your files.", "fr" : "Une fois ajoutées en tant que Bibliothèque Partagée, les ressources de cette bibliothèque de fichiers seront disponibles pour être utilisées parmi le reste de vos fichiers.", @@ -2104,7 +1963,7 @@ } }, "modals.add-shared-confirm.message" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:111", "src/app/main/ui/dashboard/grid.cljs:113" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { "en" : "Add “%s” as Shared Library", "fr" : "Ajouter « %s » comme Bibliothèque Partagée", @@ -2113,7 +1972,7 @@ } }, "modals.change-email.confirm-email" : { - "used-in" : [ "src/app/main/ui/settings/change_email.cljs:103" ], + "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ], "translations" : { "en" : "Verify new email", "fr" : "Vérifier la nouvelle adresse e‑mail", @@ -2122,7 +1981,7 @@ } }, "modals.change-email.info" : { - "used-in" : [ "src/app/main/ui/settings/change_email.cljs:93" ], + "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ], "translations" : { "en" : "We'll send you an email to your current email “%s” to verify your identity.", "fr" : "Nous enverrons un e‑mail à votre adresse actuelle « %s » pour vérifier votre identité.", @@ -2131,7 +1990,7 @@ } }, "modals.change-email.new-email" : { - "used-in" : [ "src/app/main/ui/settings/change_email.cljs:98" ], + "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ], "translations" : { "en" : "New email", "fr" : "Nouvel e‑mail", @@ -2140,7 +1999,7 @@ } }, "modals.change-email.submit" : { - "used-in" : [ "src/app/main/ui/settings/change_email.cljs:109" ], + "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ], "translations" : { "en" : "Change email", "fr" : "Changer adresse e‑mail", @@ -2149,7 +2008,7 @@ } }, "modals.change-email.title" : { - "used-in" : [ "src/app/main/ui/settings/change_email.cljs:86" ], + "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ], "translations" : { "en" : "Change your email", "fr" : "Changez votre adresse e‑mail", @@ -2158,7 +2017,7 @@ } }, "modals.delete-account.cancel" : { - "used-in" : [ "src/app/main/ui/settings/delete_account.cljs:69" ], + "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ], "translations" : { "en" : "Cancel and keep my account", "fr" : "Annuler et conserver mon compte", @@ -2167,7 +2026,7 @@ } }, "modals.delete-account.confirm" : { - "used-in" : [ "src/app/main/ui/settings/delete_account.cljs:67" ], + "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ], "translations" : { "en" : "Yes, delete my account", "fr" : "Oui, supprimer mon compte", @@ -2176,7 +2035,7 @@ } }, "modals.delete-account.info" : { - "used-in" : [ "src/app/main/ui/settings/delete_account.cljs:62" ], + "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ], "translations" : { "en" : "By removing your account you’ll lose all your current projects and archives.", "fr" : "En supprimant votre compte, vous perdrez tous vos projets et archives actuelles.", @@ -2185,7 +2044,7 @@ } }, "modals.delete-account.title" : { - "used-in" : [ "src/app/main/ui/settings/delete_account.cljs:55" ], + "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ], "translations" : { "en" : "Are you sure you want to delete your account?", "fr" : "Êtes‑vous sûr de vouloir supprimer votre compte ?", @@ -2194,7 +2053,7 @@ } }, "modals.delete-comment-thread.accept" : { - "used-in" : [ "src/app/main/ui/comments.cljs:227" ], + "used-in" : [ "src/app/main/ui/comments.cljs" ], "translations" : { "en" : "Delete conversation", "fr" : "Supprimer la conversation", @@ -2202,7 +2061,7 @@ } }, "modals.delete-comment-thread.message" : { - "used-in" : [ "src/app/main/ui/comments.cljs:226" ], + "used-in" : [ "src/app/main/ui/comments.cljs" ], "translations" : { "en" : "Are you sure you want to delete this conversation? All comments in this thread will be deleted.", "fr" : "Êtes‑vous sûr de vouloir supprimer cette conversation ? Tous les commentaires de ce fil seront supprimés.", @@ -2210,7 +2069,7 @@ } }, "modals.delete-comment-thread.title" : { - "used-in" : [ "src/app/main/ui/comments.cljs:225" ], + "used-in" : [ "src/app/main/ui/comments.cljs" ], "translations" : { "en" : "Delete conversation", "fr" : "Supprimer une conversation", @@ -2218,7 +2077,7 @@ } }, "modals.delete-file-confirm.accept" : { - "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:82" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { "en" : "Delete file", "fr" : "Supprimer le fichier", @@ -2226,7 +2085,7 @@ } }, "modals.delete-file-confirm.message" : { - "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:81" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { "en" : "Are you sure you want to delete this file?", "fr" : "Êtes‑vous sûr de vouloir supprimer ce fichier ?", @@ -2234,7 +2093,7 @@ } }, "modals.delete-file-confirm.title" : { - "used-in" : [ "src/app/main/ui/dashboard/grid.cljs:80" ], + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { "en" : "Deleting file", "fr" : "Supprimer un fichier", @@ -2242,7 +2101,7 @@ } }, "modals.delete-page.body" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs:60" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs" ], "translations" : { "en" : "Are you sure you want to delete this page?", "fr" : "Êtes‑vous sûr de vouloir supprimer cette page ?", @@ -2250,7 +2109,7 @@ } }, "modals.delete-page.title" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs:59" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs" ], "translations" : { "en" : "Delete page", "fr" : "Supprimer une page", @@ -2258,7 +2117,7 @@ } }, "modals.delete-project-confirm.accept" : { - "used-in" : [ "src/app/main/ui/dashboard/files.cljs:58" ], + "used-in" : [ "src/app/main/ui/dashboard/files.cljs" ], "translations" : { "en" : "Delete project", "fr" : "Supprimer le projet", @@ -2266,7 +2125,7 @@ } }, "modals.delete-project-confirm.message" : { - "used-in" : [ "src/app/main/ui/dashboard/files.cljs:57" ], + "used-in" : [ "src/app/main/ui/dashboard/files.cljs" ], "translations" : { "en" : "Are you sure you want to delete this project?", "fr" : "Êtes‑vous sûr de vouloir supprimer ce projet ?", @@ -2274,7 +2133,7 @@ } }, "modals.delete-project-confirm.title" : { - "used-in" : [ "src/app/main/ui/dashboard/files.cljs:56" ], + "used-in" : [ "src/app/main/ui/dashboard/files.cljs" ], "translations" : { "en" : "Delete project", "fr" : "Supprimer un projet", @@ -2282,7 +2141,7 @@ } }, "modals.delete-team-confirm.accept" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:301" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Delete team", "fr" : "Supprimer l’équipe", @@ -2290,7 +2149,7 @@ } }, "modals.delete-team-confirm.message" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:300" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Are you sure you want to delete this team? All projects and files associated with team will be permanently deleted.", "fr" : "Êtes‑vous sûr de vouloir supprimer cette équipe ? Tous les projets et fichiers associés à l’équipe seront définitivement supprimés.", @@ -2298,7 +2157,7 @@ } }, "modals.delete-team-confirm.title" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:299" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Deleting team", "fr" : "Suppression d’une équipe", @@ -2306,7 +2165,7 @@ } }, "modals.delete-team-member-confirm.accept" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:164" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Delete member", "fr" : "Supprimer le membre", @@ -2314,7 +2173,7 @@ } }, "modals.delete-team-member-confirm.message" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:163" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Are you sure you want to delete this member from the team?", "fr" : "Êtes‑vous sûr de vouloir supprimer ce membre de l’équipe ?", @@ -2322,7 +2181,7 @@ } }, "modals.delete-team-member-confirm.title" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:162" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Delete team member", "fr" : "Supprimer un membre d’équipe", @@ -2330,7 +2189,7 @@ } }, "modals.invite-member.title" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:112" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Invite to join the team", "fr" : "Inviter à rejoindre l’équipe", @@ -2338,7 +2197,7 @@ } }, "modals.leave-and-reassign.hint1" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:204" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "You are %s owner.", "fr" : "Vous êtes le propriétaire de %s.", @@ -2346,7 +2205,7 @@ } }, "modals.leave-and-reassign.hint2" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:205" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Select other member to promote before leave", "fr" : "Sélectionnez un autre membre à promouvoir avant de quitter l’équipe", @@ -2354,7 +2213,7 @@ } }, "modals.leave-and-reassign.promote-and-leave" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:222" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Promote and leave", "fr" : "Promouvoir et quitter", @@ -2362,7 +2221,7 @@ } }, "modals.leave-and-reassign.select-memeber-to-promote" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:182" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Select a member to promote", "fr" : "Sélectionnez un membre à promouvoir", @@ -2370,7 +2229,7 @@ } }, "modals.leave-and-reassign.title" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:199" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Select a member to promote", "fr" : "Sélectionnez un membre à promouvoir", @@ -2378,7 +2237,7 @@ } }, "modals.leave-confirm.accept" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:276" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Leave team", "fr" : "Quitter l’équipe", @@ -2386,7 +2245,7 @@ } }, "modals.leave-confirm.message" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:275" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Are you sure you want to leave this team?", "fr" : "Êtes‑vous sûr de vouloir quitter cette équipe ?", @@ -2394,7 +2253,7 @@ } }, "modals.leave-confirm.title" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs:274" ], + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Leaving team", "fr" : "Quitter l’équipe", @@ -2402,7 +2261,7 @@ } }, "modals.promote-owner-confirm.accept" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:151" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Promote", "fr" : "Promouvoir", @@ -2410,7 +2269,7 @@ } }, "modals.promote-owner-confirm.message" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:150" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Are you sure you want to promote this user to owner?", "fr" : "Êtes‑vous sûr de vouloir promouvoir cette personne propriétaire ?", @@ -2418,7 +2277,7 @@ } }, "modals.promote-owner-confirm.title" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs:149" ], + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Promote to owner", "fr" : "Promouvoir propriétaire", @@ -2426,7 +2285,7 @@ } }, "modals.remove-shared-confirm.accept" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:127", "src/app/main/ui/dashboard/grid.cljs:132" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { "en" : "Remove as Shared Library", "fr" : "Supprimer en tant que Bibliothèque Partagée", @@ -2435,7 +2294,7 @@ } }, "modals.remove-shared-confirm.hint" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:125", "src/app/main/ui/dashboard/grid.cljs:130" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { "en" : "Once removed as Shared Library, the File Library of this file will stop being available to be used among the rest of your files.", "fr" : "Une fois supprimée en tant que Bibliothèque Partagée, la Bibliothèque de ce fichier ne pourra plus être utilisée par le reste de vos fichiers.", @@ -2444,7 +2303,7 @@ } }, "modals.remove-shared-confirm.message" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:124", "src/app/main/ui/dashboard/grid.cljs:129" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { "en" : "Remove “%s” as Shared Library", "fr" : "Retirer « %s » en tant que Bibliothèque Partagée", @@ -2453,7 +2312,7 @@ } }, "modals.update-remote-component.accept" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:95", "src/app/main/ui/workspace/sidebar/options/component.cljs:72" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Update component", "fr" : "Actualiser le composant", @@ -2462,7 +2321,7 @@ } }, "modals.update-remote-component.cancel" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:94", "src/app/main/ui/workspace/sidebar/options/component.cljs:71" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Cancel", "fr" : "Annuler", @@ -2471,7 +2330,7 @@ } }, "modals.update-remote-component.hint" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:93", "src/app/main/ui/workspace/sidebar/options/component.cljs:70" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "You are about to update a component in a shared library. This may affect other files that use it.", "fr" : "Vous êtes sur le point de mettre à jour le composant d’une Bibliothèque Partagée. Cela peut affecter d’autres fichiers qui l’utilisent.", @@ -2480,7 +2339,7 @@ } }, "modals.update-remote-component.message" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:92", "src/app/main/ui/workspace/sidebar/options/component.cljs:69" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Update a component in a shared library", "fr" : "Actualiser le composant d’une bibliothèque", @@ -2489,7 +2348,7 @@ } }, "notifications.profile-deletion-not-allowed" : { - "used-in" : [ "src/app/main/ui/settings/delete_account.cljs:28" ], + "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ], "translations" : { "en" : "You can't delete you profile. Reassign your teams before proceed.", "fr" : "Vous ne pouvez pas supprimer votre profil. Réassignez vos équipes avant de continuer.", @@ -2498,7 +2357,7 @@ } }, "notifications.profile-saved" : { - "used-in" : [ "src/app/main/ui/settings/options.cljs:36", "src/app/main/ui/settings/profile.cljs:38" ], + "used-in" : [ "src/app/main/ui/settings/profile.cljs", "src/app/main/ui/settings/feedback.cljs", "src/app/main/ui/settings/options.cljs" ], "translations" : { "en" : "Profile saved successfully!", "fr" : "Profil enregistré avec succès !", @@ -2507,7 +2366,7 @@ } }, "notifications.validation-email-sent" : { - "used-in" : [ "src/app/main/ui/settings/change_email.cljs:56", "src/app/main/ui/auth/register.cljs:54" ], + "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ], "translations" : { "en" : "Verification email sent to %s. Check your email!", "fr" : "E‑mail de vérification envoyé à %s. Vérifiez votre e‑mail !", @@ -2515,7 +2374,7 @@ } }, "profile.recovery.go-to-login" : { - "used-in" : [ "src/app/main/ui/auth/recovery.cljs:95" ], + "used-in" : [ "src/app/main/ui/auth/recovery.cljs" ], "translations" : { "en" : "Go to login", "fr" : "Aller à la page de connexion", @@ -2524,7 +2383,7 @@ } }, "settings.multiple" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs:213", "src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:161", "src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs:170", "src/app/main/ui/workspace/sidebar/options/typography.cljs:99", "src/app/main/ui/workspace/sidebar/options/typography.cljs:149", "src/app/main/ui/workspace/sidebar/options/typography.cljs:162", "src/app/main/ui/workspace/sidebar/options/blur.cljs:79", "src/app/main/ui/workspace/sidebar/options/stroke.cljs:145" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs", "src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs", "src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs", "src/app/main/ui/workspace/sidebar/options/typography.cljs", "src/app/main/ui/workspace/sidebar/options/typography.cljs", "src/app/main/ui/workspace/sidebar/options/typography.cljs", "src/app/main/ui/workspace/sidebar/options/shadow.cljs", "src/app/main/ui/workspace/sidebar/options/blur.cljs" ], "translations" : { "en" : "Mixed", "fr" : "Divers", @@ -2532,26 +2391,8 @@ "es" : "Varios" } }, - "settings.profile" : { - "translations" : { - "en" : "PROFILE", - "fr" : "PROFIL", - "ru" : "ПРОФИЛЬ", - "es" : "PERFIL" - }, - "unused" : true - }, - "settings.teams" : { - "translations" : { - "en" : "TEAMS", - "fr" : "ÉQUIPES", - "ru" : "КОМАНДЫ", - "es" : "EQUIPOS" - }, - "unused" : true - }, "viewer.empty-state" : { - "used-in" : [ "src/app/main/ui/handoff.cljs:56", "src/app/main/ui/viewer.cljs:192" ], + "used-in" : [ "src/app/main/ui/handoff.cljs", "src/app/main/ui/viewer.cljs" ], "translations" : { "en" : "No frames found on the page.", "fr" : "Aucun cadre trouvé sur la page.", @@ -2560,7 +2401,7 @@ } }, "viewer.frame-not-found" : { - "used-in" : [ "src/app/main/ui/handoff.cljs:60", "src/app/main/ui/viewer.cljs:196" ], + "used-in" : [ "src/app/main/ui/handoff.cljs", "src/app/main/ui/viewer.cljs" ], "translations" : { "en" : "Frame not found.", "fr" : "Cadre introuvable.", @@ -2569,7 +2410,7 @@ } }, "viewer.header.dont-show-interactions" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs:125" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], "translations" : { "en" : "Don't show interactions", "fr" : "Ne pas afficher les interactions", @@ -2578,7 +2419,7 @@ } }, "viewer.header.edit-page" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs:266" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], "translations" : { "en" : "Edit page", "fr" : "Modifier la page", @@ -2587,7 +2428,7 @@ } }, "viewer.header.fullscreen" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs:277" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], "translations" : { "en" : "Full Screen", "fr" : "Plein écran", @@ -2596,7 +2437,7 @@ } }, "viewer.header.share.copy-link" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs:93" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], "translations" : { "en" : "Copy link", "fr" : "Copier le lien", @@ -2605,7 +2446,7 @@ } }, "viewer.header.share.create-link" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs:102" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], "translations" : { "en" : "Create link", "fr" : "Créer le lien", @@ -2614,7 +2455,7 @@ } }, "viewer.header.share.placeholder" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs:94" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], "translations" : { "en" : "Share link will appear here", "fr" : "Le lien de partage apparaîtra ici", @@ -2623,7 +2464,7 @@ } }, "viewer.header.share.remove-link" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs:100" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], "translations" : { "en" : "Remove link", "fr" : "Supprimer le lien", @@ -2632,7 +2473,7 @@ } }, "viewer.header.share.subtitle" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs:96" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], "translations" : { "en" : "Anyone with the link will have access", "fr" : "Toute personne disposant du lien aura accès", @@ -2641,7 +2482,7 @@ } }, "viewer.header.share.title" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs:79", "src/app/main/ui/viewer/header.cljs:81", "src/app/main/ui/viewer/header.cljs:87" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs", "src/app/main/ui/viewer/header.cljs", "src/app/main/ui/viewer/header.cljs" ], "translations" : { "en" : "Share link", "fr" : "Lien de partage", @@ -2650,7 +2491,7 @@ } }, "viewer.header.show-interactions" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs:130" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], "translations" : { "en" : "Show interactions", "fr" : "Afficher les interactions", @@ -2659,7 +2500,7 @@ } }, "viewer.header.show-interactions-on-click" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs:135" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], "translations" : { "en" : "Show interactions on click", "fr" : "Afficher les interactions au clic", @@ -2668,7 +2509,7 @@ } }, "viewer.header.sitemap" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs:224" ], + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], "translations" : { "en" : "Sitemap", "fr" : "Plan du site", @@ -2677,7 +2518,7 @@ } }, "workspace.align.hcenter" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:53" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ], "translations" : { "en" : "Align horizontal center", "fr" : "Aligner horizontalement au centre", @@ -2686,7 +2527,7 @@ } }, "workspace.align.hdistribute" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:65" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ], "translations" : { "en" : "Distribute horizontal spacing", "fr" : "Répartir l’espacement horizontal", @@ -2695,7 +2536,7 @@ } }, "workspace.align.hleft" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:47" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ], "translations" : { "en" : "Align left", "fr" : "Aligner à gauche", @@ -2704,7 +2545,7 @@ } }, "workspace.align.hright" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:59" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ], "translations" : { "en" : "Align right", "fr" : "Aligner à droite", @@ -2713,7 +2554,7 @@ } }, "workspace.align.vbottom" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:84" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ], "translations" : { "en" : "Align bottom", "fr" : "Aligner en bas", @@ -2722,7 +2563,7 @@ } }, "workspace.align.vcenter" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:78" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ], "translations" : { "en" : "Align vertical center", "fr" : "Aligner verticalement au centre", @@ -2731,7 +2572,7 @@ } }, "workspace.align.vdistribute" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:90" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ], "translations" : { "en" : "Distribute vertical spacing", "fr" : "Répartir l’espacement vertical", @@ -2740,7 +2581,7 @@ } }, "workspace.align.vtop" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs:72" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ], "translations" : { "en" : "Align top", "fr" : "Aligner en haut", @@ -2749,7 +2590,7 @@ } }, "workspace.assets.assets" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:705" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ], "translations" : { "en" : "Assets", "fr" : "Ressources", @@ -2758,7 +2599,7 @@ } }, "workspace.assets.box-filter-all" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:725" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ], "translations" : { "en" : "All assets", "fr" : "Toutes", @@ -2766,15 +2607,6 @@ "es" : "Todos" } }, - "workspace.assets.box-filter-colors" : { - "translations" : { - "en" : "Colors", - "fr" : "Couleurs", - "ru" : "", - "es" : "Colores" - }, - "unused" : true - }, "workspace.assets.box-filter-graphics" : { "translations" : { "en" : "Graphics", @@ -2785,7 +2617,7 @@ "unused" : true }, "workspace.assets.colors" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:399", "src/app/main/ui/workspace/sidebar/assets.cljs:728" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ], "translations" : { "en" : "Colors", "fr" : "Couleurs", @@ -2794,7 +2626,7 @@ } }, "workspace.assets.components" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:109", "src/app/main/ui/workspace/sidebar/assets.cljs:726" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ], "translations" : { "en" : "Components", "fr" : "Composants", @@ -2803,7 +2635,7 @@ } }, "workspace.assets.delete" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs:151", "src/app/main/ui/workspace/sidebar/assets.cljs:140", "src/app/main/ui/workspace/sidebar/assets.cljs:260", "src/app/main/ui/workspace/sidebar/assets.cljs:375", "src/app/main/ui/workspace/sidebar/assets.cljs:504" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ], "translations" : { "en" : "Delete", "fr" : "Supprimer", @@ -2812,7 +2644,7 @@ } }, "workspace.assets.duplicate" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs:155", "src/app/main/ui/workspace/sidebar/assets.cljs:139" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ], "translations" : { "en" : "Duplicate", "fr" : "Dupliquer", @@ -2821,7 +2653,7 @@ } }, "workspace.assets.edit" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:374", "src/app/main/ui/workspace/sidebar/assets.cljs:503" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ], "translations" : { "en" : "Edit", "fr" : "Modifier", @@ -2830,7 +2662,7 @@ } }, "workspace.assets.file-library" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:602" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ], "translations" : { "en" : "File library", "fr" : "Bibliothèque du fichier", @@ -2839,7 +2671,7 @@ } }, "workspace.assets.graphics" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:221", "src/app/main/ui/workspace/sidebar/assets.cljs:727" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ], "translations" : { "en" : "Graphics", "fr" : "Graphiques", @@ -2848,7 +2680,7 @@ } }, "workspace.assets.libraries" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:708" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ], "translations" : { "en" : "Libraries", "fr" : "Bibliothèques", @@ -2857,7 +2689,7 @@ } }, "workspace.assets.not-found" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:666" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ], "translations" : { "en" : "No assets found", "fr" : "Aucune ressource trouvée", @@ -2866,7 +2698,7 @@ } }, "workspace.assets.rename" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs:154", "src/app/main/ui/workspace/sidebar/assets.cljs:138", "src/app/main/ui/workspace/sidebar/assets.cljs:259", "src/app/main/ui/workspace/sidebar/assets.cljs:373", "src/app/main/ui/workspace/sidebar/assets.cljs:502" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ], "translations" : { "en" : "Rename", "fr" : "Renommer", @@ -2875,7 +2707,7 @@ } }, "workspace.assets.search" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:712" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ], "translations" : { "en" : "Search assets", "fr" : "Chercher des ressources", @@ -2884,7 +2716,7 @@ } }, "workspace.assets.shared" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:604" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ], "translations" : { "en" : "SHARED", "fr" : "PARTAGÉ", @@ -2893,7 +2725,7 @@ } }, "workspace.assets.typography" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs:491", "src/app/main/ui/workspace/sidebar/assets.cljs:729" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ], "translations" : { "en" : "Typographies", "fr" : "Typographies", @@ -2901,7 +2733,7 @@ } }, "workspace.assets.typography.font-id" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs:276" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], "translations" : { "en" : "Font", "fr" : "Police", @@ -2909,7 +2741,7 @@ } }, "workspace.assets.typography.font-size" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs:284" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], "translations" : { "en" : "Size", "fr" : "Taille", @@ -2917,7 +2749,7 @@ } }, "workspace.assets.typography.font-variant-id" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs:280" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], "translations" : { "en" : "Variant", "fr" : "Variante", @@ -2925,7 +2757,7 @@ } }, "workspace.assets.typography.go-to-edit" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs:301" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], "translations" : { "en" : "Go to style library file to edit", "fr" : "Accéder au fichier de bibliothèque de styles à modifier", @@ -2933,7 +2765,7 @@ } }, "workspace.assets.typography.letter-spacing" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs:292" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], "translations" : { "en" : "Letter Spacing", "fr" : "Interlettrage", @@ -2941,7 +2773,7 @@ } }, "workspace.assets.typography.line-height" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs:288" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], "translations" : { "en" : "Line Height", "fr" : "Interlignage", @@ -2949,7 +2781,7 @@ } }, "workspace.assets.typography.sample" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs:254", "src/app/main/ui/handoff/attributes/text.cljs:96", "src/app/main/ui/handoff/attributes/text.cljs:105" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs", "src/app/main/ui/handoff/attributes/text.cljs", "src/app/main/ui/handoff/attributes/text.cljs" ], "translations" : { "en" : "Ag", "fr" : "Ag", @@ -2957,7 +2789,7 @@ } }, "workspace.assets.typography.text-transform" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs:296" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], "translations" : { "en" : "Text Transform", "fr" : "Transformer le texte", @@ -2965,7 +2797,7 @@ } }, "workspace.gradients.linear" : { - "used-in" : [ "src/app/main/data/workspace/libraries.cljs:71", "src/app/main/ui/components/color_bullet.cljs:31" ], + "used-in" : [ "src/app/main/data/workspace/libraries.cljs", "src/app/main/ui/components/color_bullet.cljs" ], "translations" : { "en" : "Linear gradient", "fr" : "Dégradé linéaire", @@ -2973,7 +2805,7 @@ } }, "workspace.gradients.radial" : { - "used-in" : [ "src/app/main/data/workspace/libraries.cljs:72", "src/app/main/ui/components/color_bullet.cljs:32" ], + "used-in" : [ "src/app/main/data/workspace/libraries.cljs", "src/app/main/ui/components/color_bullet.cljs" ], "translations" : { "en" : "Radial gradient", "fr" : "Dégradé radial", @@ -2981,7 +2813,7 @@ } }, "workspace.header.menu.disable-dynamic-alignment" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:220" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Disable dynamic alignment", "fr" : "Désactiver l’alignement dynamique", @@ -2990,7 +2822,7 @@ } }, "workspace.header.menu.disable-snap-grid" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:188" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Disable snap to grid", "fr" : "Désactiver l’alignement sur la grille", @@ -2999,7 +2831,7 @@ } }, "workspace.header.menu.enable-dynamic-alignment" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:221" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Enable dynamic aligment", "fr" : "Activer l’alignement dynamique", @@ -3008,7 +2840,7 @@ } }, "workspace.header.menu.enable-snap-grid" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:189" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Snap to grid", "fr" : "Aligner sur la grille", @@ -3017,7 +2849,7 @@ } }, "workspace.header.menu.hide-assets" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:209" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Hide assets", "fr" : "Masquer les ressources", @@ -3026,7 +2858,7 @@ } }, "workspace.header.menu.hide-grid" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:181" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Hide grids", "fr" : "Masquer la grille", @@ -3035,7 +2867,7 @@ } }, "workspace.header.menu.hide-layers" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:195" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Hide layers", "fr" : "Masquer les calques", @@ -3044,7 +2876,7 @@ } }, "workspace.header.menu.hide-palette" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:202" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Hide color palette", "fr" : "Masquer la palette de couleurs", @@ -3053,7 +2885,7 @@ } }, "workspace.header.menu.hide-rules" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:174" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Hide rules", "fr" : "Masquer les règles", @@ -3062,7 +2894,7 @@ } }, "workspace.header.menu.select-all" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:214" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Select all", "fr" : "Tout sélectionner", @@ -3071,7 +2903,7 @@ } }, "workspace.header.menu.show-assets" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:210" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Show assets", "fr" : "Montrer les ressources", @@ -3080,7 +2912,7 @@ } }, "workspace.header.menu.show-grid" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:182" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Show grid", "fr" : "Montrer la grille", @@ -3089,7 +2921,7 @@ } }, "workspace.header.menu.show-layers" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:196" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Show layers", "fr" : "Montrer les calques", @@ -3098,7 +2930,7 @@ } }, "workspace.header.menu.show-palette" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:203" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Show color palette", "fr" : "Montrer la palette de couleurs", @@ -3107,7 +2939,7 @@ } }, "workspace.header.menu.show-rules" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:175" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Show rules", "fr" : "Montrer les règles", @@ -3116,7 +2948,7 @@ } }, "workspace.header.save-error" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:58" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Error on saving", "fr" : "Erreur d’enregistrement", @@ -3124,7 +2956,7 @@ } }, "workspace.header.saved" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:53" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Saved", "fr" : "Enregistré", @@ -3132,7 +2964,7 @@ } }, "workspace.header.saving" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:48" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Saving", "fr" : "Enregistrement", @@ -3140,7 +2972,7 @@ } }, "workspace.header.unsaved" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:43" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Unsaved changes", "fr" : "Modifications non sauvegardées", @@ -3148,7 +2980,7 @@ } }, "workspace.header.viewer" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:279" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "View mode (%s)", "fr" : "Mode spectateur (%s)", @@ -3157,7 +2989,7 @@ } }, "workspace.libraries.add" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:116" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], "translations" : { "en" : "Add", "fr" : "Ajouter", @@ -3166,7 +2998,7 @@ } }, "workspace.libraries.colors" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:44" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], "translations" : { "en" : "%s colors", "fr" : "%s couleurs", @@ -3175,7 +3007,7 @@ } }, "workspace.libraries.colors.big-thumbnails" : { - "used-in" : [ "src/app/main/ui/workspace/colorpalette.cljs:171" ], + "used-in" : [ "src/app/main/ui/workspace/colorpalette.cljs" ], "translations" : { "en" : "Big thumbnails", "fr" : "Grandes vignettes", @@ -3183,7 +3015,7 @@ } }, "workspace.libraries.colors.file-library" : { - "used-in" : [ "src/app/main/ui/workspace/colorpicker/libraries.cljs:89", "src/app/main/ui/workspace/colorpalette.cljs:149" ], + "used-in" : [ "src/app/main/ui/workspace/colorpicker/libraries.cljs", "src/app/main/ui/workspace/colorpalette.cljs" ], "translations" : { "en" : "File library", "fr" : "Bibliothèque du fichier", @@ -3191,7 +3023,7 @@ } }, "workspace.libraries.colors.recent-colors" : { - "used-in" : [ "src/app/main/ui/workspace/colorpicker/libraries.cljs:88", "src/app/main/ui/workspace/colorpalette.cljs:159" ], + "used-in" : [ "src/app/main/ui/workspace/colorpicker/libraries.cljs", "src/app/main/ui/workspace/colorpalette.cljs" ], "translations" : { "en" : "Recent colors", "fr" : "Couleurs récentes", @@ -3199,7 +3031,7 @@ } }, "workspace.libraries.colors.save-color" : { - "used-in" : [ "src/app/main/ui/workspace/colorpicker.cljs:339" ], + "used-in" : [ "src/app/main/ui/workspace/colorpicker.cljs" ], "translations" : { "en" : "Save color style", "fr" : "Enregistrer le style de couleur", @@ -3207,7 +3039,7 @@ } }, "workspace.libraries.colors.small-thumbnails" : { - "used-in" : [ "src/app/main/ui/workspace/colorpalette.cljs:176" ], + "used-in" : [ "src/app/main/ui/workspace/colorpalette.cljs" ], "translations" : { "en" : "Small thumbnails", "fr" : "Petites vignettes", @@ -3215,7 +3047,7 @@ } }, "workspace.libraries.components" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:38" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], "translations" : { "en" : "%s components", "fr" : "%s composants", @@ -3224,7 +3056,7 @@ } }, "workspace.libraries.file-library" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:85" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], "translations" : { "en" : "File library", "fr" : "Bibliothèque du fichier", @@ -3233,7 +3065,7 @@ } }, "workspace.libraries.graphics" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:41" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], "translations" : { "en" : "%s graphics", "fr" : "%s graphiques", @@ -3242,7 +3074,7 @@ } }, "workspace.libraries.in-this-file" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:82" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], "translations" : { "en" : "LIBRARIES IN THIS FILE", "fr" : "BIBLIOTHÈQUES DANS CE FICHIER", @@ -3251,7 +3083,7 @@ } }, "workspace.libraries.libraries" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:177" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], "translations" : { "en" : "LIBRARIES", "fr" : "BIBLIOTHÈQUES", @@ -3260,7 +3092,7 @@ } }, "workspace.libraries.library" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:136" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], "translations" : { "en" : "LIBRARY", "fr" : "BIBLIOTHÈQUE", @@ -3269,7 +3101,7 @@ } }, "workspace.libraries.no-libraries-need-sync" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:134" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], "translations" : { "en" : "There are no Shared Libraries that need update", "fr" : "Aucune Bibliothèque Partagée n’a besoin d’être mise à jour", @@ -3278,7 +3110,7 @@ } }, "workspace.libraries.no-matches-for" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:122" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], "translations" : { "en" : "No matches found for “%s“", "fr" : "Aucune correspondance pour « %s »", @@ -3287,7 +3119,7 @@ } }, "workspace.libraries.no-shared-libraries-available" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:121" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], "translations" : { "en" : "There are no Shared Libraries available", "fr" : "Aucune Bibliothèque Partagée disponible", @@ -3296,7 +3128,7 @@ } }, "workspace.libraries.search-shared-libraries" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:99" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], "translations" : { "en" : "Search shared libraries", "fr" : "Rechercher des Bibliothèques Partagées", @@ -3305,7 +3137,7 @@ } }, "workspace.libraries.shared-libraries" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:96" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], "translations" : { "en" : "SHARED LIBRARIES", "fr" : "BIBLIOTHÈQUES PARTAGÉES", @@ -3314,7 +3146,7 @@ } }, "workspace.libraries.text.multiple-typography" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:264" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Multiple typographies", "fr" : "Multiple typographies", @@ -3322,7 +3154,7 @@ } }, "workspace.libraries.text.multiple-typography-tooltip" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:266" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Unlink all typographies", "fr" : "Dissocier toutes les typographies", @@ -3330,7 +3162,7 @@ } }, "workspace.libraries.typography" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:47" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], "translations" : { "en" : "%s typographies", "fr" : "%s typographies", @@ -3338,7 +3170,7 @@ } }, "workspace.libraries.update" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:143" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], "translations" : { "en" : "Update", "fr" : "Actualiser", @@ -3347,7 +3179,7 @@ } }, "workspace.libraries.updates" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs:181" ], + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], "translations" : { "en" : "UPDATES", "fr" : "MISES À JOUR", @@ -3364,7 +3196,7 @@ }, "unused" : true }, - "workspace.library.icons" : { + "labels.icons" : { "translations" : { "en" : "Icons", "fr" : "Icônes", @@ -3373,7 +3205,7 @@ }, "unused" : true }, - "workspace.library.images" : { + "labels.images" : { "translations" : { "en" : "Images", "fr" : "Images", @@ -3426,7 +3258,7 @@ "unused" : true }, "workspace.options.blur-options.title" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/blur.cljs:62" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/blur.cljs" ], "translations" : { "en" : "Blur", "fr" : "Flou", @@ -3434,7 +3266,7 @@ } }, "workspace.options.blur-options.title.group" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/blur.cljs:61" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/blur.cljs" ], "translations" : { "en" : "Group blur", "fr" : "Flou de groupe", @@ -3442,7 +3274,7 @@ } }, "workspace.options.blur-options.title.multiple" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/blur.cljs:60" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/blur.cljs" ], "translations" : { "en" : "Selection blur", "fr" : "Flou de sélection", @@ -3450,7 +3282,7 @@ } }, "workspace.options.canvas-background" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/page.cljs:45" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/page.cljs" ], "translations" : { "en" : "Canvas background", "fr" : "Couleur de fond du canvas", @@ -3459,7 +3291,7 @@ } }, "workspace.options.component" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs:81" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs" ], "translations" : { "en" : "Component", "fr" : "Composant", @@ -3467,7 +3299,7 @@ } }, "workspace.options.design" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options.cljs:70" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options.cljs" ], "translations" : { "en" : "Design", "fr" : "Conception", @@ -3476,7 +3308,7 @@ } }, "workspace.options.export" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs:132", "src/app/main/ui/handoff/exports.cljs:96" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs", "src/app/main/ui/handoff/exports.cljs" ], "translations" : { "en" : "Export", "fr" : "Export", @@ -3485,7 +3317,7 @@ } }, "workspace.options.export-object" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs:166", "src/app/main/ui/handoff/exports.cljs:131" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs", "src/app/main/ui/handoff/exports.cljs" ], "translations" : { "en" : "Export shape", "fr" : "Exporter la forme", @@ -3494,7 +3326,7 @@ } }, "workspace.options.export.suffix" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs:149" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs" ], "translations" : { "en" : "Suffix", "fr" : "Suffixe", @@ -3502,7 +3334,7 @@ } }, "workspace.options.exporting-object" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs:165", "src/app/main/ui/handoff/exports.cljs:130" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs", "src/app/main/ui/handoff/exports.cljs" ], "translations" : { "en" : "Exporting…", "fr" : "Export en cours…", @@ -3511,7 +3343,7 @@ } }, "workspace.options.fill" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/fill.cljs:41" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/fill.cljs" ], "translations" : { "en" : "Fill", "fr" : "Remplissage", @@ -3520,7 +3352,7 @@ } }, "workspace.options.grid.auto" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:36" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Auto", "fr" : "Automatique", @@ -3529,7 +3361,7 @@ } }, "workspace.options.grid.column" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:133" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Columns", "fr" : "Colonnes", @@ -3538,7 +3370,7 @@ } }, "workspace.options.grid.params.columns" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:173" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Columns", "fr" : "Colonnes", @@ -3547,7 +3379,7 @@ } }, "workspace.options.grid.params.gutter" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:206" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Gutter", "fr" : "Gouttière", @@ -3556,7 +3388,7 @@ } }, "workspace.options.grid.params.height" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:197" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Height", "fr" : "Hauteur", @@ -3565,7 +3397,7 @@ } }, "workspace.options.grid.params.margin" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:212" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Margin", "fr" : "Marge", @@ -3574,7 +3406,7 @@ } }, "workspace.options.grid.params.rows" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:164" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Rows", "fr" : "Lignes", @@ -3583,7 +3415,7 @@ } }, "workspace.options.grid.params.set-default" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:227" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Set as default", "fr" : "Définir par défaut", @@ -3592,7 +3424,7 @@ } }, "workspace.options.grid.params.size" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:157" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Size", "fr" : "Taille", @@ -3601,7 +3433,7 @@ } }, "workspace.options.grid.params.type" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:182" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Type", "fr" : "Type", @@ -3610,7 +3442,7 @@ } }, "workspace.options.grid.params.type.bottom" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:190" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Bottom", "fr" : "Bas", @@ -3619,7 +3451,7 @@ } }, "workspace.options.grid.params.type.center" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:188" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Center", "fr" : "Centre", @@ -3628,7 +3460,7 @@ } }, "workspace.options.grid.params.type.left" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:187" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Left", "fr" : "Gauche", @@ -3637,7 +3469,7 @@ } }, "workspace.options.grid.params.type.right" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:191" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Right", "fr" : "Droite", @@ -3646,7 +3478,7 @@ } }, "workspace.options.grid.params.type.stretch" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:184" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Stretch", "fr" : "Étirer", @@ -3655,7 +3487,7 @@ } }, "workspace.options.grid.params.type.top" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:186" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Top", "fr" : "Haut", @@ -3664,7 +3496,7 @@ } }, "workspace.options.grid.params.use-default" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:225" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Use default", "fr" : "Utiliser la valeur par défaut", @@ -3673,7 +3505,7 @@ } }, "workspace.options.grid.params.width" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:198" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Width", "fr" : "Largeur", @@ -3682,7 +3514,7 @@ } }, "workspace.options.grid.row" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:134" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Rows", "fr" : "Lignes", @@ -3691,7 +3523,7 @@ } }, "workspace.options.grid.square" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:132" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Square", "fr" : "Carré", @@ -3700,7 +3532,7 @@ } }, "workspace.options.grid.title" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs:239" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Grid & Layouts", "fr" : "Grille & Calques", @@ -3709,7 +3541,7 @@ } }, "workspace.options.group-fill" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/fill.cljs:40" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/fill.cljs" ], "translations" : { "en" : "Group fill", "fr" : "Remplissage de groupe", @@ -3718,7 +3550,7 @@ } }, "workspace.options.group-stroke" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:54" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Group stroke", "fr" : "Contour de groupe", @@ -3727,7 +3559,7 @@ } }, "workspace.options.navigate-to" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs:59" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs" ], "translations" : { "en" : "Navigate to", "fr" : "Naviguer vers", @@ -3736,7 +3568,7 @@ } }, "workspace.options.none" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs:72" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs" ], "translations" : { "en" : "None", "fr" : "Aucun", @@ -3745,7 +3577,7 @@ } }, "workspace.options.position" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame.cljs:118", "src/app/main/ui/workspace/sidebar/options/measures.cljs:146" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs", "src/app/main/ui/workspace/sidebar/options/frame.cljs" ], "translations" : { "en" : "Position", "fr" : "Position", @@ -3754,7 +3586,7 @@ } }, "workspace.options.prototype" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options.cljs:83" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options.cljs" ], "translations" : { "en" : "Prototype", "fr" : "Prototype", @@ -3763,7 +3595,7 @@ } }, "workspace.options.radius" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs:186" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs" ], "translations" : { "en" : "Radius", "fr" : "Rayon", @@ -3772,7 +3604,7 @@ } }, "workspace.options.rotation" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs:163" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs" ], "translations" : { "en" : "Rotation", "fr" : "Rotation", @@ -3781,7 +3613,7 @@ } }, "workspace.options.select-a-shape" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs:53" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs" ], "translations" : { "en" : "Select a shape, artboard or group to drag a connection to other artboard.", "fr" : "Sélectionnez une forme, un plan de travail ou un groupe pour faire glisser une connexion vers un autre plan de travail.", @@ -3790,7 +3622,7 @@ } }, "workspace.options.select-artboard" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs:65" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs" ], "translations" : { "en" : "Select artboard", "fr" : "Sélectionner un plan de travail", @@ -3799,7 +3631,7 @@ } }, "workspace.options.selection-fill" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/fill.cljs:39" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/fill.cljs" ], "translations" : { "en" : "Selection fill", "fr" : "Remplissage de sélection", @@ -3808,7 +3640,7 @@ } }, "workspace.options.selection-stroke" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:53" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Selection stroke", "fr" : "Contour de sélection", @@ -3817,7 +3649,7 @@ } }, "workspace.options.shadow-options.blur" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs:166" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ], "translations" : { "en" : "Blur", "fr" : "Flou", @@ -3825,7 +3657,7 @@ } }, "workspace.options.shadow-options.drop-shadow" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs:135" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ], "translations" : { "en" : "Drop shadow", "fr" : "Ombre portée", @@ -3833,7 +3665,7 @@ } }, "workspace.options.shadow-options.inner-shadow" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs:136" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ], "translations" : { "en" : "Inner shadow", "fr" : "Ombre intérieure", @@ -3841,7 +3673,7 @@ } }, "workspace.options.shadow-options.offsetx" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs:146" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ], "translations" : { "en" : "X", "fr" : "X", @@ -3849,7 +3681,7 @@ } }, "workspace.options.shadow-options.offsety" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs:155" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ], "translations" : { "en" : "Y", "fr" : "Y", @@ -3857,7 +3689,7 @@ } }, "workspace.options.shadow-options.spread" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs:176" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ], "translations" : { "en" : "Spread", "fr" : "Diffusion", @@ -3865,7 +3697,7 @@ } }, "workspace.options.shadow-options.title" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs:204" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ], "translations" : { "en" : "Shadow", "fr" : "Ombre", @@ -3873,7 +3705,7 @@ } }, "workspace.options.shadow-options.title.group" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs:203" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ], "translations" : { "en" : "Group shadow", "fr" : "Ombre de groupe", @@ -3881,7 +3713,7 @@ } }, "workspace.options.shadow-options.title.multiple" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs:202" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ], "translations" : { "en" : "Selection shadows", "fr" : "Ombres de la sélection", @@ -3889,7 +3721,7 @@ } }, "workspace.options.size" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame.cljs:93", "src/app/main/ui/workspace/sidebar/options/measures.cljs:118" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs", "src/app/main/ui/workspace/sidebar/options/frame.cljs" ], "translations" : { "en" : "Size", "fr" : "Taille", @@ -3898,7 +3730,7 @@ } }, "workspace.options.size-presets" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame.cljs:75" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame.cljs" ], "translations" : { "en" : "Size presets", "fr" : "Tailles prédéfinies", @@ -3907,7 +3739,7 @@ } }, "workspace.options.stroke" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:55" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Stroke", "fr" : "Bordure", @@ -3916,7 +3748,7 @@ } }, "workspace.options.stroke.center" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:152" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Center", "fr" : "Centre", @@ -3925,7 +3757,7 @@ } }, "workspace.options.stroke.dashed" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:162" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Dashed", "fr" : "Tirets", @@ -3934,7 +3766,7 @@ } }, "workspace.options.stroke.dotted" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:161" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Dotted", "fr" : "Pointillé", @@ -3943,7 +3775,7 @@ } }, "workspace.options.stroke.inner" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:153" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Inside", "fr" : "Intérieur", @@ -3952,7 +3784,7 @@ } }, "workspace.options.stroke.mixed" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:163" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Mixed", "fr" : "Mixte", @@ -3961,7 +3793,7 @@ } }, "workspace.options.stroke.outer" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:154" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Outside", "fr" : "Extérieur", @@ -3970,7 +3802,7 @@ } }, "workspace.options.stroke.solid" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs:160" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Solid", "fr" : "Solide", @@ -3979,7 +3811,7 @@ } }, "workspace.options.text-options.align-bottom" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:112" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Align bottom", "fr" : "Aligner en bas", @@ -3988,7 +3820,7 @@ } }, "workspace.options.text-options.align-center" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:76" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Align center", "fr" : "Aligner au centre", @@ -3997,7 +3829,7 @@ } }, "workspace.options.text-options.align-justify" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:86" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Justify", "fr" : "Justifier", @@ -4006,7 +3838,7 @@ } }, "workspace.options.text-options.align-left" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:71" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Align left", "fr" : "Aligner à gauche", @@ -4015,7 +3847,7 @@ } }, "workspace.options.text-options.align-middle" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:107" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Align middle", "fr" : "Aligner verticalement au milieu", @@ -4024,7 +3856,7 @@ } }, "workspace.options.text-options.align-right" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:81" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Align right", "fr" : "Aligner à droite", @@ -4033,7 +3865,7 @@ } }, "workspace.options.text-options.align-top" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:102" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Align top", "fr" : "Aligner en haut", @@ -4051,7 +3883,7 @@ "unused" : true }, "workspace.options.text-options.grow-auto-height" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:137" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Auto height", "fr" : "Hauteur automatique", @@ -4059,7 +3891,7 @@ } }, "workspace.options.text-options.grow-auto-width" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:132" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Auto width", "fr" : "Largeur automatique", @@ -4067,7 +3899,7 @@ } }, "workspace.options.text-options.grow-fixed" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:127" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Fixed", "fr" : "Fixe", @@ -4075,7 +3907,7 @@ } }, "workspace.options.text-options.letter-spacing" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs:154" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], "translations" : { "en" : "Letter Spacing", "fr" : "Interlettrage", @@ -4084,7 +3916,7 @@ } }, "workspace.options.text-options.line-height" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs:141" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], "translations" : { "en" : "Line height", "fr" : "Interlignage", @@ -4093,7 +3925,7 @@ } }, "workspace.options.text-options.lowercase" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs:186" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], "translations" : { "en" : "Lowercase", "fr" : "Minuscule", @@ -4102,7 +3934,7 @@ } }, "workspace.options.text-options.none" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs:176", "src/app/main/ui/workspace/sidebar/options/text.cljs:153" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs", "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], "translations" : { "en" : "None", "fr" : "Aucune", @@ -4111,7 +3943,7 @@ } }, "workspace.options.text-options.strikethrough" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:165" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Strikethrough", "fr" : "Barré", @@ -4129,7 +3961,7 @@ "unused" : true }, "workspace.options.text-options.title" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:186" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Text", "fr" : "Texte", @@ -4138,7 +3970,7 @@ } }, "workspace.options.text-options.title-group" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:185" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Group text", "fr" : "Texte de groupe", @@ -4147,7 +3979,7 @@ } }, "workspace.options.text-options.title-selection" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:184" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Selection text", "fr" : "Texte de la sélection", @@ -4156,7 +3988,7 @@ } }, "workspace.options.text-options.titlecase" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs:191" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], "translations" : { "en" : "Title Case", "fr" : "Premières Lettres en Capitales", @@ -4165,7 +3997,7 @@ } }, "workspace.options.text-options.underline" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs:159" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Underline", "fr" : "Soulignage", @@ -4174,7 +4006,7 @@ } }, "workspace.options.text-options.uppercase" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs:181" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], "translations" : { "en" : "Uppercase", "fr" : "Majuscule", @@ -4192,7 +4024,7 @@ "unused" : true }, "workspace.options.use-play-button" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs:55" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs" ], "translations" : { "en" : "Use the play button at the header to run the prototype view.", "fr" : "Utilisez le bouton de lecture dans l’en‑tête pour exécuter la vue du prototype.", @@ -4201,7 +4033,7 @@ } }, "workspace.shape.menu.back" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:124" ], + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Send to back", "fr" : "Envoyer au fond", @@ -4209,7 +4041,7 @@ } }, "workspace.shape.menu.backward" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:121" ], + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Send backward", "fr" : "Éloigner", @@ -4217,7 +4049,7 @@ } }, "workspace.shape.menu.copy" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:102" ], + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Copy", "fr" : "Copier", @@ -4225,7 +4057,7 @@ } }, "workspace.shape.menu.create-component" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:168" ], + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Create component", "fr" : "Créer un composant", @@ -4233,7 +4065,7 @@ } }, "workspace.shape.menu.cut" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:105" ], + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Cut", "fr" : "Couper", @@ -4241,7 +4073,7 @@ } }, "workspace.shape.menu.delete" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:200" ], + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Delete", "fr" : "Supprimer", @@ -4249,7 +4081,7 @@ } }, "workspace.shape.menu.detach-instance" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:180", "src/app/main/ui/workspace/context_menu.cljs:190", "src/app/main/ui/workspace/sidebar/options/component.cljs:95", "src/app/main/ui/workspace/sidebar/options/component.cljs:100" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Detach instance", "fr" : "Détacher l’instance", @@ -4257,15 +4089,36 @@ } }, "workspace.shape.menu.duplicate" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:111" ], + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Duplicate", "fr" : "Dupliquer", "es" : "Duplicar" } }, + "workspace.shape.menu.edit" : { + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], + "translations" : { + "en" : "Edit", + "es" : "Editar" + } + }, + "workspace.shape.menu.flip-horizontal" : { + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], + "translations" : { + "en" : "Flip horizontal", + "es" : "Voltear horizontal" + } + }, + "workspace.shape.menu.flip-vertical" : { + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], + "translations" : { + "en" : "Flip vertical", + "es" : "Voltear vertical" + } + }, "workspace.shape.menu.forward" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:115" ], + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Bring forward", "fr" : "Avancer", @@ -4273,7 +4126,7 @@ } }, "workspace.shape.menu.front" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:118" ], + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Bring to front", "fr" : "Amener au premier plan", @@ -4281,7 +4134,7 @@ } }, "workspace.shape.menu.go-master" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:194", "src/app/main/ui/workspace/sidebar/options/component.cljs:102" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Go to master component file", "fr" : "Aller au fichier du composant principal", @@ -4289,7 +4142,7 @@ } }, "workspace.shape.menu.group" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:131" ], + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Group", "fr" : "Groupe", @@ -4297,7 +4150,7 @@ } }, "workspace.shape.menu.hide" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:154" ], + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Hide", "fr" : "Masquer", @@ -4305,7 +4158,7 @@ } }, "workspace.shape.menu.lock" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:160" ], + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Lock", "fr" : "Bloquer", @@ -4313,7 +4166,7 @@ } }, "workspace.shape.menu.mask" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:134", "src/app/main/ui/workspace/context_menu.cljs:147" ], + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Mask", "fr" : "Masque", @@ -4321,7 +4174,7 @@ } }, "workspace.shape.menu.paste" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:108", "src/app/main/ui/workspace/context_menu.cljs:209" ], + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Paste", "fr" : "Coller", @@ -4329,7 +4182,7 @@ } }, "workspace.shape.menu.reset-overrides" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:182", "src/app/main/ui/workspace/context_menu.cljs:192", "src/app/main/ui/workspace/sidebar/options/component.cljs:96", "src/app/main/ui/workspace/sidebar/options/component.cljs:101" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Reset overrides", "fr" : "Annuler les modifications", @@ -4337,7 +4190,7 @@ } }, "workspace.shape.menu.show" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:152" ], + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Show", "fr" : "Montrer", @@ -4345,7 +4198,7 @@ } }, "workspace.shape.menu.show-master" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:186", "src/app/main/ui/workspace/sidebar/options/component.cljs:98" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Show master component", "fr" : "Afficher le composant principal", @@ -4353,7 +4206,7 @@ } }, "workspace.shape.menu.ungroup" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:140" ], + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Ungroup", "fr" : "Dégrouper", @@ -4361,7 +4214,7 @@ } }, "workspace.shape.menu.unlock" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:158" ], + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Unlock", "fr" : "Débloquer", @@ -4369,7 +4222,7 @@ } }, "workspace.shape.menu.unmask" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:144" ], + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Unmask", "fr" : "Supprimer le masque", @@ -4377,7 +4230,7 @@ } }, "workspace.shape.menu.update-master" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:184", "src/app/main/ui/workspace/context_menu.cljs:196", "src/app/main/ui/workspace/sidebar/options/component.cljs:97", "src/app/main/ui/workspace/sidebar/options/component.cljs:103" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Update master component", "fr" : "Actualiser le composant principal", @@ -4385,24 +4238,15 @@ } }, "workspace.sidebar.history" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:122" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "History (%s)", "fr" : "Historique (%s)", "es" : "Historial (%s)" } }, - "workspace.sidebar.icons" : { - "translations" : { - "en" : "Icons", - "fr" : "Icône", - "ru" : "Иконки", - "es" : "Iconos" - }, - "unused" : true - }, "workspace.sidebar.layers" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:112" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Layers (%s)", "fr" : "Calques (%s)", @@ -4410,7 +4254,7 @@ } }, "workspace.sidebar.sitemap" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs:207" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs" ], "translations" : { "en" : "Pages", "fr" : "Pages", @@ -4419,7 +4263,7 @@ } }, "workspace.sitemap" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs:149" ], + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Sitemap", "fr" : "Plan du site", @@ -4428,7 +4272,7 @@ } }, "workspace.toolbar.assets" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:117" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Assets (%s)", "fr" : "Ressources (%s)", @@ -4437,7 +4281,7 @@ } }, "workspace.toolbar.color-palette" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:127" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Color Palette (%s)", "fr" : "Palette de couleurs (%s)", @@ -4446,7 +4290,7 @@ } }, "workspace.toolbar.comments" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:105" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Comments (%s)", "fr" : "Commentaires (%s)", @@ -4454,7 +4298,7 @@ } }, "workspace.toolbar.curve" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:94" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Curve (%s)", "fr" : "Courbe (%s)", @@ -4463,7 +4307,7 @@ } }, "workspace.toolbar.ellipse" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:81" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Ellipse (E)", "fr" : "Ellipse (E)", @@ -4472,7 +4316,7 @@ } }, "workspace.toolbar.frame" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:71" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Artboard (A)", "fr" : "Plan de travail (A)", @@ -4481,7 +4325,7 @@ } }, "workspace.toolbar.image" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:43" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Image (K)", "fr" : "Image (K)", @@ -4490,7 +4334,7 @@ } }, "workspace.toolbar.move" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:65" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Move", "fr" : "Déplacer", @@ -4499,7 +4343,7 @@ } }, "workspace.toolbar.path" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:99" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Path (P)", "fr" : "Chemin (P)", @@ -4508,7 +4352,7 @@ } }, "workspace.toolbar.rect" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:76" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Rectangle (R)", "fr" : "Rectangle (R)", @@ -4517,7 +4361,7 @@ } }, "workspace.toolbar.text" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs:86" ], + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Text (T)", "fr" : "Texte (T)", @@ -4526,7 +4370,7 @@ } }, "workspace.undo.empty" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs:293" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ], "translations" : { "en" : "There are no history changes so far", "fr" : "Il n’y a aucun changement dans l’historique pour l’instant", @@ -4534,7 +4378,7 @@ } }, "workspace.undo.entry.delete" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs:121" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ], "translations" : { "en" : "Deleted %s", "fr" : "Supprimé %s", @@ -4542,7 +4386,7 @@ } }, "workspace.undo.entry.modify" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs:120" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ], "translations" : { "en" : "Modified %s", "fr" : "Modifié %s", @@ -4550,7 +4394,7 @@ } }, "workspace.undo.entry.move" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs:122" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ], "translations" : { "en" : "Moved objects", "fr" : "Objets déplacés", @@ -4605,14 +4449,6 @@ }, "unused" : true }, - "workspace.undo.entry.multiple.image" : { - "translations" : { - "en" : "images", - "fr" : "images", - "es" : "imágenes" - }, - "unused" : true - }, "workspace.undo.entry.multiple.media" : { "translations" : { "en" : "graphic assets", @@ -4678,7 +4514,7 @@ "unused" : true }, "workspace.undo.entry.new" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs:119" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ], "translations" : { "en" : "New %s", "fr" : "Nouveau %s", @@ -4806,7 +4642,7 @@ "unused" : true }, "workspace.undo.entry.unknown" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs:123" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ], "translations" : { "en" : "Operation over %s", "fr" : "Opération sur %s", @@ -4814,7 +4650,7 @@ } }, "workspace.undo.title" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs:289" ], + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ], "translations" : { "en" : "History", "fr" : "Historique", @@ -4822,7 +4658,7 @@ } }, "workspace.updates.dismiss" : { - "used-in" : [ "src/app/main/data/workspace/libraries.cljs:690" ], + "used-in" : [ "src/app/main/data/workspace/libraries.cljs" ], "translations" : { "en" : "Dismiss", "fr" : "Ignorer", @@ -4831,7 +4667,7 @@ } }, "workspace.updates.there-are-updates" : { - "used-in" : [ "src/app/main/data/workspace/libraries.cljs:686" ], + "used-in" : [ "src/app/main/data/workspace/libraries.cljs" ], "translations" : { "en" : "There are updates in shared libraries", "fr" : "Il y a des mises à jour dans les Bibliothèques Partagées", @@ -4840,7 +4676,7 @@ } }, "workspace.updates.update" : { - "used-in" : [ "src/app/main/data/workspace/libraries.cljs:688" ], + "used-in" : [ "src/app/main/data/workspace/libraries.cljs" ], "translations" : { "en" : "Update", "fr" : "Actualiser", @@ -4856,25 +4692,5 @@ "es" : "Pulsar para cerrar la ruta" }, "unused" : true - }, - "workspace.shape.menu.flip-horizontal" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:146" ], - "translations" : { - "en" : "Flip horizontal", - "es" : "Voltear horizontal" - } - }, - "workspace.shape.menu.flip-vertical" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs:143" ], - "translations" : { - "en" : "Flip vertical", - "es" : "Voltear vertical" - } - }, - "workspace.shape.menu.edit" : { - "translations" : { - "en" : "Edit", - "es" : "Editar" - } } } From 800f97c5a180325c1aee0790fbb17f4765cf1c73 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 17 Feb 2021 10:51:30 +0100 Subject: [PATCH 26/90] :fire: Remove unused sql code. --- backend/src/app/migrations/sql/0044-add-storage-refcount.sql | 3 --- 1 file changed, 3 deletions(-) diff --git a/backend/src/app/migrations/sql/0044-add-storage-refcount.sql b/backend/src/app/migrations/sql/0044-add-storage-refcount.sql index 28f97548c..ecb95e9e7 100644 --- a/backend/src/app/migrations/sql/0044-add-storage-refcount.sql +++ b/backend/src/app/migrations/sql/0044-add-storage-refcount.sql @@ -5,9 +5,6 @@ CREATE INDEX storage_object__id_touched_at__idx ON storage_object (touched_at, id) WHERE touched_at IS NOT NULL; --- DROP TRIGGER file_media_object__on_delete__tgr ON file_media_object CASCADE; --- DROP FUNCTION on_delete_file_media_object () ; - CREATE OR REPLACE FUNCTION on_delete_file_media_object() RETURNS TRIGGER AS $func$ BEGIN From e3bad997fde53ed93fdf56af7ee7de06a911d156 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 17 Feb 2021 16:52:04 +0100 Subject: [PATCH 27/90] :sparkles: Port fixes from google oauth handlers to github and gitlab. --- backend/src/app/http/auth/github.clj | 89 +++++++++++++-------------- backend/src/app/http/auth/gitlab.clj | 92 ++++++++++++++-------------- backend/src/app/http/auth/google.clj | 18 +++--- 3 files changed, 100 insertions(+), 99 deletions(-) diff --git a/backend/src/app/http/auth/github.clj b/backend/src/app/http/auth/github.clj index 26753bc05..3d8552efa 100644 --- a/backend/src/app/http/auth/github.clj +++ b/backend/src/app/http/auth/github.clj @@ -12,6 +12,7 @@ [app.common.exceptions :as ex] [app.common.spec :as us] [app.config :as cfg] + [app.http.auth.google :as gg] [app.util.http :as http] [app.util.time :as dt] [clojure.data.json :as json] @@ -67,7 +68,7 @@ nil))) (defn- get-user-info - [token] + [_ token] (try (let [req {:uri (str user-info-url) :headers {"authorization" (str "token " token)} @@ -77,58 +78,56 @@ (when (= 200 (:status res)) (let [data (json/read-str (:body res))] {:email (get data "email") + :backend "github" :fullname (get data "name")}))) (catch Exception e (log/error e "unexpected exception on get-user-info") nil))) -(defn auth - [{:keys [tokens] :as cfg} _request] - (let [state (tokens :generate {:iss :github-oauth :exp (dt/in-future "15m")}) - params {:client_id (:client-id cfg/config) - :redirect_uri (build-redirect-url cfg) - :state state - :scope scope} - query (u/map->query-string params) - uri (-> authorize-uri - (assoc :query query))] +(defn- retrieve-info + [{:keys [tokens] :as cfg} request] + (let [token (get-in request [:params :state]) + state (tokens :verify {:token token :iss :github-oauth}) + info (some->> (get-in request [:params :code]) + (get-access-token cfg state) + (get-user-info cfg))] + (when-not info + (ex/raise :type :internal + :code :unable-to-auth)) + + (cond-> info + (some? (:invitation-token state)) + (assoc :invitation-token (:invitation-token state))))) + +(defn auth-handler + [{:keys [tokens] :as cfg} request] + (let [invitation (get-in request [:params :invitation-token]) + state (tokens :generate {:iss :github-oauth + :invitation-token invitation + :exp (dt/in-future "15m")}) + params {:client_id (:client-id cfg/config) + :redirect_uri (build-redirect-url cfg) + :state state + :scope scope} + query (u/map->query-string params) + uri (-> authorize-uri + (assoc :query query))] {:status 200 :body {:redirect-uri (str uri)}})) -(defn callback - [{:keys [tokens rpc session] :as cfg} request] +(defn- callback-handler + [{:keys [session] :as cfg} request] (try - (let [state (get-in request [:params :state]) - _ (tokens :verify {:token state :iss :github-oauth}) - info (some->> (get-in request [:params :code]) - (get-access-token cfg state) - (get-user-info)) - - _ (when-not info - (ex/raise :type :internal - :code :unable-to-auth)) - - method-fn (get-in rpc [:methods :mutation :login-or-register]) - profile (method-fn {:email (:email info) - :backend "github" - :fullname (:fullname info)}) - token (tokens :generate - {:iss :auth - :exp (dt/in-future "15m") - :profile-id (:id profile)}) - uri (-> (u/uri (:public-uri cfg/config)) - (assoc :path "/#/auth/verify-token") - (assoc :query (u/map->query-string {:token token}))) - sxf ((:create session) (:id profile)) - rsp {:status 302 :headers {"location" (str uri)} :body ""}] - (sxf request rsp)) + (let [info (retrieve-info cfg request) + profile (gg/register-profile cfg info) + uri (gg/generate-redirect-uri cfg profile) + sxf ((:create session) (:id profile))] + (->> (gg/redirect-response uri) + (sxf request))) (catch Exception _e - (let [uri (-> (u/uri (:public-uri cfg)) - (assoc :path "/#/auth/login") - (assoc :query (u/map->query-string {:error "unable-to-auth"})))] - {:status 302 - :headers {"location" (str uri)} - :body ""})))) + (-> (gg/generate-error-redirect-uri cfg) + (gg/redirect-response))))) + ;; --- ENTRY POINT @@ -153,8 +152,8 @@ [_ cfg] (if (and (:client-id cfg) (:client-secret cfg)) - {:auth-handler #(auth cfg %) - :callback-handler #(callback cfg %)} + {:auth-handler #(auth-handler cfg %) + :callback-handler #(callback-handler cfg %)} {:auth-handler default-handler :callback-handler default-handler})) diff --git a/backend/src/app/http/auth/gitlab.clj b/backend/src/app/http/auth/gitlab.clj index f253016b0..e932dfdba 100644 --- a/backend/src/app/http/auth/gitlab.clj +++ b/backend/src/app/http/auth/gitlab.clj @@ -12,6 +12,7 @@ [app.common.data :as d] [app.common.exceptions :as ex] [app.common.spec :as us] + [app.http.auth.google :as gg] [app.util.http :as http] [app.util.time :as dt] [clojure.data.json :as json] @@ -76,62 +77,61 @@ (when (= 200 (:status res)) (let [data (json/read-str (:body res))] {:email (get data "email") + :backend "gitlab" :fullname (get data "name")}))) (catch Exception e (log/error e "unexpected exception on get-user-info") nil))) -(defn auth - [{:keys [tokens] :as cfg} _request] - (let [token (tokens :generate {:iss :gitlab-oauth - :exp (dt/in-future "15m")}) - params {:client_id (:client-id cfg) - :redirect_uri (build-redirect-url cfg) - :response_type "code" - :state token - :scope scope} - query (u/map->query-string params) - uri (-> (build-oauth-uri cfg) - (assoc :query query))] +(defn- retrieve-info + [{:keys [tokens] :as cfg} request] + (let [token (get-in request [:params :state]) + state (tokens :verify {:token token :iss :gitlab-oauth}) + info (some->> (get-in request [:params :code]) + (get-access-token cfg) + (get-user-info cfg))] + (when-not info + (ex/raise :type :internal + :code :unable-to-auth)) + + (cond-> info + (some? (:invitation-token state)) + (assoc :invitation-token (:invitation-token state))))) + + +(defn- auth-handler + [{:keys [tokens] :as cfg} request] + (let [invitation (get-in request [:params :invitation-token]) + state (tokens :generate + {:iss :gitlab-oauth + :invitation-token invitation + :exp (dt/in-future "15m")}) + + params {:client_id (:client-id cfg) + :redirect_uri (build-redirect-url cfg) + :response_type "code" + :state state + :scope scope} + query (u/map->query-string params) + uri (-> (build-oauth-uri cfg) + (assoc :query query))] {:status 200 :body {:redirect-uri (str uri)}})) -(defn callback - [{:keys [tokens rpc session] :as cfg} request] +(defn- callback-handler + [{:keys [session] :as cfg} request] (try - (let [token (get-in request [:params :state]) - _ (tokens :verify {:token token :iss :gitlab-oauth}) - info (some->> (get-in request [:params :code]) - (get-access-token cfg) - (get-user-info cfg)) - _ (when-not info - (ex/raise :type :internal - :code :unable-to-auth)) - - method-fn (get-in rpc [:methods :mutation :login-or-register]) - profile (method-fn {:email (:email info) - :backend "gitlab" - :fullname (:fullname info)}) - token (tokens :generate {:iss :auth - :exp (dt/in-future "15m") - :profile-id (:id profile)}) - - uri (-> (u/uri (:public-uri cfg)) - (assoc :path "/#/auth/verify-token") - (assoc :query (u/map->query-string {:token token}))) - - sxf ((:create session) (:id profile)) - rsp {:status 302 :headers {"location" (str uri)} :body ""}] - (sxf request rsp)) + (let [info (retrieve-info cfg request) + profile (gg/register-profile cfg info) + uri (gg/generate-redirect-uri cfg profile) + sxf ((:create session) (:id profile))] + (->> (gg/redirect-response uri) + (sxf request))) (catch Exception _e - (let [uri (-> (u/uri (:public-uri cfg)) - (assoc :path "/#/auth/login") - (assoc :query (u/map->query-string {:error "unable-to-auth"})))] - {:status 302 - :headers {"location" (str uri)} - :body ""})))) + (-> (gg/generate-error-redirect-uri cfg) + (gg/redirect-response))))) (s/def ::client-id ::us/not-empty-string) (s/def ::client-secret ::us/not-empty-string) @@ -162,7 +162,7 @@ [_ cfg] (if (and (:client-id cfg) (:client-secret cfg)) - {:auth-handler #(auth cfg %) - :callback-handler #(callback cfg %)} + {:auth-handler #(auth-handler cfg %) + :callback-handler #(callback-handler cfg %)} {:auth-handler default-handler :callback-handler default-handler})) diff --git a/backend/src/app/http/auth/google.clj b/backend/src/app/http/auth/google.clj index be6a0e5fe..3f082d064 100644 --- a/backend/src/app/http/auth/google.clj +++ b/backend/src/app/http/auth/google.clj @@ -56,7 +56,7 @@ nil))) (defn- get-user-info - [token] + [_ token] (try (let [req {:uri "https://openidconnect.googleapis.com/v1/userinfo" :headers {"Authorization" (str "Bearer " token)} @@ -65,6 +65,7 @@ (when (= 200 (:status res)) (let [data (json/read-str (:body res))] {:email (get data "email") + :backend "google" :fullname (get data "name")}))) (catch Exception e (log/error e "unexpected exception on get-user-info") @@ -76,7 +77,7 @@ state (tokens :verify {:token token :iss :google-oauth}) info (some->> (get-in request [:params :code]) (get-access-token cfg) - (get-user-info))] + (get-user-info cfg))] (when-not info (ex/raise :type :internal :code :unable-to-auth)) @@ -85,17 +86,17 @@ (some? (:invitation-token state)) (assoc :invitation-token (:invitation-token state))))) -(defn- register-profile +(defn register-profile [{:keys [rpc] :as cfg} info] (let [method-fn (get-in rpc [:methods :mutation :login-or-register]) profile (method-fn {:email (:email info) - :backend "google" + :backend (:backend info) :fullname (:fullname info)})] (cond-> profile (some? (:invitation-token info)) (assoc :invitation-token (:invitation-token info))))) -(defn- generate-redirect-uri +(defn generate-redirect-uri [{:keys [tokens] :as cfg} profile] (let [token (or (:invitation-token profile) (tokens :generate {:iss :auth @@ -105,13 +106,13 @@ (assoc :path "/#/auth/verify-token") (assoc :query (u/map->query-string {:token token}))))) -(defn- generate-error-redirect-uri +(defn generate-error-redirect-uri [cfg] (-> (u/uri (:public-uri cfg)) (assoc :path "/#/auth/login") (assoc :query (u/map->query-string {:error "unable-to-auth"})))) -(defn- redirect-response +(defn redirect-response [uri] {:status 302 :headers {"location" (str uri)} @@ -145,7 +146,8 @@ profile (register-profile cfg info) uri (generate-redirect-uri cfg profile) sxf ((:create session) (:id profile))] - (sxf request (redirect-response uri))) + (->> (redirect-response uri) + (sxf request))) (catch Exception _e (-> (generate-error-redirect-uri cfg) (redirect-response))))) From 1ad1f3eb330d0b776946d5197414a36cd6b06a95 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 17 Feb 2021 16:58:31 +0100 Subject: [PATCH 28/90] :sparkles: Add missing default config for zmq listener. --- backend/resources/log4j2.xml | 1 - backend/src/app/config.clj | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/resources/log4j2.xml b/backend/resources/log4j2.xml index 8830df725..a490272d0 100644 --- a/backend/resources/log4j2.xml +++ b/backend/resources/log4j2.xml @@ -35,7 +35,6 @@ - diff --git a/backend/src/app/config.clj b/backend/src/app/config.clj index 00a296c13..03822fa15 100644 --- a/backend/src/app/config.clj +++ b/backend/src/app/config.clj @@ -29,6 +29,8 @@ :default-blob-version 1 + :loggers-zmq-uri "tcp://localhost:45556" + :asserts-enabled false :public-uri "http://localhost:3449" From 1d01ac72baced0aaaa7d0aca706e197b1287c2bc Mon Sep 17 00:00:00 2001 From: elhombretecla Date: Thu, 18 Feb 2021 11:32:44 +0100 Subject: [PATCH 29/90] :tada: Reduce tools space between --- frontend/resources/styles/main/partials/left-toolbar.scss | 5 ++--- .../resources/styles/main/partials/workspace-header.scss | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/resources/styles/main/partials/left-toolbar.scss b/frontend/resources/styles/main/partials/left-toolbar.scss index 1fab2b9b3..1385bfc92 100644 --- a/frontend/resources/styles/main/partials/left-toolbar.scss +++ b/frontend/resources/styles/main/partials/left-toolbar.scss @@ -42,14 +42,13 @@ $width-left-toolbar: 48px; flex-shrink: 0; height: 48px; justify-content: center; - margin: $x-small 0; position: relative; width: 48px; svg { fill: $color-gray-20; - height: 18px; - width: 18px; + height: 16px; + width: 16px; } &:hover { diff --git a/frontend/resources/styles/main/partials/workspace-header.scss b/frontend/resources/styles/main/partials/workspace-header.scss index b1def9cf0..6fd1cd7e3 100644 --- a/frontend/resources/styles/main/partials/workspace-header.scss +++ b/frontend/resources/styles/main/partials/workspace-header.scss @@ -21,6 +21,7 @@ .main-icon { align-items: center; background-color: $color-gray-60; + border-bottom: 1px solid $color-gray-50; cursor: pointer; display: flex; height: 100%; From b2f8a843b5c536dd3bec55fc5f115e71deb67014 Mon Sep 17 00:00:00 2001 From: Stas Haas Date: Tue, 16 Feb 2021 18:06:09 +0100 Subject: [PATCH 30/90] :sparkles: Add more artboard presets. Signed-off-by: Stas Haas --- .../ui/workspace/sidebar/options/frame.cljs | 118 +++++++++++++++++- 1 file changed, 112 insertions(+), 6 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/frame.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/frame.cljs index 1288fe3e3..5c7440920 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/frame.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/frame.cljs @@ -133,13 +133,25 @@ (def +size-presets+ [{:name "APPLE"} - {:name "iPhone X" + {:name "iPhone 12/12 Pro" + :width 390 + :height 844} + {:name "iPhone 12 Mini" + :width 360 + :height 780} + {:name "iPhone 12 Pro Max" + :width 428 + :height 926} + {:name "iPhone X/XS/11 Pro" :width 375 :height 812} + {:name "iPhone XS Max/XR/11/11 Pro Max" + :width 414 + :height 896} {:name "iPhone 6/7/8 Plus" :width 414 :height 736} - {:name "iPhone 6/7/8" + {:name "iPhone 6/7/8/SE2" :width 375 :height 667} {:name "iPhone 5/SE" @@ -154,26 +166,41 @@ {:name "iPad Pro 12.9in" :width 1024 :height 1366} + {:name "Watch 44mm" + :width 368 + :height 448} {:name "Watch 42mm" :width 312 :height 390} + {:name "Watch 40mm" + :width 324 + :height 394} {:name "Watch 38mm" :width 272 :height 340} - {:name "GOOGLE"} - {:name "Android mobile" + {:name "ANDROID"} + {:name "Mobile" :width 360 :height 640} - {:name "Android tablet" + {:name "Tablet" :width 768 :height 1024} + {:name "Google Pixel 4a/5" + :width 393 + :height 851} + {:name "Samsung Galaxy S20+/S21 Ultra" + :width 384 + :height 854} + {:name "Samsung Galaxy A71/A51" + :width 412 + :height 914} {:name "MICROSOFT"} {:name "Surface Pro 3" :width 1440 :height 960} - {:name "Surface Pro 4" + {:name "Surface Pro 4/5/6/7" :width 1368 :height 912} @@ -184,9 +211,88 @@ {:name "Web 1366" :width 1366 :height 768} + {:name "Web 1024" + :width 1024 + :height 768} {:name "Web 1920" :width 1920 :height 1080} + + {:name "PRINT (72dpi)"} + {:name "A0" + :width 2384 + :height 3370} + {:name "A1" + :width 1684 + :height 2384} + {:name "A2" + :width 1191 + :height 1684} + {:name "A3" + :width 842 + :height 1191} + {:name "A4" + :width 595 + :height 842} + {:name "A5" + :width 420 + :height 595} + {:name "A6" + :width 297 + :height 420} + {:name "Letter" + :width 612 + :height 792} + {:name "DIN Lang" + :width 595 + :height 281} + + {:name "SOCIAL MEDIA"} + {:name "Instagram profile" + :width 320 + :height 320} + {:name "Instagram post" + :width 1080 + :height 1080} + {:name "Instagram story" + :width 1080 + :height 1920} + {:name "Facebook profile" + :width 720 + :height 720} + {:name "Facebook cover" + :width 820 + :height 312} + {:name "Facebook post" + :width 1200 + :height 630} + {:name "LinkedIn profile" + :width 400 + :height 400} + {:name "LinkedIn cover" + :width 1584 + :height 396} + {:name "LinkedIn post" + :width 1200 + :height 627} + {:name "Twitter profile" + :width 400 + :height 400} + {:name "Twitter header" + :width 1500 + :height 500} + {:name "Twitter post" + :width 1024 + :height 512} + {:name "Youtube profile" + :width 800 + :height 800} + {:name "Youtube banner" + :width 2560 + :height 1440} + {:name "Youtube thumb" + :width 1280 + :height 720} ]) (mf/defc options From f7ecd4880ffad75f60691dd4a2f4528e863327a3 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 18 Feb 2021 14:37:54 +0100 Subject: [PATCH 31/90] :paperclip: Update changelog. --- CHANGES.md | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index e7b8809af..135151c4b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,10 +4,11 @@ ### :sparkles: New features -- Add major refactor of internal pubsub/redis code; improves scalability and performance #640 -- Add optional loki integration. -- Add emailcatcher and ldap test containers to devenv. #506 -- Bounce & Complaint handling. +- Add major refactor of internal pubsub/redis code; improves scalability and performance [#640](https://github.com/penpot/penpot/pull/640) +- Add optional loki integration [#645](https://github.com/penpot/penpot/pull/645) +- Add emailcatcher and ldap test containers to devenv. [#506](https://github.com/penpot/penpot/pull/506) +- Add more presets for artboard [#654](https://github.com/penpot/penpot/pull/654) +- Bounce & Complaint handling [#635](https://github.com/penpot/penpot/pull/635) - Disable groups interactions when holding "Ctrl" key (deep selection) - New action in context menu to "edit" some shapes (binded to key "Enter") @@ -21,7 +22,13 @@ - Properly handle errors on github, gitlab and ldap auth backends. - Properly mark profile auth backend (on first register/ auth with 3rd party auth provider). - Fix corner cases on invitation/signup flows. -- Add more improvements to french translation strings. +- Add more improvements to french translation strings [#591](https://github.com/penpot/penpot/pull/591) + + +### :heart: Community contributions by (Thank you!) + +- girafic [#538](https://github.com/penpot/penpot/pull/654) +- arkhi [#591](https://github.com/penpot/penpot/pull/591) ## 1.2.0-alpha From 344a7dfbaa67c427210449926bf043e5743019c0 Mon Sep 17 00:00:00 2001 From: Maemolee Date: Thu, 18 Feb 2021 17:32:39 +0800 Subject: [PATCH 32/90] :sparkles: Update locales.json file. Add some Simplified Chinese translations. --- frontend/resources/locales.json | 93 ++++++++++++++++++++++----------- 1 file changed, 62 insertions(+), 31 deletions(-) diff --git a/frontend/resources/locales.json b/frontend/resources/locales.json index 8b004f47c..e3c5debcc 100644 --- a/frontend/resources/locales.json +++ b/frontend/resources/locales.json @@ -5,14 +5,16 @@ "en" : "Already have an account?", "fr" : "Vous avez déjà un compte ?", "ru" : "Уже есть аккаунт?", - "es" : "¿Tienes ya una cuenta?" + "es" : "¿Tienes ya una cuenta?", + "zh_cn" : "已经有账号了？" } }, "auth.check-your-email" : { "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { "en" : "Check your email and click on the link to verify and start using Penpot.", - "fr" : "Vérifiez votre e‑mail et cliquez sur le lien pour vérifier et commencer à utiliser Penpot." + "fr" : "Vérifiez votre e‑mail et cliquez sur le lien pour vérifier et commencer à utiliser Penpot.", + "zh_cn" : "请检查你的电子邮箱，点击邮件中的超链接来验证，然后开始使用Penpot。" } }, "auth.confirm-password" : { @@ -21,7 +23,8 @@ "en" : "Confirm password", "fr" : "Confirmez le mot de passe", "ru" : "Подтвердите пароль", - "es" : "Confirmar contraseña" + "es" : "Confirmar contraseña", + "zh_cn" : "确认密码" } }, "auth.create-demo-account" : { @@ -30,7 +33,8 @@ "en" : "Create demo account", "fr" : "Créer un compte de démonstration", "ru" : "Хотите попробовать?", - "es" : "Crear cuanta de prueba" + "es" : "Crear cuanta de prueba", + "zh_cn" : "创建演示账号" } }, "auth.create-demo-profile" : { @@ -39,7 +43,8 @@ "en" : "Just wanna try it?", "fr" : "Vous voulez juste essayer ?", "ru" : "Хотите попробовать?", - "es" : "¿Quieres probar?" + "es" : "¿Quieres probar?", + "zh_cn" : "只是想试试？" } }, "auth.demo-warning" : { @@ -48,7 +53,8 @@ "en" : "This is a DEMO service, DO NOT USE for real work, the projects will be periodicaly wiped.", "fr" : "Il s’agit d’un service DEMO, NE PAS UTILISER pour un travail réel, les projets seront périodiquement supprimés.", "ru" : "Это ДЕМОНСТРАЦИЯ, НЕ ИСПОЛЬЗУЙТЕ для работы, проекты будут периодически удаляться.", - "es" : "Este es un servicio de DEMOSTRACIÓN. NO USAR para trabajo real, los proyectos serán borrados periodicamente." + "es" : "Este es un servicio de DEMOSTRACIÓN. NO USAR para trabajo real, los proyectos serán borrados periodicamente.", + "zh_cn" : "这是一个演示服务，请【不要】用于真实工作，这些项目将被周期性地抹除。" } }, "auth.email" : { @@ -57,7 +63,8 @@ "en" : "Email", "fr" : "Adresse e‑mail", "ru" : "Email", - "es" : "Correo electrónico" + "es" : "Correo electrónico", + "zh_cn" : "电子邮件" } }, "auth.forgot-password" : { @@ -66,7 +73,8 @@ "en" : "Forgot password?", "fr" : "Mot de passe oublié ?", "ru" : "Забыли пароль?", - "es" : "¿Olvidaste tu contraseña?" + "es" : "¿Olvidaste tu contraseña?", + "zh_cn" : "忘记密码？" } }, "auth.fullname" : { @@ -75,7 +83,8 @@ "en" : "Full Name", "fr" : "Nom complet", "ru" : "Полное имя", - "es" : "Nombre completo" + "es" : "Nombre completo", + "zh_cn" : "全名" } }, "auth.go-back-to-login" : { @@ -84,7 +93,8 @@ "en" : "Go back!", "fr" : "Retour !", "ru" : "Назад!", - "es" : "Volver" + "es" : "Volver", + "zh_cn" : "返回！" } }, "auth.login-here" : { @@ -93,7 +103,8 @@ "en" : "Login here", "fr" : "Se connecter ici", "ru" : "Войти здесь", - "es" : "Entra aquí" + "es" : "Entra aquí", + "zh_cn" : "在这里登录" } }, "auth.login-submit" : { @@ -102,7 +113,8 @@ "en" : "Sign in", "fr" : "Se connecter", "ru" : "Вход", - "es" : "Entrar" + "es" : "Entrar", + "zh_cn" : "登录" } }, "auth.login-subtitle" : { @@ -111,7 +123,8 @@ "en" : "Enter your details below", "fr" : "Entrez vos informations ci‑dessous", "ru" : "Введите информацию о себе ниже", - "es" : "Introduce tus datos aquí" + "es" : "Introduce tus datos aquí", + "zh_cn" : "请在下面输入你的详细信息" } }, "auth.login-title" : { @@ -120,7 +133,8 @@ "en" : "Great to see you again!", "fr" : "Ravi de vous revoir !", "ru" : "Рады видеть Вас снова!", - "es" : "Encantados de volverte a ver" + "es" : "Encantados de volverte a ver", + "zh_cn" : "很高兴又见到你！" } }, "auth.login-with-github-submit" : { @@ -129,7 +143,8 @@ "en" : "Login with Github", "fr" : "Se connecter via Github", "ru" : "Вход через Gitnub", - "es" : "Entrar con Github" + "es" : "Entrar con Github", + "zh_cn" : "使用Github登录" } }, "auth.login-with-gitlab-submit" : { @@ -138,7 +153,8 @@ "en" : "Login with Gitlab", "fr" : "Se connecter via Gitlab", "ru" : "Вход через Gitlab", - "es" : "Entrar con Gitlab" + "es" : "Entrar con Gitlab", + "zh_cn" : "使用Gitlab登录" } }, "auth.login-with-ldap-submit" : { @@ -147,7 +163,8 @@ "en" : "Sign in with LDAP", "fr" : "Se connecter via LDAP", "ru" : "Вход через LDAP", - "es" : "Entrar con LDAP" + "es" : "Entrar con LDAP", + "zh_cn" : "使用LDAP登录" } }, "auth.new-password" : { @@ -156,7 +173,8 @@ "en" : "Type a new password", "fr" : "Saisissez un nouveau mot de passe", "ru" : "Введите новый пароль", - "es" : "Introduce la nueva contraseña" + "es" : "Introduce la nueva contraseña", + "zh_cn" : "输入新的密码" } }, "auth.notifications.invalid-token-error" : { @@ -165,7 +183,8 @@ "en" : "The recovery token is invalid.", "fr" : "Le code de récupération n’est pas valide.", "ru" : "Неверный код восстановления.", - "es" : "El código de recuperación no es válido." + "es" : "El código de recuperación no es válido.", + "zh_cn" : "恢复令牌无效。" } }, "auth.notifications.password-changed-succesfully" : { @@ -174,7 +193,8 @@ "en" : "Password successfully changed", "fr" : "Mot de passe changé avec succès", "ru" : "Пароль изменен успешно", - "es" : "La contraseña ha sido cambiada" + "es" : "La contraseña ha sido cambiada", + "zh_cn" : "密码修改成功" } }, "auth.notifications.profile-not-verified" : { @@ -182,7 +202,8 @@ "translations" : { "en" : "Profile is not verified, please verify profile before continue.", "fr" : "Le profil n’est pas vérifié. Veuillez vérifier le profil avant de continuer.", - "es" : "El perfil aun no ha sido verificado, por favor valida el perfil antes de continuar." + "es" : "El perfil aun no ha sido verificado, por favor valida el perfil antes de continuar.", + "zh_cn" : "个人资料未验证，请于验证后继续。" } }, "auth.notifications.recovery-token-sent" : { @@ -191,7 +212,8 @@ "en" : "Password recovery link sent to your inbox.", "fr" : "Lien de récupération de mot de passe envoyé.", "ru" : "Ссылка для восстановления пароля отправлена на почту.", - "es" : "Hemos enviado a tu buzón un enlace para recuperar tu contraseña." + "es" : "Hemos enviado a tu buzón un enlace para recuperar tu contraseña.", + "zh_cn" : "找回密码链接已发至你的收件箱。" } }, "auth.notifications.team-invitation-accepted" : { @@ -199,7 +221,8 @@ "translations" : { "en" : "Joined the team succesfully", "fr" : "Vous avez rejoint l’équipe avec succès", - "es" : "Te uniste al equipo" + "es" : "Te uniste al equipo", + "zh_cn" : "成功加入团队" } }, "auth.password" : { @@ -208,7 +231,8 @@ "en" : "Password", "fr" : "Mot de passe", "ru" : "Пароль", - "es" : "Contraseña" + "es" : "Contraseña", + "zh_cn" : "密码" } }, "auth.password-length-hint" : { @@ -217,7 +241,8 @@ "en" : "At least 8 characters", "fr" : "Au moins 8 caractères", "ru" : "Минимум 8 символов", - "es" : "8 caracteres como mínimo" + "es" : "8 caracteres como mínimo", + "zh_cn" : "至少8位字符" } }, "auth.recovery-request-submit" : { @@ -226,7 +251,8 @@ "en" : "Recover Password", "fr" : "Récupérer le mot de passe", "ru" : "Восстановить пароль", - "es" : "Recuperar contraseña" + "es" : "Recuperar contraseña", + "zh_cn" : "找回密码" } }, "auth.recovery-request-subtitle" : { @@ -235,7 +261,8 @@ "en" : "We'll send you an email with instructions", "fr" : "Nous vous enverrons un e‑mail avec des instructions", "ru" : "Письмо с инструкциями отправлено на почту.", - "es" : "Te enviaremos un correo electrónico con instrucciones" + "es" : "Te enviaremos un correo electrónico con instrucciones", + "zh_cn" : "我们将给你发送一封带有说明的电子邮件" } }, "auth.recovery-request-title" : { @@ -244,7 +271,8 @@ "en" : "Forgot password?", "fr" : "Mot de passe oublié ?", "ru" : "Забыли пароль?", - "es" : "¿Olvidaste tu contraseña?" + "es" : "¿Olvidaste tu contraseña?", + "zh_cn" : "忘记密码？" } }, "auth.recovery-submit" : { @@ -253,7 +281,8 @@ "en" : "Change your password", "fr" : "Changez votre mot de passe", "ru" : "Изменить пароль", - "es" : "Cambiar tu contraseña" + "es" : "Cambiar tu contraseña", + "zh_cn" : "修改密码" } }, "auth.register" : { @@ -262,7 +291,8 @@ "en" : "No account yet?", "fr" : "Pas encore de compte ?", "ru" : "Еще нет аккаунта?", - "es" : "¿No tienes una cuenta?" + "es" : "¿No tienes una cuenta?", + "zh_cn" : "现在还没有账户？" } }, "auth.register-submit" : { @@ -271,7 +301,8 @@ "en" : "Create an account", "fr" : "Créer un compte", "ru" : "Создать аккаунт", - "es" : "Crear una cuenta" + "es" : "Crear una cuenta", + "zh_cn" : "创建账户" } }, "auth.register-subtitle" : { From 299b29b66f2dd8cb9ac071a7ce5e058715310d18 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 18 Feb 2021 16:38:31 +0100 Subject: [PATCH 33/90] :tada: Add browser language detection. --- backend/src/app/rpc/mutations/profile.clj | 2 +- frontend/src/app/main.cljs | 4 + frontend/src/app/main/data/auth.cljs | 2 +- frontend/src/app/main/data/users.cljs | 79 +++++++++---------- .../src/app/main/ui/settings/options.cljs | 14 ++-- frontend/src/app/util/i18n.cljs | 60 +++++++++++--- 6 files changed, 102 insertions(+), 59 deletions(-) diff --git a/backend/src/app/rpc/mutations/profile.clj b/backend/src/app/rpc/mutations/profile.clj index 09a21079d..4ea7d0c8b 100644 --- a/backend/src/app/rpc/mutations/profile.clj +++ b/backend/src/app/rpc/mutations/profile.clj @@ -33,7 +33,7 @@ (s/def ::email ::us/email) (s/def ::fullname ::us/not-empty-string) -(s/def ::lang ::us/not-empty-string) +(s/def ::lang (s/nilable ::us/not-empty-string)) (s/def ::path ::us/string) (s/def ::profile-id ::us/uuid) (s/def ::password ::us/not-empty-string) diff --git a/frontend/src/app/main.cljs b/frontend/src/app/main.cljs index 883e96c93..23ae18fb4 100644 --- a/frontend/src/app/main.cljs +++ b/frontend/src/app/main.cljs @@ -99,6 +99,10 @@ (mf/unmount (dom/get-element "modal")) (init-ui)) +(add-watch i18n/locale "locale" (fn [_ _ o v] + (when (not= o v) + (reinit)))) + (defn ^:dev/after-load after-load [] (reinit)) diff --git a/frontend/src/app/main/data/auth.cljs b/frontend/src/app/main/data/auth.cljs index 5ef0ab07b..8c4871dca 100644 --- a/frontend/src/app/main/data/auth.cljs +++ b/frontend/src/app/main/data/auth.cljs @@ -119,7 +119,7 @@ ptk/EffectEvent (effect [_ state s] (reset! storage {}) - (i18n/set-default-locale!)))) + (i18n/reset-locale)))) (defn logout [] diff --git a/frontend/src/app/main/data/users.cljs b/frontend/src/app/main/data/users.cljs index 1630aa492..8490095c2 100644 --- a/frontend/src/app/main/data/users.cljs +++ b/frontend/src/app/main/data/users.cljs @@ -32,7 +32,7 @@ (s/def ::fullname ::us/string) (s/def ::email ::us/email) (s/def ::password ::us/string) -(s/def ::lang ::us/string) +(s/def ::lang (s/nilable ::us/string)) (s/def ::theme ::us/string) (s/def ::created-at ::us/inst) (s/def ::password-1 ::us/string) @@ -50,43 +50,36 @@ ;; --- Profile Fetched (defn profile-fetched - ([data] (profile-fetched nil data)) - ([on-success {:keys [fullname] :as data}] - (us/verify ::profile data) - (ptk/reify ::profile-fetched - ptk/UpdateEvent - (update [_ state] - (assoc state :profile - (cond-> data - (nil? (:lang data)) - (assoc :lang cfg/default-language) + [{:keys [fullname] :as data}] + (us/verify ::profile data) + (ptk/reify ::profile-fetched + ptk/UpdateEvent + (update [_ state] + (assoc state :profile + (cond-> data + (nil? (:theme data)) + (assoc :theme cfg/default-theme)))) - (nil? (:theme data)) - (assoc :theme cfg/default-theme)))) - - ptk/EffectEvent - (effect [_ state stream] - (let [profile (:profile state)] - (swap! storage assoc :profile profile) - (i18n/set-current-locale! (:lang profile)) - (theme/set-current-theme! (:theme profile)) - (when on-success - (on-success))))))) + ptk/EffectEvent + (effect [_ state stream] + (let [profile (:profile state)] + (swap! storage assoc :profile profile) + (i18n/set-locale! (:lang profile)) + (theme/set-current-theme! (:theme profile)))))) ;; --- Fetch Profile (defn fetch-profile - ([] (fetch-profile nil)) - ([on-success] - (reify - ptk/WatchEvent - (watch [_ state s] - (->> (rp/query! :profile) - (rx/map (partial profile-fetched on-success)) - (rx/catch (fn [error] - (if (= (:type error) :not-found) - (rx/of (rt/nav :auth-login)) - (rx/empty))))))))) + [] + (reify + ptk/WatchEvent + (watch [_ state s] + (->> (rp/query! :profile) + (rx/map profile-fetched) + (rx/catch (fn [error] + (if (= (:type error) :not-found) + (rx/of (rt/nav :auth-login)) + (rx/empty)))))))) ;; --- Update Profile @@ -95,15 +88,19 @@ (us/assert ::profile data) (ptk/reify ::update-profile ptk/WatchEvent - (watch [_ state s] - (let [mdata (meta data) + (watch [_ state stream] + (let [mdata (meta data) on-success (:on-success mdata identity) - on-error (:on-error mdata identity) - handle-error #(do (on-error (:payload %)) - (rx/empty))] - (->> (rp/mutation :update-profile data) - (rx/map (constantly (fetch-profile on-success))) - (rx/catch rp/client-error? handle-error)))))) + on-error (:on-error mdata identity)] + (rx/merge + (->> (rp/mutation :update-profile data) + (rx/map fetch-profile) + (rx/catch on-error)) + (->> stream + (rx/filter (ptk/type? ::profile-fetched)) + (rx/take 1) + (rx/tap on-success) + (rx/ignore))))))) ;; --- Request Email Change diff --git a/frontend/src/app/main/ui/settings/options.cljs b/frontend/src/app/main/ui/settings/options.cljs index 0ae1a3d3c..1ad0d6d2c 100644 --- a/frontend/src/app/main/ui/settings/options.cljs +++ b/frontend/src/app/main/ui/settings/options.cljs @@ -10,6 +10,7 @@ (ns app.main.ui.settings.options (:require [app.common.spec :as us] + [app.common.data :as d] [app.main.data.messages :as dm] [app.main.data.users :as du] [app.main.refs :as refs] @@ -21,7 +22,7 @@ [cljs.spec.alpha :as s] [rumext.alpha :as mf])) -(s/def ::lang (s/nilable ::us/not-empty-string)) +(s/def ::lang (s/nilable ::us/string)) (s/def ::theme (s/nilable ::us/not-empty-string)) (s/def ::options-form @@ -38,6 +39,9 @@ (defn- on-submit [form event] (let [data (:clean-data @form) + data (cond-> data + (empty? (:lang data)) + (assoc :lang nil)) mdata {:on-success (partial on-success form) :on-error (partial on-error form)}] (st/emit! (du/update-profile (with-meta data mdata))))) @@ -54,12 +58,10 @@ [:h2 (t locale "labels.language")] [:div.fields-row - [:& fm/select {:options [{:label "English" :value "en"} - {:label "Français" :value "fr"} - {:label "Español" :value "es"} - {:label "Русский" :value "ru"}] + [:& fm/select {:options (d/concat [{:label "Auto (browser)" :value ""}] + i18n/supported-locales) :label (t locale "dashboard.select-ui-language") - :default "en" + :default "" :name :lang}]] [:h2 (t locale "dashboard.theme-change")] diff --git a/frontend/src/app/util/i18n.cljs b/frontend/src/app/util/i18n.cljs index 989132af6..cd8774a82 100644 --- a/frontend/src/app/util/i18n.cljs +++ b/frontend/src/app/util/i18n.cljs @@ -2,8 +2,10 @@ ;; License, v. 2.0. If a copy of the MPL was not distributed with this ;; file, You can obtain one at http://mozilla.org/MPL/2.0/. ;; -;; Copyright (c) 2015-2016 Juan de la Cruz -;; Copyright (c) 2015-2019 Andrey Antukh +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2020 UXBOX Labs SL (ns app.util.i18n "A i18n foundation." @@ -17,9 +19,40 @@ [app.util.storage :refer [storage]] [app.util.transit :as t])) -(defonce locale (l/atom (or (get storage ::locale) - cfg/default-language))) +(def supported-locales + [{:label "English" :value "en"} + {:label "Español" :value "es"} + {:label "Français (community)" :value "fr"} + {:label "Русский (community)" :value "ru"} + {:label "简体中文 (community)" :value "zh_cn"}]) + +(defn- parse-locale + [locale] + (let [locale (-> (.-language js/navigator) + (str/lower) + (str/replace "-" "_"))] + (cond-> [locale] + (str/includes? locale "_") + (conj (subs locale 0 2))))) + +(def ^:private browser-locales + (delay + (-> (.-language js/navigator) + (parse-locale)))) + +(defn- autodetect + [] + (let [supported (into #{} (map :value supported-locales))] + (loop [locales (seq @browser-locales)] + (if-let [locale (first locales)] + (if (contains? supported locale) + locale + (recur (rest locales))) + cfg/default-language)))) + (defonce translations #js {}) +(defonce locale (l/atom (or (get storage ::locale) + (autodetect)))) ;; The traslations `data` is a javascript object and should be treated ;; with `goog.object` namespace functions instead of a standart @@ -31,14 +64,21 @@ [data] (set! translations data)) -(defn set-current-locale! - [v] - (swap! storage assoc ::locale v) - (reset! locale v)) +(defn set-locale! + [lang] + (if lang + (do + (swap! storage assoc ::locale lang) + (reset! locale lang)) + (do + (reset! locale (autodetect))))) -(defn set-default-locale! +(defn reset-locale + "Set the current locale to the browser detected one if it is + supported or default locale if not." [] - (set-current-locale! cfg/default-language)) + (swap! storage dissoc ::locale) + (reset! locale (autodetect))) (deftype C [val] IDeref From de394a7d4e7e590047ce7c2647bcbc0da8d38e2a Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 18 Feb 2021 14:07:13 +0100 Subject: [PATCH 34/90] :recycle: Refactor LDAP auth backend. And reorganize oauth backend namespaces. --- CHANGES.md | 5 +- backend/src/app/config.clj | 59 ++++---- backend/src/app/http.clj | 22 ++- backend/src/app/http/auth/ldap.clj | 127 ------------------ backend/src/app/http/errors.clj | 5 + .../src/app/http/{auth => oauth}/github.clj | 12 +- .../src/app/http/{auth => oauth}/gitlab.clj | 15 +-- .../src/app/http/{auth => oauth}/google.clj | 15 ++- backend/src/app/loggers/mattermost.clj | 2 +- backend/src/app/main.clj | 30 ++--- backend/src/app/rpc.clj | 1 + backend/src/app/rpc/mutations/files.clj | 3 +- backend/src/app/rpc/mutations/ldap.clj | 105 +++++++++++++++ backend/src/app/rpc/mutations/profile.clj | 52 ++++--- backend/src/app/rpc/mutations/teams.clj | 2 +- .../src/app/rpc/mutations/verify_token.clj | 4 +- backend/src/app/util/services.clj | 2 +- docker/devenv/docker-compose.yaml | 9 +- frontend/resources/locales.json | 8 +- .../resources/styles/common/framework.scss | 7 +- frontend/src/app/main/data/auth.cljs | 31 +---- frontend/src/app/main/repo.cljs | 6 - frontend/src/app/main/ui/auth.cljs | 2 +- frontend/src/app/main/ui/auth/login.cljs | 57 +++++--- frontend/src/app/main/ui/auth/register.cljs | 10 +- .../src/app/main/ui/auth/verify_token.cljs | 7 +- 26 files changed, 288 insertions(+), 310 deletions(-) delete mode 100644 backend/src/app/http/auth/ldap.clj rename backend/src/app/http/{auth => oauth}/github.clj (95%) rename backend/src/app/http/{auth => oauth}/gitlab.clj (94%) rename backend/src/app/http/{auth => oauth}/google.clj (96%) create mode 100644 backend/src/app/rpc/mutations/ldap.clj diff --git a/CHANGES.md b/CHANGES.md index 135151c4b..b0a3fdee6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,14 +15,15 @@ ### :bug: Bugs fixed +- Add more improvements to french translation strings [#591](https://github.com/penpot/penpot/pull/591) - Add some missing database indexes (mainly improves performance on large databases on file-update rpc method, and some background tasks). +- Fix corner cases on invitation/signup flows. - Fix problem width handoff code generation [Taiga #1204](https://tree.taiga.io/project/penpot/issue/1204) - Fix problem with indices refreshing on page changes [#646](https://github.com/penpot/penpot/issues/646) - Have language change notification written in the new language [Taiga #1205](https://tree.taiga.io/project/penpot/issue/1205) - Properly handle errors on github, gitlab and ldap auth backends. - Properly mark profile auth backend (on first register/ auth with 3rd party auth provider). -- Fix corner cases on invitation/signup flows. -- Add more improvements to french translation strings [#591](https://github.com/penpot/penpot/pull/591) +- Refactor LDAP auth backend. ### :heart: Community contributions by (Thank you!) diff --git a/backend/src/app/config.clj b/backend/src/app/config.clj index 03822fa15..ac76d9de3 100644 --- a/backend/src/app/config.clj +++ b/backend/src/app/config.clj @@ -70,20 +70,11 @@ :telemetry-enabled false :telemetry-uri "https://telemetry.penpot.app/" - ;; LDAP auth disabled by default. Set ldap-auth-host to enable - ;:ldap-auth-host "ldap.mysupercompany.com" - ;:ldap-auth-port 389 - ;:ldap-bind-dn "cn=admin,dc=ldap,dc=mysupercompany,dc=com" - ;:ldap-bind-password "verysecure" - ;:ldap-auth-ssl false - ;:ldap-auth-starttls false - ;:ldap-auth-base-dn "ou=People,dc=ldap,dc=mysupercompany,dc=com" - - :ldap-auth-user-query "(|(uid=$username)(mail=$username))" - :ldap-auth-username-attribute "uid" - :ldap-auth-email-attribute "mail" - :ldap-auth-fullname-attribute "displayName" - :ldap-auth-avatar-attribute "jpegPhoto" + :ldap-user-query "(|(uid=$username)(mail=$username))" + :ldap-attrs-username "uid" + :ldap-attrs-email "mail" + :ldap-attrs-fullname "cn" + :ldap-attrs-photo "jpegPhoto" ;; :initial-data-file "resources/initial-data.json" ;; :initial-data-project-name "Penpot Oboarding" @@ -152,18 +143,18 @@ (s/def ::github-client-id ::us/string) (s/def ::github-client-secret ::us/string) -(s/def ::ldap-auth-host ::us/string) -(s/def ::ldap-auth-port ::us/integer) +(s/def ::ldap-host ::us/string) +(s/def ::ldap-port ::us/integer) (s/def ::ldap-bind-dn ::us/string) (s/def ::ldap-bind-password ::us/string) -(s/def ::ldap-auth-ssl ::us/boolean) -(s/def ::ldap-auth-starttls ::us/boolean) -(s/def ::ldap-auth-base-dn ::us/string) -(s/def ::ldap-auth-user-query ::us/string) -(s/def ::ldap-auth-username-attribute ::us/string) -(s/def ::ldap-auth-email-attribute ::us/string) -(s/def ::ldap-auth-fullname-attribute ::us/string) -(s/def ::ldap-auth-avatar-attribute ::us/string) +(s/def ::ldap-ssl ::us/boolean) +(s/def ::ldap-starttls ::us/boolean) +(s/def ::ldap-base-dn ::us/string) +(s/def ::ldap-user-query ::us/string) +(s/def ::ldap-attrs-username ::us/string) +(s/def ::ldap-attrs-email ::us/string) +(s/def ::ldap-attrs-fullname ::us/string) +(s/def ::ldap-attrs-photo ::us/string) (s/def ::telemetry-enabled ::us/boolean) (s/def ::telemetry-with-taiga ::us/boolean) @@ -195,18 +186,18 @@ ::google-client-secret ::http-server-port ::host - ::ldap-auth-avatar-attribute - ::ldap-auth-base-dn - ::ldap-auth-email-attribute - ::ldap-auth-fullname-attribute - ::ldap-auth-host - ::ldap-auth-port - ::ldap-auth-ssl - ::ldap-auth-starttls - ::ldap-auth-user-query - ::ldap-auth-username-attribute + ::ldap-attrs-username + ::ldap-attrs-email + ::ldap-attrs-fullname + ::ldap-attrs-photo ::ldap-bind-dn ::ldap-bind-password + ::ldap-base-dn + ::ldap-host + ::ldap-port + ::ldap-ssl + ::ldap-starttls + ::ldap-user-query ::public-uri ::profile-complaint-threshold ::profile-bounce-threshold diff --git a/backend/src/app/http.clj b/backend/src/app/http.clj index 1158f34b9..d6323b370 100644 --- a/backend/src/app/http.clj +++ b/backend/src/app/http.clj @@ -80,14 +80,12 @@ (s/def ::rpc map?) (s/def ::session map?) (s/def ::metrics map?) -(s/def ::google-auth map?) -(s/def ::gitlab-auth map?) -(s/def ::ldap-auth fn?) +(s/def ::oauth map?) (s/def ::storage map?) (s/def ::assets map?) (defmethod ig/pre-init-spec ::router [_] - (s/keys :req-un [::rpc ::session ::metrics ::google-auth ::gitlab-auth ::storage ::assets])) + (s/keys :req-un [::rpc ::session ::metrics ::oauth ::storage ::assets])) (defmethod ig/init-key ::router [_ cfg] @@ -113,7 +111,7 @@ :body "internal server error"}))))))) (defn- create-router - [{:keys [session rpc google-auth gitlab-auth github-auth metrics ldap-auth svgparse assets] :as cfg}] + [{:keys [session rpc oauth metrics svgparse assets] :as cfg}] (rr/router [["/metrics" {:get (:handler metrics)}] @@ -140,16 +138,14 @@ ["/svg" {:post svgparse}] ["/oauth" - ["/google" {:post (:auth-handler google-auth)}] - ["/google/callback" {:get (:callback-handler google-auth)}] + ["/google" {:post (get-in oauth [:google :handler])}] + ["/google/callback" {:get (get-in oauth [:google :callback-handler])}] - ["/gitlab" {:post (:auth-handler gitlab-auth)}] - ["/gitlab/callback" {:get (:callback-handler gitlab-auth)}] + ["/gitlab" {:post (get-in oauth [:gitlab :handler])}] + ["/gitlab/callback" {:get (get-in oauth [:gitlab :callback-handler])}] - ["/github" {:post (:auth-handler github-auth)}] - ["/github/callback" {:get (:callback-handler github-auth)}]] - - ["/login-ldap" {:post ldap-auth}] + ["/github" {:post (get-in oauth [:github :handler])}] + ["/github/callback" {:get (get-in oauth [:github :callback-handler])}]] ["/rpc" {:middleware [(:middleware session)]} ["/query/:type" {:get (:query-handler rpc)}] diff --git a/backend/src/app/http/auth/ldap.clj b/backend/src/app/http/auth/ldap.clj deleted file mode 100644 index 41e260e9f..000000000 --- a/backend/src/app/http/auth/ldap.clj +++ /dev/null @@ -1,127 +0,0 @@ -;; This Source Code Form is subject to the terms of the Mozilla Public -;; License, v. 2.0. If a copy of the MPL was not distributed with this -;; file, You can obtain one at http://mozilla.org/MPL/2.0/. -;; -;; This Source Code Form is "Incompatible With Secondary Licenses", as -;; defined by the Mozilla Public License, v. 2.0. -;; -;; Copyright (c) 2020 UXBOX Labs SL - -(ns app.http.auth.ldap - (:require - [app.common.exceptions :as ex] - [app.config :as cfg] - [clj-ldap.client :as client] - [clojure.set :as set] - [clojure.spec.alpha :as s] - [clojure.string ] - [clojure.tools.logging :as log] - [integrant.core :as ig])) - -(declare authenticate) -(declare create-connection) -(declare replace-several) - - -(s/def ::host ::cfg/ldap-auth-host) -(s/def ::port ::cfg/ldap-auth-port) -(s/def ::ssl ::cfg/ldap-auth-ssl) -(s/def ::starttls ::cfg/ldap-auth-starttls) -(s/def ::user-query ::cfg/ldap-auth-user-query) -(s/def ::base-dn ::cfg/ldap-auth-base-dn) -(s/def ::username-attribute ::cfg/ldap-auth-username-attribute) -(s/def ::email-attribute ::cfg/ldap-auth-email-attribute) -(s/def ::fullname-attribute ::cfg/ldap-auth-fullname-attribute) -(s/def ::avatar-attribute ::cfg/ldap-auth-avatar-attribute) - -(s/def ::rpc map?) -(s/def ::session map?) - -(defmethod ig/pre-init-spec :app.http.auth/ldap - [_] - (s/keys - :req-un [::rpc ::session] - :opt-un [::host - ::port - ::ssl - ::starttls - ::username-attribute - ::base-dn - ::username-attribute - ::email-attribute - ::fullname-attribute - ::avatar-attribute])) - -(defmethod ig/init-key :app.http.auth/ldap - [_ {:keys [session rpc] :as cfg}] - (let [conn (create-connection cfg)] - (with-meta - (fn [request] - (let [data (:body-params request)] - (when-some [info (authenticate (assoc cfg - :conn conn - :username (:email data) - :password (:password data)))] - (let [method-fn (get-in rpc [:methods :mutation :login-or-register]) - profile (method-fn {:email (:email info) - :backend "ldap" - :fullname (:fullname info)}) - - sxf ((:create session) (:id profile)) - rsp {:status 200 :body profile}] - (sxf request rsp))))) - {::conn conn}))) - -(defmethod ig/halt-key! ::client - [_ handler] - (let [{:keys [::conn]} (meta handler)] - (when (realized? conn) - (.close @conn)))) - -(defn- replace-several [s & {:as replacements}] - (reduce-kv clojure.string/replace s replacements)) - -(defn- create-connection - [cfg] - (let [params (merge {:host {:address (:host cfg) - :port (:port cfg)}} - (-> cfg - (select-keys [:ssl - :starttls - :ldap-bind-dn - :ldap-bind-password]) - (set/rename-keys {:ssl :ssl? - :starttls :startTLS? - :ldap-bind-dn :bind-dn - :ldap-bind-password :password})))] - (delay - (try - (client/connect params) - (catch Exception e - (log/errorf e "Cannot connect to LDAP %s:%s" - (:host cfg) (:port cfg))))))) - - -(defn- authenticate - [{:keys [conn username password] :as cfg}] - (when-some [conn (some-> conn deref)] - (let [user-search-query (replace-several (:user-query cfg) "$username" username) - user-attributes (-> cfg - (select-keys [:username-attribute - :email-attribute - :fullname-attribute - :avatar-attribute]) - vals)] - (when-some [user-entry (-> conn - (client/search (:base-dn cfg) - {:filter user-search-query - :sizelimit 1 - :attributes user-attributes}) - (first))] - (when-not (client/bind? conn (:dn user-entry) password) - (ex/raise :type :authentication - :code :wrong-credentials)) - (set/rename-keys user-entry {(keyword (:avatar-attribute cfg)) :photo - (keyword (:fullname-attribute cfg)) :fullname - (keyword (:email-attribute cfg)) :email}))))) - diff --git a/backend/src/app/http/errors.clj b/backend/src/app/http/errors.clj index 3758942f5..020ebc921 100644 --- a/backend/src/app/http/errors.clj +++ b/backend/src/app/http/errors.clj @@ -46,6 +46,11 @@ [err _] {:status 401 :body (ex-data err)}) + +(defmethod handle-exception :restriction + [err _] + {:status 400 :body (ex-data err)}) + (defmethod handle-exception :validation [err req] (let [header (get-in req [:headers "accept"]) diff --git a/backend/src/app/http/auth/github.clj b/backend/src/app/http/oauth/github.clj similarity index 95% rename from backend/src/app/http/auth/github.clj rename to backend/src/app/http/oauth/github.clj index 3d8552efa..bfa4c3c14 100644 --- a/backend/src/app/http/auth/github.clj +++ b/backend/src/app/http/oauth/github.clj @@ -7,12 +7,12 @@ ;; ;; Copyright (c) 2020-2021 UXBOX Labs SL -(ns app.http.auth.github +(ns app.http.oauth.github (:require [app.common.exceptions :as ex] [app.common.spec :as us] [app.config :as cfg] - [app.http.auth.google :as gg] + [app.http.oauth.google :as gg] [app.util.http :as http] [app.util.time :as dt] [clojure.data.json :as json] @@ -137,7 +137,7 @@ (s/def ::session map?) (s/def ::tokens fn?) -(defmethod ig/pre-init-spec :app.http.auth/github [_] +(defmethod ig/pre-init-spec :app.http.oauth/github [_] (s/keys :req-un [::public-uri ::session ::tokens] @@ -148,12 +148,12 @@ [_] (ex/raise :type :not-found)) -(defmethod ig/init-key :app.http.auth/github +(defmethod ig/init-key :app.http.oauth/github [_ cfg] (if (and (:client-id cfg) (:client-secret cfg)) - {:auth-handler #(auth-handler cfg %) + {:handler #(auth-handler cfg %) :callback-handler #(callback-handler cfg %)} - {:auth-handler default-handler + {:handler default-handler :callback-handler default-handler})) diff --git a/backend/src/app/http/auth/gitlab.clj b/backend/src/app/http/oauth/gitlab.clj similarity index 94% rename from backend/src/app/http/auth/gitlab.clj rename to backend/src/app/http/oauth/gitlab.clj index e932dfdba..4a8b0a7c2 100644 --- a/backend/src/app/http/auth/gitlab.clj +++ b/backend/src/app/http/oauth/gitlab.clj @@ -7,12 +7,12 @@ ;; ;; Copyright (c) 2020 UXBOX Labs SL -(ns app.http.auth.gitlab +(ns app.http.oauth.gitlab (:require [app.common.data :as d] [app.common.exceptions :as ex] [app.common.spec :as us] - [app.http.auth.google :as gg] + [app.http.oauth.google :as gg] [app.util.http :as http] [app.util.time :as dt] [clojure.data.json :as json] @@ -140,7 +140,7 @@ (s/def ::session map?) (s/def ::tokens fn?) -(defmethod ig/pre-init-spec :app.http.auth/gitlab [_] +(defmethod ig/pre-init-spec :app.http.oauth/gitlab [_] (s/keys :req-un [::public-uri ::session ::tokens] @@ -148,8 +148,7 @@ ::client-id ::client-secret])) - -(defmethod ig/prep-key :app.http.auth/gitlab +(defmethod ig/prep-key :app.http.oauth/gitlab [_ cfg] (d/merge {:base-uri "https://gitlab.com"} (d/without-nils cfg))) @@ -158,11 +157,11 @@ [_] (ex/raise :type :not-found)) -(defmethod ig/init-key :app.http.auth/gitlab +(defmethod ig/init-key :app.http.oauth/gitlab [_ cfg] (if (and (:client-id cfg) (:client-secret cfg)) - {:auth-handler #(auth-handler cfg %) + {:handler #(auth-handler cfg %) :callback-handler #(callback-handler cfg %)} - {:auth-handler default-handler + {:handler default-handler :callback-handler default-handler})) diff --git a/backend/src/app/http/auth/google.clj b/backend/src/app/http/oauth/google.clj similarity index 96% rename from backend/src/app/http/auth/google.clj rename to backend/src/app/http/oauth/google.clj index 3f082d064..ce9211689 100644 --- a/backend/src/app/http/auth/google.clj +++ b/backend/src/app/http/oauth/google.clj @@ -7,7 +7,7 @@ ;; ;; Copyright (c) 2020-2021 UXBOX Labs SL -(ns app.http.auth.google +(ns app.http.oauth.google (:require [app.common.exceptions :as ex] [app.common.spec :as us] @@ -50,7 +50,6 @@ (when (= 200 (:status res)) (-> (json/read-str (:body res)) (get "access_token")))) - (catch Exception e (log/error e "unexpected error on get-access-token") nil))) @@ -60,8 +59,10 @@ (try (let [req {:uri "https://openidconnect.googleapis.com/v1/userinfo" :headers {"Authorization" (str "Bearer " token)} + :timeout 6000 :method :get} res (http/send! req)] + (when (= 200 (:status res)) (let [data (json/read-str (:body res))] {:email (get data "email") @@ -78,6 +79,8 @@ info (some->> (get-in request [:params :code]) (get-access-token cfg) (get-user-info cfg))] + + (when-not info (ex/raise :type :internal :code :unable-to-auth)) @@ -158,7 +161,7 @@ (s/def ::session map?) (s/def ::tokens fn?) -(defmethod ig/pre-init-spec :app.http.auth/google [_] +(defmethod ig/pre-init-spec :app.http.oauth/google [_] (s/keys :req-un [::public-uri ::session ::tokens] @@ -169,11 +172,11 @@ [_] (ex/raise :type :not-found)) -(defmethod ig/init-key :app.http.auth/google +(defmethod ig/init-key :app.http.oauth/google [_ cfg] (if (and (:client-id cfg) (:client-secret cfg)) - {:auth-handler #(auth-handler cfg %) + {:handler #(auth-handler cfg %) :callback-handler #(callback-handler cfg %)} - {:auth-handler default-handler + {:handler default-handler :callback-handler default-handler})) diff --git a/backend/src/app/loggers/mattermost.clj b/backend/src/app/loggers/mattermost.clj index 7f40a48bd..2b95a0d3d 100644 --- a/backend/src/app/loggers/mattermost.clj +++ b/backend/src/app/loggers/mattermost.clj @@ -95,7 +95,7 @@ (= k :profile-id) (assoc acc k (uuid/uuid v)) (str/blank? v) acc :else (assoc acc k v))) - {} + {:id (uuid/next)} (:context event))) (defn- parse-event diff --git a/backend/src/app/main.clj b/backend/src/app/main.clj index 2d4745719..c9bc23ce0 100644 --- a/backend/src/app/main.clj +++ b/backend/src/app/main.clj @@ -87,10 +87,7 @@ :tokens (ig/ref :app.tokens/tokens) :public-uri (:public-uri config) :metrics (ig/ref :app.metrics/metrics) - :google-auth (ig/ref :app.http.auth/google) - :gitlab-auth (ig/ref :app.http.auth/gitlab) - :github-auth (ig/ref :app.http.auth/github) - :ldap-auth (ig/ref :app.http.auth/ldap) + :oauth (ig/ref :app.http.oauth/all) :assets (ig/ref :app.http.assets/handlers) :svgparse (ig/ref :app.svgparse/handler) :storage (ig/ref :app.storage/storage) @@ -104,7 +101,12 @@ :cache-max-age (dt/duration {:hours 24}) :signature-max-age (dt/duration {:hours 24 :minutes 5})} - :app.http.auth/google + :app.http.oauth/all + {:google (ig/ref :app.http.oauth/google) + :gitlab (ig/ref :app.http.oauth/gitlab) + :github (ig/ref :app.http.oauth/github)} + + :app.http.oauth/google {:rpc (ig/ref :app.rpc/rpc) :session (ig/ref :app.http.session/session) :tokens (ig/ref :app.tokens/tokens) @@ -112,7 +114,7 @@ :client-id (:google-client-id config) :client-secret (:google-client-secret config)} - :app.http.auth/github + :app.http.oauth/github {:rpc (ig/ref :app.rpc/rpc) :session (ig/ref :app.http.session/session) :tokens (ig/ref :app.tokens/tokens) @@ -120,7 +122,7 @@ :client-id (:github-client-id config) :client-secret (:github-client-secret config)} - :app.http.auth/gitlab + :app.http.oauth/gitlab {:rpc (ig/ref :app.rpc/rpc) :session (ig/ref :app.http.session/session) :tokens (ig/ref :app.tokens/tokens) @@ -129,20 +131,6 @@ :client-id (:gitlab-client-id config) :client-secret (:gitlab-client-secret config)} - :app.http.auth/ldap - {:host (:ldap-auth-host config) - :port (:ldap-auth-port config) - :ssl (:ldap-auth-ssl config) - :starttls (:ldap-auth-starttls config) - :user-query (:ldap-auth-user-query config) - :username-attribute (:ldap-auth-username-attribute config) - :email-attribute (:ldap-auth-email-attribute config) - :fullname-attribute (:ldap-auth-fullname-attribute config) - :avatar-attribute (:ldap-auth-avatar-attribute config) - :base-dn (:ldap-auth-base-dn config) - :session (ig/ref :app.http.session/session) - :rpc (ig/ref :app.rpc/rpc)} - :app.svgparse/svgc {:metrics (ig/ref :app.metrics/metrics)} diff --git a/backend/src/app/rpc.clj b/backend/src/app/rpc.clj index 28f9e2f9e..297d6008f 100644 --- a/backend/src/app/rpc.clj +++ b/backend/src/app/rpc.clj @@ -127,6 +127,7 @@ 'app.rpc.mutations.viewer 'app.rpc.mutations.teams 'app.rpc.mutations.feedback + 'app.rpc.mutations.ldap 'app.rpc.mutations.verify-token) (map (partial process-method cfg)) (into {})))) diff --git a/backend/src/app/rpc/mutations/files.clj b/backend/src/app/rpc/mutations/files.clj index 990273881..dce05f643 100644 --- a/backend/src/app/rpc/mutations/files.clj +++ b/backend/src/app/rpc/mutations/files.clj @@ -265,7 +265,7 @@ (assoc params :file file))))) (defn- update-file - [{:keys [conn] :as cfg} {:keys [file changes session-id] :as params}] + [{:keys [conn] :as cfg} {:keys [file changes session-id profile-id] :as params}] (when (> (:revn params) (:revn file)) (ex/raise :type :validation @@ -287,6 +287,7 @@ (db/insert! conn :file-change {:id (uuid/next) :session-id session-id + :profile-id profile-id :file-id (:id file) :revn (:revn file) :data (:data file) diff --git a/backend/src/app/rpc/mutations/ldap.clj b/backend/src/app/rpc/mutations/ldap.clj new file mode 100644 index 000000000..e8edfc879 --- /dev/null +++ b/backend/src/app/rpc/mutations/ldap.clj @@ -0,0 +1,105 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2020-2021 UXBOX Labs SL + +(ns app.rpc.mutations.ldap + (:require + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.config :as cfg] + [app.rpc.mutations.profile :refer [login-or-register]] + [app.util.services :as sv] + [clj-ldap.client :as ldap] + [clojure.spec.alpha :as s] + [clojure.string] + [clojure.tools.logging :as log])) + +(def cpool + (delay + (let [params {:ssl? (cfg/get :ldap-ssl) + :startTLS? (cfg/get :ldap-starttls) + :bind-dn (cfg/get :ldap-bind-dn) + :password (cfg/get :ldap-bind-password) + :host {:address (cfg/get :ldap-host) + :port (cfg/get :ldap-port)}}] + (try + (ldap/connect params) + (catch Exception e + (log/errorf e "Cannot connect to LDAP %s:%s" + (get-in params [:host :address]) + (get-in params [:host :port]))))))) + +;; --- Mutation: login-with-ldap + +(declare authenticate) + +(s/def ::email ::us/email) +(s/def ::password ::us/string) +(s/def ::invitation-token ::us/string) + +(s/def ::login-with-ldap + (s/keys :req-un [::email ::password] + :opt-un [::invitation-token])) + +(sv/defmethod ::login-with-ldap {:auth false :rlimit :password} + [{:keys [pool session tokens] :as cfg} {:keys [email password invitation-token] :as params}] + (when-not @cpool + (ex/raise :type :restriction + :code :ldap-disabled + :hint "ldap disabled or unable to connect")) + + (let [info (authenticate @cpool params) + cfg (assoc cfg :conn pool)] + (when-not info + (ex/raise :type :validation + :code :wrong-credentials)) + (let [profile (login-or-register cfg {:email (:email info) + :backend (:backend info) + :fullname (:fullname info)})] + (if-let [token (:invitation-token params)] + ;; If invitation token comes in params, this is because the + ;; user comes from team-invitation process; in this case, + ;; regenerate token and send back to the user a new invitation + ;; token (and mark current session as logged). + (let [claims (tokens :verify {:token token :iss :team-invitation}) + claims (assoc claims + :member-id (:id profile) + :member-email (:email profile)) + token (tokens :generate claims)] + (with-meta + {:invitation-token token} + {:transform-response ((:create session) (:id profile))})) + + (with-meta profile + {:transform-response ((:create session) (:id profile))}))))) + +(defn- replace-several [s & {:as replacements}] + (reduce-kv clojure.string/replace s replacements)) + +(defn- get-ldap-user + [cpool {:keys [email] :as params}] + (let [query (-> (cfg/get :ldap-user-query) + (replace-several "$username" email)) + + attrs [(cfg/get :ldap-attrs-username) + (cfg/get :ldap-attrs-email) + (cfg/get :ldap-attrs-photo) + (cfg/get :ldap-attrs-fullname)] + + base-dn (cfg/get :ldap-base-dn) + params {:filter query :sizelimit 1 :attributes attrs}] + (first (ldap/search cpool base-dn params)))) + +(defn- authenticate + [cpool {:keys [password] :as params}] + (when-let [{:keys [dn] :as luser} (get-ldap-user cpool params)] + (when (ldap/bind? cpool dn password) + {:photo (get luser (keyword (cfg/get :ldap-attrs-photo))) + :fullname (get luser (keyword (cfg/get :ldap-attrs-fullname))) + :email (get luser (keyword (cfg/get :ldap-attrs-email))) + :backend "ldap"}))) diff --git a/backend/src/app/rpc/mutations/profile.clj b/backend/src/app/rpc/mutations/profile.clj index 4ea7d0c8b..339738d57 100644 --- a/backend/src/app/rpc/mutations/profile.clj +++ b/backend/src/app/rpc/mutations/profile.clj @@ -204,10 +204,10 @@ (s/def ::login (s/keys :req-un [::email ::password] - :opt-un [::scope])) + :opt-un [::scope ::invitation-token])) (sv/defmethod ::login {:auth false :rlimit :password} - [{:keys [pool session] :as cfg} {:keys [email password scope] :as params}] + [{:keys [pool session tokens] :as cfg} {:keys [email password scope] :as params}] (letfn [(check-password [profile password] (when (= (:password profile) "!") (ex/raise :type :validation @@ -227,14 +227,27 @@ profile)] (db/with-atomic [conn pool] - (let [prof (-> (profile/retrieve-profile-data-by-email conn email) - (validate-profile) - (profile/strip-private-attrs)) - addt (profile/retrieve-additional-data conn (:id prof)) - prof (merge prof addt)] - (with-meta prof - {:transform-response ((:create session) (:id prof))}))))) + (let [profile (-> (profile/retrieve-profile-data-by-email conn email) + (validate-profile) + (profile/strip-private-attrs)) + profile (merge profile (profile/retrieve-additional-data conn (:id profile)))] + (if-let [token (:invitation-token params)] + ;; If the request comes with an invitation token, this means + ;; that user wants to accept it with different user. A very + ;; strange case but still can happen. In this case, we + ;; proceed in the same way as in register: regenerate the + ;; invitation token and return it to the user for proper + ;; invitation acceptation. + (let [claims (tokens :verify {:token token :iss :team-invitation}) + claims (assoc claims + :member-id (:id profile) + :member-email (:email profile)) + token (tokens :generate claims)] + (with-meta {:invitation-token token} + {:transform-response ((:create session) (:id profile))})) + (with-meta profile + {:transform-response ((:create session) (:id profile))})))))) ;; --- Mutation: Logout @@ -249,12 +262,20 @@ ;; --- Mutation: Register if not exists +(declare login-or-register) + (s/def ::backend ::us/string) (s/def ::login-or-register (s/keys :req-un [::email ::fullname ::backend])) (sv/defmethod ::login-or-register {:auth false} - [{:keys [pool] :as cfg} {:keys [email backend fullname] :as params}] + [{:keys [pool] :as cfg} params] + (db/with-atomic [conn pool] + (-> (assoc cfg :conn conn) + (login-or-register params)))) + +(defn login-or-register + [{:keys [conn] :as cfg} {:keys [email backend] :as params}] (letfn [(populate-additional-data [conn profile] (let [data (profile/retrieve-additional-data conn (:id profile))] (merge profile data))) @@ -275,12 +296,11 @@ (create-profile-initial-data conn profile) profile))] - (db/with-atomic [conn pool] - (let [profile (profile/retrieve-profile-data-by-email conn email) - profile (if profile - (populate-additional-data conn profile) - (register-profile conn params))] - (profile/strip-private-attrs profile))))) + (let [profile (profile/retrieve-profile-data-by-email conn email) + profile (if profile + (populate-additional-data conn profile) + (register-profile conn params))] + (profile/strip-private-attrs profile)))) ;; --- Mutation: Update Profile (own) diff --git a/backend/src/app/rpc/mutations/teams.clj b/backend/src/app/rpc/mutations/teams.clj index c5e37d001..d845775f1 100644 --- a/backend/src/app/rpc/mutations/teams.clj +++ b/backend/src/app/rpc/mutations/teams.clj @@ -303,7 +303,7 @@ team (db/get-by-id conn :team team-id) itoken (tokens :generate {:iss :team-invitation - :exp (dt/in-future "24h") + :exp (dt/in-future "6h") :profile-id (:id profile) :role role :team-id team-id diff --git a/backend/src/app/rpc/mutations/verify_token.clj b/backend/src/app/rpc/mutations/verify_token.clj index dbeadaf7a..6a32bb7d4 100644 --- a/backend/src/app/rpc/mutations/verify_token.clj +++ b/backend/src/app/rpc/mutations/verify_token.clj @@ -115,7 +115,7 @@ ;; If the current session is already matches the invited ;; member, then just return the token and leave the frontend ;; app redirect to correct team. - (assoc claims :status :created) + (assoc claims :state :created) ;; If the session does not matches the invited member, replace ;; the session with a new one matching the invited member. @@ -123,7 +123,7 @@ ;; user clicking the link he already has access to the email ;; account. (with-meta - (assoc claims :status :created) + (assoc claims :state :created) {:transform-response ((:create session) member-id)}))) ;; This happens when member-id is not filled in the invitation but diff --git a/backend/src/app/util/services.clj b/backend/src/app/util/services.clj index e652182be..edc8c1074 100644 --- a/backend/src/app/util/services.clj +++ b/backend/src/app/util/services.clj @@ -21,7 +21,7 @@ ::spec sname ::name (name sname)) - sym (symbol (str "service-method-" (name sname)))] + sym (symbol (str "sm$" (name sname)))] `(do (def ~sym (fn ~args ~@body)) (reset-meta! (var ~sym) ~mdata)))) diff --git a/docker/devenv/docker-compose.yaml b/docker/devenv/docker-compose.yaml index 0c105f87f..789ee0cc2 100644 --- a/docker/devenv/docker-compose.yaml +++ b/docker/devenv/docker-compose.yaml @@ -53,6 +53,7 @@ services: - PENPOT_SMTP_PASSWORD= - PENPOT_SMTP_SSL=false - PENPOT_SMTP_TLS=false + # LDAP setup - PENPOT_LDAP_HOST=ldap - PENPOT_LDAP_PORT=10389 @@ -61,10 +62,10 @@ services: - PENPOT_LDAP_BASE_DN=ou=people,dc=planetexpress,dc=com - PENPOT_LDAP_BIND_DN=cn=admin,dc=planetexpress,dc=com - PENPOT_LDAP_BIND_PASSWORD=GoodNewsEveryone - - PENPOT_LDAP_USERNAME_ATTRIBUTE=uid - - PENPOT_LDAP_EMAIL_ATTRIBUTE=mail - - PENPOT_LDAP_FULLNAME_ATTRIBUTE=displayName - - PENPOT_LDAP_AVATAR_ATTRIBUTE=jpegPhoto + - PENPOT_LDAP_ATTRS_USERNAME=uid + - PENPOT_LDAP_ATTRS_EMAIL=mail + - PENPOT_LDAP_ATTRS_FULLNAME=cn + - PENPOT_LDAP_ATTRS_PHOTO=jpegPhoto postgres: image: postgres:13 diff --git a/frontend/resources/locales.json b/frontend/resources/locales.json index e3c5debcc..00c1fcbde 100644 --- a/frontend/resources/locales.json +++ b/frontend/resources/locales.json @@ -773,7 +773,13 @@ "es" : "Actualizado: %s" } }, - "errors.auth.unauthorized" : { + "errors.ldap-disabled" : { + "translations" : { + "en" : "LDAP authentication is disabled.", + "es" : "La autheticacion via LDAP esta deshabilitada." + } + }, + "errors.wrong-credentials" : { "used-in" : [ "src/app/main/ui/auth/login.cljs" ], "translations" : { "en" : "Username or password seems to be wrong.", diff --git a/frontend/resources/styles/common/framework.scss b/frontend/resources/styles/common/framework.scss index 55089a604..fbd547eb9 100644 --- a/frontend/resources/styles/common/framework.scss +++ b/frontend/resources/styles/common/framework.scss @@ -1160,7 +1160,10 @@ input[type=range]:focus::-ms-fill-upper { .icon { padding: $small; - width: 40px; + width: 48px; + height: 48px; + justify-content: center; + align-items: center; } .content { @@ -1169,6 +1172,7 @@ input[type=range]:focus::-ms-fill-upper { font-size: $fs14; padding: $small; width: 100%; + align-items: center; } } @@ -1227,7 +1231,6 @@ input[type=range]:focus::-ms-fill-upper { &.inline { width: 100%; - margin-bottom: $big; } } diff --git a/frontend/src/app/main/data/auth.cljs b/frontend/src/app/main/data/auth.cljs index 8c4871dca..483f00c30 100644 --- a/frontend/src/app/main/data/auth.cljs +++ b/frontend/src/app/main/data/auth.cljs @@ -79,30 +79,6 @@ (watch [this state s] (rx/of (logged-in profile))))) -(defn login-with-ldap - [{:keys [email password] :as data}] - (us/verify ::login-params data) - (ptk/reify ::login-with-ldap - ptk/UpdateEvent - (update [_ state] - (merge state (dissoc initial-state :route :router))) - - ptk/WatchEvent - (watch [this state s] - (let [{:keys [on-error on-success] - :or {on-error identity - on-success identity}} (meta data) - params {:email email - :password password - :scope "webapp"}] - (->> (rx/timer 100) - (rx/mapcat #(rp/mutation :login-with-ldap params)) - (rx/tap on-success) - (rx/catch (fn [err] - (on-error err) - (rx/empty))) - (rx/map logged-in)))))) - ;; --- Logout (def clear-user-data @@ -131,10 +107,11 @@ ;; --- Register +(s/def ::invitation-token ::us/not-empty-string) + (s/def ::register - (s/keys :req-un [::fullname - ::password - ::email])) + (s/keys :req-un [::fullname ::password ::email] + :opt-un [::invitation-token])) (defn register "Create a register event instance." diff --git a/frontend/src/app/main/repo.cljs b/frontend/src/app/main/repo.cljs index cb914d078..462284eb5 100644 --- a/frontend/src/app/main/repo.cljs +++ b/frontend/src/app/main/repo.cljs @@ -122,11 +122,5 @@ (seq params)) (send-mutation! id form))) -(defmethod mutation :login-with-ldap - [id params] - (let [uri (str cfg/public-uri "/api/login-ldap")] - (->> (http/send! {:method :post :uri uri :body params}) - (rx/mapcat handle-response)))) - (def client-error? http/client-error?) (def server-error? http/server-error?) diff --git a/frontend/src/app/main/ui/auth.cljs b/frontend/src/app/main/ui/auth.cljs index ecb65ec20..29dd7af45 100644 --- a/frontend/src/app/main/ui/auth.cljs +++ b/frontend/src/app/main/ui/auth.cljs @@ -49,7 +49,7 @@ [:& register-success-page {:params params}] :auth-login - [:& login-page {:locale locale :params params}] + [:& login-page {:params params}] :auth-recovery-request [:& recovery-request-page {:locale locale}] diff --git a/frontend/src/app/main/ui/auth/login.cljs b/frontend/src/app/main/ui/auth/login.cljs index e9a4db5cf..15b663531 100644 --- a/frontend/src/app/main/ui/auth/login.cljs +++ b/frontend/src/app/main/ui/auth/login.cljs @@ -55,21 +55,40 @@ (rx/subs (fn [{:keys [redirect-uri] :as rsp}] (.replace js/location redirect-uri))))) +(defn- login-with-ldap + [event params] + (dom/prevent-default event) + (dom/stop-propagation event) + (let [{:keys [on-error]} (meta params)] + (->> (rp/mutation! :login-with-ldap params) + (rx/subs (fn [profile] + (if-let [token (:invitation-token profile)] + (st/emit! (rt/nav :auth-verify-token {} {:token token})) + (st/emit! (da/logged-in profile)))) + (fn [{:keys [type code] :as error}] + (cond + (and (= type :restriction) + (= code :ldap-disabled)) + (st/emit! (dm/error (tr "errors.ldap-disabled"))) + + (fn? on-error) + (on-error error))))))) + (mf/defc login-form - [] - (let [error? (mf/use-state false) - form (fm/use-form :spec ::login-form - :inital {}) + [{:keys [params] :as props}] + (let [error (mf/use-state false) + form (fm/use-form :spec ::login-form + :inital {}) on-error - (fn [form event] - (reset! error? true)) + (fn [_] + (reset! error (tr "errors.wrong-credentials"))) on-submit (mf/use-callback (mf/deps form) (fn [event] - (reset! error? false) + (reset! error nil) (let [params (with-meta (:clean-data @form) {:on-error on-error})] (st/emit! (da/login params))))) @@ -78,17 +97,15 @@ (mf/use-callback (mf/deps form) (fn [event] - (reset! error? false) - (let [params (with-meta (:clean-data @form) - {:on-error on-error})] - (st/emit! (da/login-with-ldap params)))))] + (let [params (merge (:clean-data @form) params)] + (login-with-ldap event (with-meta params {:on-error on-error})))))] [:* - (when @error? + (when-let [message @error] [:& msgs/inline-banner {:type :warning - :content (tr "errors.auth.unauthorized") - :on-close #(reset! error? false)}]) + :content message + :on-close #(reset! error nil)}]) [:& fm/form {:on-submit on-submit :form form} [:div.fields-row @@ -114,13 +131,13 @@ :on-click on-submit-ldap}])]])) (mf/defc login-page - [] + [{:keys [params] :as props}] [:div.generic-form.login-form [:div.form-container [:h1 (tr "auth.login-title")] [:div.subtitle (tr "auth.login-subtitle")] - [:& login-form {}] + [:& login-form {:params params}] [:div.links [:div.link-entry @@ -130,25 +147,25 @@ [:div.link-entry [:span (tr "auth.register") " "] - [:a {:on-click #(st/emit! (rt/nav :auth-register)) + [:a {:on-click #(st/emit! (rt/nav :auth-register {} params)) :tab-index "6"} (tr "auth.register-submit")]]] (when cfg/google-client-id [:a.btn-ocean.btn-large.btn-google-auth - {:on-click login-with-google} + {:on-click #(login-with-google % params)} "Login with Google"]) (when cfg/gitlab-client-id [:a.btn-ocean.btn-large.btn-gitlab-auth - {:on-click login-with-gitlab} + {:on-click #(login-with-gitlab % params)} [:img.logo {:src "/images/icons/brand-gitlab.svg"}] (tr "auth.login-with-gitlab-submit")]) (when cfg/github-client-id [:a.btn-ocean.btn-large.btn-github-auth - {:on-click login-with-github} + {:on-click #(login-with-github % params)} [:img.logo {:src "/images/icons/brand-github.svg"}] (tr "auth.login-with-github-submit")]) diff --git a/frontend/src/app/main/ui/auth/register.cljs b/frontend/src/app/main/ui/auth/register.cljs index ec28f1ce7..63b59b1b9 100644 --- a/frontend/src/app/main/ui/auth/register.cljs +++ b/frontend/src/app/main/ui/auth/register.cljs @@ -43,13 +43,11 @@ (s/def ::fullname ::us/not-empty-string) (s/def ::password ::us/not-empty-string) (s/def ::email ::us/email) -(s/def ::token ::us/not-empty-string) +(s/def ::invitation-token ::us/not-empty-string) (s/def ::register-form - (s/keys :req-un [::password - ::fullname - ::email] - :opt-un [::token])) + (s/keys :req-un [::password ::fullname ::email] + :opt-un [::invitation-token])) (mf/defc register-form [{:keys [params] :as props}] @@ -145,7 +143,7 @@ [:div.links [:div.link-entry [:span (tr "auth.already-have-account") " "] - [:a {:on-click #(st/emit! (rt/nav :auth-login)) + [:a {:on-click #(st/emit! (rt/nav :auth-login {} params)) :tab-index "4"} (tr "auth.login-here")]] diff --git a/frontend/src/app/main/ui/auth/verify_token.cljs b/frontend/src/app/main/ui/auth/verify_token.cljs index 349b451d0..403fd25bd 100644 --- a/frontend/src/app/main/ui/auth/verify_token.cljs +++ b/frontend/src/app/main/ui/auth/verify_token.cljs @@ -52,10 +52,9 @@ [tdata] (case (:state tdata) :created - (let [message (tr "auth.notifications.team-invitation-accepted")] - (st/emit! (du/fetch-profile) - (rt/nav :dashboard-projects {:team-id (:team-id tdata)}) - (dm/success message))) + (st/emit! (dm/success (tr "auth.notifications.team-invitation-accepted")) + (du/fetch-profile) + (rt/nav :dashboard-projects {:team-id (:team-id tdata)})) :pending (let [token (:invitation-token tdata)] From d56b7584909bfcdc3c2068f8f744e030221a1ad0 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sun, 21 Feb 2021 11:02:48 +0100 Subject: [PATCH 35/90] :bug: Fix possible bug with share-link formating. --- frontend/src/app/main/ui/viewer/header.cljs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/main/ui/viewer/header.cljs b/frontend/src/app/main/ui/viewer/header.cljs index c97025f13..bb87dce0c 100644 --- a/frontend/src/app/main/ui/viewer/header.cljs +++ b/frontend/src/app/main/ui/viewer/header.cljs @@ -11,6 +11,7 @@ (:require [app.common.math :as mth] [app.common.uuid :as uuid] + [app.config :as cfg] [app.main.data.comments :as dcm] [app.main.data.messages :as dm] [app.main.data.viewer :as dv] @@ -64,9 +65,13 @@ create (st/emitf (dv/create-share-link)) delete (st/emitf (dv/delete-share-link)) - href (.-href js/location) - href (subs href 0 (str/index-of href "?")) - link (str href "?token=" token "&index=0") + router (mf/deref refs/router) + route (mf/deref refs/route) + link (rt/resolve router + :viewer + (:path-params route) + {:token token :index "0"}) + link (str cfg/public-uri "/#" link) copy-link (fn [event] From c38117d116f578bef29edb693bff8bcc88779164 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Moya?= Date: Thu, 18 Feb 2021 16:54:45 +0100 Subject: [PATCH 36/90] :tada: Allow a different radius for each rect corner --- CHANGES.md | 1 + common/app/common/pages/common.cljc | 4 + common/app/common/pages/spec.cljc | 8 ++ frontend/resources/images/icons/radius-1.svg | 3 + frontend/resources/images/icons/radius-4.svg | 3 + frontend/resources/locales.json | 14 ++ .../resources/styles/common/framework.scss | 4 + .../styles/main/partials/handoff.scss | 2 +- .../partials/sidebar-element-options.scss | 29 ++++ .../main/ui/handoff/attributes/layout.cljs | 23 ++- frontend/src/app/main/ui/icons.cljs | 2 + frontend/src/app/main/ui/shapes/attrs.cljs | 53 ++++++- frontend/src/app/main/ui/shapes/rect.cljs | 5 +- .../workspace/sidebar/options/measures.cljs | 131 ++++++++++++++++-- frontend/src/app/util/code_gen.cljs | 38 +++-- 15 files changed, 287 insertions(+), 33 deletions(-) create mode 100644 frontend/resources/images/icons/radius-1.svg create mode 100644 frontend/resources/images/icons/radius-4.svg diff --git a/CHANGES.md b/CHANGES.md index b0a3fdee6..79dd23be6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,7 @@ - Bounce & Complaint handling [#635](https://github.com/penpot/penpot/pull/635) - Disable groups interactions when holding "Ctrl" key (deep selection) - New action in context menu to "edit" some shapes (binded to key "Enter") +- Allow to set border radius of each rect corner individually ### :bug: Bugs fixed diff --git a/common/app/common/pages/common.cljc b/common/app/common/pages/common.cljc index f56c55bbd..eb5a9572e 100644 --- a/common/app/common/pages/common.cljc +++ b/common/app/common/pages/common.cljc @@ -42,6 +42,10 @@ :stroke-alignment :stroke-group :rx :radius-group :ry :radius-group + :r1 :radius-group + :r2 :radius-group + :r3 :radius-group + :r4 :radius-group :selrect :geometry-group :points :geometry-group :locked :geometry-group diff --git a/common/app/common/pages/spec.cljc b/common/app/common/pages/spec.cljc index 25dc321f0..2feef1d71 100644 --- a/common/app/common/pages/spec.cljc +++ b/common/app/common/pages/spec.cljc @@ -220,6 +220,10 @@ (s/def :internal.shape/proportion-lock boolean?) (s/def :internal.shape/rx ::safe-number) (s/def :internal.shape/ry ::safe-number) +(s/def :internal.shape/r1 ::safe-number) +(s/def :internal.shape/r2 ::safe-number) +(s/def :internal.shape/r3 ::safe-number) +(s/def :internal.shape/r4 ::safe-number) (s/def :internal.shape/stroke-color string?) (s/def :internal.shape/stroke-color-gradient (s/nilable ::gradient)) (s/def :internal.shape/stroke-color-ref-file (s/nilable uuid?)) @@ -296,6 +300,10 @@ :internal.shape/proportion-lock :internal.shape/rx :internal.shape/ry + :internal.shape/r1 + :internal.shape/r2 + :internal.shape/r3 + :internal.shape/r4 :internal.shape/x :internal.shape/y :internal.shape/exports diff --git a/frontend/resources/images/icons/radius-1.svg b/frontend/resources/images/icons/radius-1.svg new file mode 100644 index 000000000..f1ca422cf --- /dev/null +++ b/frontend/resources/images/icons/radius-1.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/resources/images/icons/radius-4.svg b/frontend/resources/images/icons/radius-4.svg new file mode 100644 index 000000000..121940d51 --- /dev/null +++ b/frontend/resources/images/icons/radius-4.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/resources/locales.json b/frontend/resources/locales.json index 00c1fcbde..1bc727497 100644 --- a/frontend/resources/locales.json +++ b/frontend/resources/locales.json @@ -3640,6 +3640,20 @@ "es" : "Radio" } }, + "workspace.options.radius.all-corners" : { + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs" ], + "translations" : { + "en" : "All corners", + "es" : "Todas las esquinas" + } + }, + "workspace.options.radius.single-corners" : { + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs" ], + "translations" : { + "en" : "Single corners", + "es" : "Esquinas individuales" + } + }, "workspace.options.rotation" : { "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs" ], "translations" : { diff --git a/frontend/resources/styles/common/framework.scss b/frontend/resources/styles/common/framework.scss index fbd547eb9..33116b33d 100644 --- a/frontend/resources/styles/common/framework.scss +++ b/frontend/resources/styles/common/framework.scss @@ -385,6 +385,10 @@ ul.slider-dots { right: 6px; } + &.mini { + width: 43px; + } + // Input amounts &.pixels { diff --git a/frontend/resources/styles/main/partials/handoff.scss b/frontend/resources/styles/main/partials/handoff.scss index ea94a565a..18267d300 100644 --- a/frontend/resources/styles/main/partials/handoff.scss +++ b/frontend/resources/styles/main/partials/handoff.scss @@ -90,7 +90,7 @@ position: relative; display: flex; flex-direction: row; - padding: 1rem 0.5rem; + padding: 1rem 1.6rem 1rem 0.5rem; .attributes-label, .attributes-value { diff --git a/frontend/resources/styles/main/partials/sidebar-element-options.scss b/frontend/resources/styles/main/partials/sidebar-element-options.scss index 866d61eb1..dd6fb3808 100644 --- a/frontend/resources/styles/main/partials/sidebar-element-options.scss +++ b/frontend/resources/styles/main/partials/sidebar-element-options.scss @@ -595,6 +595,35 @@ } +.radius-options { + align-items: center; + border: 1px solid $color-gray-60; + border-radius: 4px; + display: flex; + justify-content: space-between; + padding: 8px; + width: 64px; + + .radius-icon { + display: flex; + align-items: center; + + svg { + cursor: pointer; + height: 16px; + fill: $color-gray-30; + width: 16px; + } + + &:hover, + &.selected { + svg { + fill: $color-primary; + } + } + } +} + .orientation-icon { margin-left: $small; display: flex; diff --git a/frontend/src/app/main/ui/handoff/attributes/layout.cljs b/frontend/src/app/main/ui/handoff/attributes/layout.cljs index 02175ece7..c161fffa9 100644 --- a/frontend/src/app/main/ui/handoff/attributes/layout.cljs +++ b/frontend/src/app/main/ui/handoff/attributes/layout.cljs @@ -17,13 +17,17 @@ [app.util.code-gen :as cg] [app.main.ui.components.copy-button :refer [copy-button]])) -(def properties [:width :height :x :y :radius :rx]) +(def properties [:width :height :x :y :radius :rx :r1]) + (def params {:to-prop {:x "left" :y "top" :rotation "transform" - :rx "border-radius"} - :format {:rotation #(str/fmt "rotate(%sdeg)" %)}}) + :rx "border-radius" + :r1 "border-radius"} + :format {:rotation #(str/fmt "rotate(%sdeg)" %) + :r1 #(apply str/fmt "%spx, %spx, %spx, %spx" %)} + :multi {:r1 [:r1 :r2 :r3 :r4]}}) (defn copy-data ([shape] @@ -62,6 +66,19 @@ [:div.attributes-value (mth/precision (:rx shape) 2) "px"] [:& copy-button {:data (copy-data shape :rx)}]]) + (when (and (:r1 shape) + (or (not= (:r1 shape) 0) + (not= (:r2 shape) 0) + (not= (:r3 shape) 0) + (not= (:r4 shape) 0))) + [:div.attributes-unit-row + [:div.attributes-label (t locale "handoff.attributes.layout.radius")] + [:div.attributes-value (mth/precision (:r1 shape) 2) ", " + (mth/precision (:r2 shape) 2) ", " + (mth/precision (:r3 shape) 2) ", " + (mth/precision (:r4 shape) 2) "px"] + [:& copy-button {:data (copy-data shape :r1)}]]) + (when (not= (:rotation shape 0) 0) [:div.attributes-unit-row [:div.attributes-label (t locale "handoff.attributes.layout.rotation")] diff --git a/frontend/src/app/main/ui/icons.cljs b/frontend/src/app/main/ui/icons.cljs index 3d54dfb6b..1bf023376 100644 --- a/frontend/src/app/main/ui/icons.cljs +++ b/frontend/src/app/main/ui/icons.cljs @@ -87,6 +87,8 @@ (def play (icon-xref :play)) (def plus (icon-xref :plus)) (def radius (icon-xref :radius)) +(def radius-1 (icon-xref :radius-1)) +(def radius-4 (icon-xref :radius-4)) (def recent (icon-xref :recent)) (def redo (icon-xref :redo)) (def rotate (icon-xref :rotate)) diff --git a/frontend/src/app/main/ui/shapes/attrs.cljs b/frontend/src/app/main/ui/shapes/attrs.cljs index a548f179c..66c1ac4a7 100644 --- a/frontend/src/app/main/ui/shapes/attrs.cljs +++ b/frontend/src/app/main/ui/shapes/attrs.cljs @@ -22,11 +22,56 @@ :dashed "10,10" nil)) +(defn- truncate-side + [shape ra-attr rb-attr dimension-attr] + (let [ra (ra-attr shape) + rb (rb-attr shape) + dimension (dimension-attr shape)] + (if (<= (+ ra rb) dimension) + [ra rb] + [(/ (* ra dimension) (+ ra rb)) + (/ (* rb dimension) (+ ra rb))]))) + +(defn- truncate-radius + [shape] + (let [[r-top-left r-top-right] + (truncate-side shape :r1 :r2 :width) + + [r-right-top r-right-bottom] + (truncate-side shape :r2 :r3 :height) + + [r-bottom-right r-bottom-left] + (truncate-side shape :r3 :r4 :width) + + [r-left-bottom r-left-top] + (truncate-side shape :r4 :r1 :height)] + + [(min r-top-left r-left-top) + (min r-top-right r-right-top) + (min r-right-bottom r-bottom-right) + (min r-bottom-left r-left-bottom)])) + (defn add-border-radius [attrs shape] - (if (or (:rx shape) (:ry shape)) - (obj/merge! attrs #js {:rx (:rx shape) - :ry (:ry shape)}) - attrs)) + (if (or (:r1 shape) (:r2 shape) (:r3 shape) (:r4 shape)) + (let [[r1 r2 r3 r4] (truncate-radius shape) + top (- (:width shape) r1 r2) + right (- (:height shape) r2 r3) + bottom (- (:width shape) r3 r4) + left (- (:height shape) r4 r1)] + (obj/merge! attrs #js {:d (str "M" (+ (:x shape) r1) "," (:y shape) " " + "h" top " " + "a" r2 "," r2 " 0 0 1 " r2 "," r2 " " + "v" right " " + "a" r3 "," r3 " 0 0 1 " (- r3) "," r3 " " + "h" (- bottom) " " + "a" r4 "," r4 " 0 0 1 " (- r4) "," (- r4) " " + "v" (- left) " " + "a" r1 "," r1 " 0 0 1 " r1 "," (- r1) " " + "z")})) + (if (or (:rx shape) (:ry shape)) + (obj/merge! attrs #js {:rx (:rx shape) + :ry (:ry shape)}) + attrs))) (defn add-fill [attrs shape render-id] (let [fill-color-gradient-id (str "fill-color-gradient_" render-id)] diff --git a/frontend/src/app/main/ui/shapes/rect.cljs b/frontend/src/app/main/ui/shapes/rect.cljs index 555bafa5a..ad3556180 100644 --- a/frontend/src/app/main/ui/shapes/rect.cljs +++ b/frontend/src/app/main/ui/shapes/rect.cljs @@ -37,4 +37,7 @@ [:& shape-custom-stroke {:shape shape :base-props props - :elem-name "rect"}])) + :elem-name + (if (.-d props) + "path" + "rect")}])) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/measures.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/measures.cljs index 236196506..ec870bd6d 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/measures.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/measures.cljs @@ -24,7 +24,13 @@ [app.common.math :as math] [app.util.i18n :refer [t] :as i18n])) -(def measure-attrs [:proportion-lock :width :height :x :y :rotation :rx :ry :selrect]) +(def measure-attrs [:proportion-lock + :width :height + :x :y + :rotation + :rx :ry + :r1 :r2 :r3 :r4 + :selrect]) (defn- attr->string [attr values] (let [value (attr values)] @@ -93,20 +99,70 @@ (fn [value] (st/emit! (udw/increase-rotation ids value)))) - on-radius-change + on-switch-to-radius-1 (mf/use-callback (mf/deps ids) (fn [value] (let [radius-update (fn [shape] (cond-> shape - (:rx shape) (assoc :rx value :ry value)))] + (:r1 shape) + (-> (assoc :rx 0 :ry 0) + (dissoc :r1 :r2 :r3 :r4))))] + (st/emit! (dwc/update-shapes ids-with-children radius-update))))) + + on-switch-to-radius-4 + (mf/use-callback + (mf/deps ids) + (fn [value] + (let [radius-update + (fn [shape] + (cond-> shape + (:rx shape) + (-> (assoc :r1 0 :r2 0 :r3 0 :r4 0) + (dissoc :rx :ry))))] + (st/emit! (dwc/update-shapes ids-with-children radius-update))))) + + on-radius-1-change + (mf/use-callback + (mf/deps ids) + (fn [value] + (let [radius-update + (fn [shape] + (cond-> shape + (:r1 shape) + (-> (dissoc :r1 :r2 :r3 :r4) + (assoc :rx 0 :ry 0)) + + (or (:rx shape) (:r1 shape)) + (assoc :rx value :ry value)))] + + (st/emit! (dwc/update-shapes ids-with-children radius-update))))) + + on-radius-4-change + (mf/use-callback + (mf/deps ids) + (fn [value attr] + (let [radius-update + (fn [shape] + (cond-> shape + (:rx shape) + (-> (dissoc :rx :rx) + (assoc :r1 0 :r2 0 :r3 0 :r4 0)) + + (attr shape) + (assoc attr value)))] + (st/emit! (dwc/update-shapes ids-with-children radius-update))))) on-width-change #(on-size-change % :width) on-height-change #(on-size-change % :height) on-pos-x-change #(on-position-change % :x) on-pos-y-change #(on-position-change % :y) + on-radius-r1-change #(on-radius-4-change % :r1) + on-radius-r2-change #(on-radius-4-change % :r2) + on-radius-r3-change #(on-radius-4-change % :r3) + on-radius-r4-change #(on-radius-4-change % :r4) select-all #(-> % (dom/get-target) (.select))] [:div.element-set @@ -181,14 +237,61 @@ :value (attr->string :rotation values)}]]) ;; RADIUS - (when (and (options :radius) (not (nil? (:rx values)))) - [:div.row-flex - [:span.element-set-subtitle (t locale "workspace.options.radius")] - [:div.input-element.pixels - [:> numeric-input - {:placeholder "--" - :min 0 - :on-click select-all - :on-change on-radius-change - :value (attr->string :rx values)}]] - [:div.input-element]])]])) + (let [radius-1? (some? (:rx values)) + radius-4? (some? (:r1 values))] + (when (and (options :radius) (or radius-1? radius-4?)) + [:div.row-flex + [:div.radius-options + [:div.radius-icon.tooltip.tooltip-bottom + {:class (classnames + :selected + (and radius-1? (not radius-4?))) + :alt (t locale "workspace.options.radius.all-corners") + :on-click on-switch-to-radius-1} + i/radius-1] + [:div.radius-icon.tooltip.tooltip-bottom + {:class (classnames + :selected + (and radius-4? (not radius-1?))) + :alt (t locale "workspace.options.radius.single-corners") + :on-click on-switch-to-radius-4} + i/radius-4]] + (if radius-1? + [:div.input-element.mini + [:> numeric-input + {:placeholder "--" + :min 0 + :on-click select-all + :on-change on-radius-1-change + :value (attr->string :rx values)}]] + + [:* + [:div.input-element.mini + [:> numeric-input + {:placeholder "--" + :min 0 + :on-click select-all + :on-change on-radius-r1-change + :value (attr->string :r1 values)}]] + [:div.input-element.mini + [:> numeric-input + {:placeholder "--" + :min 0 + :on-click select-all + :on-change on-radius-r2-change + :value (attr->string :r2 values)}]] + [:div.input-element.mini + [:> numeric-input + {:placeholder "--" + :min 0 + :on-click select-all + :on-change on-radius-r3-change + :value (attr->string :r3 values)}]] + [:div.input-element.mini + [:> numeric-input + {:placeholder "--" + :min 0 + :on-click select-all + :on-change on-radius-r4-change + :value (attr->string :r4 values)}]]]) + ]))]])) diff --git a/frontend/src/app/util/code_gen.cljs b/frontend/src/app/util/code_gen.cljs index 54dc6ed78..86e0bd8f5 100644 --- a/frontend/src/app/util/code_gen.cljs +++ b/frontend/src/app/util/code_gen.cljs @@ -39,9 +39,15 @@ (str/format "%spx %s %s" width style (uc/color->background color))))) (def styles-data - {:layout {:props [:width :height :x :y :radius :rx] - :to-prop {:x "left" :y "top" :rotation "transform" :rx "border-radius"} - :format {:rotation #(str/fmt "rotate(%sdeg)" %)}} + {:layout {:props [:width :height :x :y :radius :rx :r1] + :to-prop {:x "left" + :y "top" + :rotation "transform" + :rx "border-radius" + :r1 "border-radius"} + :format {:rotation #(str/fmt "rotate(%sdeg)" %) + :r1 #(apply str/fmt "%spx, %spx, %spx, %spx" %)} + :multi {:r1 [:r1 :r2 :r3 :r4]}} :fill {:props [:fill-color :fill-color-gradient] :to-prop {:fill-color "background" :fill-color-gradient "background"} :format {:fill-color format-fill-color :fill-color-gradient format-fill-color}} @@ -74,13 +80,14 @@ :text-transform name :fill-color format-fill-color}}) - (defn generate-css-props ([values properties] (generate-css-props values properties nil)) ([values properties params] - (let [{:keys [to-prop format tab-size] :or {to-prop {} tab-size 0}} params + (let [{:keys [to-prop format tab-size multi] + :or {to-prop {} tab-size 0 multi {}}} params + ;; We allow the :format and :to-prop to be a map for different properties ;; or just a value for a single property. This code transform a single ;; property to a uniform one @@ -94,19 +101,28 @@ (into {} (map #(vector % to-prop) properties)) to-prop) + get-value (fn [prop] + (if-let [props (prop multi)] + (map #(get values %) props) + (get values prop))) + + null? (fn [value] + (if (coll? value) + (every? #(or (nil? %) (= % 0)) value) + (or (nil? value) (= value 0)))) + default-format (fn [value] (str (mth/precision value 2) "px")) format-property (fn [prop] (let [css-prop (or (prop to-prop) (name prop)) format-fn (or (prop format) default-format) - css-val (format-fn (prop values) values)] + css-val (format-fn (get-value prop) values)] (when css-val (str (str/repeat " " tab-size) (str/fmt "%s: %s;" css-prop css-val)))))] (->> properties - (remove #(let [value (get values %)] - (or (nil? value) (= value 0)))) + (remove #(null? (get-value %))) (map format-property) (filter (comp not nil?)) (str/join "\n"))))) @@ -114,9 +130,11 @@ (defn shape->properties [shape] (let [props (->> styles-data vals (mapcat :props)) to-prop (->> styles-data vals (map :to-prop) (reduce merge)) - format (->> styles-data vals (map :format) (reduce merge))] + format (->> styles-data vals (map :format) (reduce merge)) + multi (->> styles-data vals (map :multi) (reduce merge))] (generate-css-props shape props {:to-prop to-prop :format format + :multi multi :tab-size 2}))) (defn text->properties [shape] (let [text-shape-style (select-keys styles-data [:layout :shadow :blur]) @@ -149,7 +167,7 @@ properties (if (= :text (:type shape)) (text->properties shape) (shape->properties shape)) - + selector (str/css-selector name) selector (if (str/starts-with? selector "-") (subs selector 1) selector)] (str/join "\n" [(str/fmt "/* %s */" name) From 60232baffb45e6b15184da16b01188d73ce101b6 Mon Sep 17 00:00:00 2001 From: Natacha Date: Fri, 19 Feb 2021 20:12:29 +0100 Subject: [PATCH 37/90] :sparkles: Add catalan translation (partial) Signed-off-by: Natacha --- frontend/resources/locales.json | 323 ++++++++++++++++++++++---------- 1 file changed, 220 insertions(+), 103 deletions(-) diff --git a/frontend/resources/locales.json b/frontend/resources/locales.json index 1bc727497..6999ef414 100644 --- a/frontend/resources/locales.json +++ b/frontend/resources/locales.json @@ -6,6 +6,7 @@ "fr" : "Vous avez déjà un compte ?", "ru" : "Уже есть аккаунт?", "es" : "¿Tienes ya una cuenta?", + "ca" : "Ja tens un compte?", "zh_cn" : "已经有账号了？" } }, @@ -14,6 +15,7 @@ "translations" : { "en" : "Check your email and click on the link to verify and start using Penpot.", "fr" : "Vérifiez votre e‑mail et cliquez sur le lien pour vérifier et commencer à utiliser Penpot.", + "ca" : "Revisa el teu email i fes click al link per verificar i començar a utilitzar Penpot.", "zh_cn" : "请检查你的电子邮箱，点击邮件中的超链接来验证，然后开始使用Penpot。" } }, @@ -24,6 +26,7 @@ "fr" : "Confirmez le mot de passe", "ru" : "Подтвердите пароль", "es" : "Confirmar contraseña", + "ca" : "Confirmar contrasenya", "zh_cn" : "确认密码" } }, @@ -34,6 +37,7 @@ "fr" : "Créer un compte de démonstration", "ru" : "Хотите попробовать?", "es" : "Crear cuanta de prueba", + "ca" : "Crea un compte de proba", "zh_cn" : "创建演示账号" } }, @@ -44,6 +48,7 @@ "fr" : "Vous voulez juste essayer ?", "ru" : "Хотите попробовать?", "es" : "¿Quieres probar?", + "ca" : "Vols probar-ho?", "zh_cn" : "只是想试试？" } }, @@ -54,6 +59,7 @@ "fr" : "Il s’agit d’un service DEMO, NE PAS UTILISER pour un travail réel, les projets seront périodiquement supprimés.", "ru" : "Это ДЕМОНСТРАЦИЯ, НЕ ИСПОЛЬЗУЙТЕ для работы, проекты будут периодически удаляться.", "es" : "Este es un servicio de DEMOSTRACIÓN. NO USAR para trabajo real, los proyectos serán borrados periodicamente.", + "ca" : "Aquest es un servei de PROBA. NO HO UTILITZIS per feina real, els projectes seran esborrats periòdicament.", "zh_cn" : "这是一个演示服务，请【不要】用于真实工作，这些项目将被周期性地抹除。" } }, @@ -64,6 +70,7 @@ "fr" : "Adresse e‑mail", "ru" : "Email", "es" : "Correo electrónico", + "ca" : "Correu electrònic", "zh_cn" : "电子邮件" } }, @@ -74,6 +81,7 @@ "fr" : "Mot de passe oublié ?", "ru" : "Забыли пароль?", "es" : "¿Olvidaste tu contraseña?", + "ca" : "Has oblidat la contrasenya?", "zh_cn" : "忘记密码？" } }, @@ -84,6 +92,7 @@ "fr" : "Nom complet", "ru" : "Полное имя", "es" : "Nombre completo", + "ca" : "Nom complet", "zh_cn" : "全名" } }, @@ -94,6 +103,7 @@ "fr" : "Retour !", "ru" : "Назад!", "es" : "Volver", + "ca" : "Tornar", "zh_cn" : "返回！" } }, @@ -104,6 +114,7 @@ "fr" : "Se connecter ici", "ru" : "Войти здесь", "es" : "Entra aquí", + "ca" : "Inicia sessió aquí", "zh_cn" : "在这里登录" } }, @@ -114,6 +125,7 @@ "fr" : "Se connecter", "ru" : "Вход", "es" : "Entrar", + "ca" : "Accedir", "zh_cn" : "登录" } }, @@ -124,6 +136,7 @@ "fr" : "Entrez vos informations ci‑dessous", "ru" : "Введите информацию о себе ниже", "es" : "Introduce tus datos aquí", + "ca" : "Introdueix les teves dades aquí", "zh_cn" : "请在下面输入你的详细信息" } }, @@ -134,6 +147,7 @@ "fr" : "Ravi de vous revoir !", "ru" : "Рады видеть Вас снова!", "es" : "Encantados de volverte a ver", + "ca" : "Encantats de tornar a veure't", "zh_cn" : "很高兴又见到你！" } }, @@ -144,7 +158,8 @@ "fr" : "Se connecter via Github", "ru" : "Вход через Gitnub", "es" : "Entrar con Github", - "zh_cn" : "使用Github登录" + "zh_cn" : "使用Github登录", + "ca" : "Accedir amb Github" } }, "auth.login-with-gitlab-submit" : { @@ -154,7 +169,8 @@ "fr" : "Se connecter via Gitlab", "ru" : "Вход через Gitlab", "es" : "Entrar con Gitlab", - "zh_cn" : "使用Gitlab登录" + "zh_cn" : "使用Gitlab登录", + "ca" : "Accedir amb Gitlab" } }, "auth.login-with-ldap-submit" : { @@ -164,7 +180,8 @@ "fr" : "Se connecter via LDAP", "ru" : "Вход через LDAP", "es" : "Entrar con LDAP", - "zh_cn" : "使用LDAP登录" + "zh_cn" : "使用LDAP登录", + "ca" : "Accedir amb LDAP" } }, "auth.new-password" : { @@ -174,7 +191,8 @@ "fr" : "Saisissez un nouveau mot de passe", "ru" : "Введите новый пароль", "es" : "Introduce la nueva contraseña", - "zh_cn" : "输入新的密码" + "zh_cn" : "输入新的密码", + "ca" : "Introdueix la nova contrasenya" } }, "auth.notifications.invalid-token-error" : { @@ -184,7 +202,8 @@ "fr" : "Le code de récupération n’est pas valide.", "ru" : "Неверный код восстановления.", "es" : "El código de recuperación no es válido.", - "zh_cn" : "恢复令牌无效。" + "zh_cn" : "恢复令牌无效。", + "ca" : "El codi de recuperació no és vàlid" } }, "auth.notifications.password-changed-succesfully" : { @@ -194,7 +213,8 @@ "fr" : "Mot de passe changé avec succès", "ru" : "Пароль изменен успешно", "es" : "La contraseña ha sido cambiada", - "zh_cn" : "密码修改成功" + "zh_cn" : "密码修改成功", + "ca" : "La contrasenya s'ha canviat correctament" } }, "auth.notifications.profile-not-verified" : { @@ -203,7 +223,8 @@ "en" : "Profile is not verified, please verify profile before continue.", "fr" : "Le profil n’est pas vérifié. Veuillez vérifier le profil avant de continuer.", "es" : "El perfil aun no ha sido verificado, por favor valida el perfil antes de continuar.", - "zh_cn" : "个人资料未验证，请于验证后继续。" + "zh_cn" : "个人资料未验证，请于验证后继续。", + "ca" : "El perfil encara no s'ha verificat, si us plau verifica-ho abans de continuar." } }, "auth.notifications.recovery-token-sent" : { @@ -213,7 +234,8 @@ "fr" : "Lien de récupération de mot de passe envoyé.", "ru" : "Ссылка для восстановления пароля отправлена на почту.", "es" : "Hemos enviado a tu buzón un enlace para recuperar tu contraseña.", - "zh_cn" : "找回密码链接已发至你的收件箱。" + "zh_cn" : "找回密码链接已发至你的收件箱。", + "ca" : "Hem enviat un link de recuperació de contrasenya al teu email." } }, "auth.notifications.team-invitation-accepted" : { @@ -222,7 +244,8 @@ "en" : "Joined the team succesfully", "fr" : "Vous avez rejoint l’équipe avec succès", "es" : "Te uniste al equipo", - "zh_cn" : "成功加入团队" + "zh_cn" : "成功加入团队", + "ca" : "T'has unit al equip" } }, "auth.password" : { @@ -232,7 +255,8 @@ "fr" : "Mot de passe", "ru" : "Пароль", "es" : "Contraseña", - "zh_cn" : "密码" + "zh_cn" : "密码", + "ca" : "Contrasenya" } }, "auth.password-length-hint" : { @@ -242,7 +266,8 @@ "fr" : "Au moins 8 caractères", "ru" : "Минимум 8 символов", "es" : "8 caracteres como mínimo", - "zh_cn" : "至少8位字符" + "zh_cn" : "至少8位字符", + "ca" : "Com a mínim 8 caràcters" } }, "auth.recovery-request-submit" : { @@ -252,7 +277,8 @@ "fr" : "Récupérer le mot de passe", "ru" : "Восстановить пароль", "es" : "Recuperar contraseña", - "zh_cn" : "找回密码" + "zh_cn" : "找回密码", + "ca" : "Recuperar contrasenya" } }, "auth.recovery-request-subtitle" : { @@ -262,7 +288,8 @@ "fr" : "Nous vous enverrons un e‑mail avec des instructions", "ru" : "Письмо с инструкциями отправлено на почту.", "es" : "Te enviaremos un correo electrónico con instrucciones", - "zh_cn" : "我们将给你发送一封带有说明的电子邮件" + "zh_cn" : "我们将给你发送一封带有说明的电子邮件", + "ca" : "T'enviarem un correu electrónic amb instruccions" } }, "auth.recovery-request-title" : { @@ -272,7 +299,8 @@ "fr" : "Mot de passe oublié ?", "ru" : "Забыли пароль?", "es" : "¿Olvidaste tu contraseña?", - "zh_cn" : "忘记密码？" + "zh_cn" : "忘记密码？", + "ca" : "Has oblidat la teva contrasenya?" } }, "auth.recovery-submit" : { @@ -282,7 +310,8 @@ "fr" : "Changez votre mot de passe", "ru" : "Изменить пароль", "es" : "Cambiar tu contraseña", - "zh_cn" : "修改密码" + "zh_cn" : "修改密码", + "ca" : "Canvia la teva contrasenya" } }, "auth.register" : { @@ -292,7 +321,8 @@ "fr" : "Pas encore de compte ?", "ru" : "Еще нет аккаунта?", "es" : "¿No tienes una cuenta?", - "zh_cn" : "现在还没有账户？" + "zh_cn" : "现在还没有账户？", + "ca" : "Encara no tens compte?" } }, "auth.register-submit" : { @@ -302,7 +332,8 @@ "fr" : "Créer un compte", "ru" : "Создать аккаунт", "es" : "Crear una cuenta", - "zh_cn" : "创建账户" + "zh_cn" : "创建账户", + "ca" : "Crea un compte" } }, "auth.register-subtitle" : { @@ -311,7 +342,8 @@ "en" : "It's free, it's Open Source", "fr" : "C’est gratuit, c’est Open Source", "ru" : "Это бесплатно, это Open Source", - "es" : "Es gratis, es Open Source" + "es" : "Es gratis, es Open Source", + "ca" : "Es gratuit, es Open Source" } }, "auth.register-title" : { @@ -320,7 +352,8 @@ "en" : "Create an account", "fr" : "Créer un compte", "ru" : "Создать аккаунт", - "es" : "Crear una cuenta" + "es" : "Crear una cuenta", + "ca" : "Crea un compte" } }, "auth.sidebar-tagline" : { @@ -329,14 +362,16 @@ "en" : "The open-source solution for design and prototyping.", "fr" : "La solution Open Source pour la conception et le prototypage.", "ru" : "Open Source решение для дизайна и прототипирования.", - "es" : "La solución de código abierto para diseñar y prototipar" + "es" : "La solución de código abierto para diseñar y prototipar", + "ca" : "La solució de codi obert per disenyar i prototipar" } }, "auth.verification-email-sent" : { "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { "en" : "We've sent a verification email to", - "fr" : "Nous avons envoyé un e-mail de vérification à" + "fr" : "Nous avons envoyé un e-mail de vérification à", + "ca" : "Em enviat un correu de verificació a" } }, "dashboard.add-shared" : { @@ -345,7 +380,8 @@ "en" : "Add as Shared Library", "fr" : "Ajouter une Bibliothèque Partagée", "ru" : "", - "es" : "Añadir como Biblioteca Compartida" + "es" : "Añadir como Biblioteca Compartida", + "ca" : "Afegeix una Biblioteca Compartida" } }, "dashboard.change-email" : { @@ -354,7 +390,8 @@ "en" : "Change email", "fr" : "Changer adresse e‑mail", "ru" : "Сменить email адрес", - "es" : "Cambiar correo" + "es" : "Cambiar correo", + "ca" : "Canviar correu" } }, "dashboard.create-new-team" : { @@ -362,7 +399,8 @@ "translations" : { "en" : "+ Create new team", "fr" : "+ Créer nouvelle équipe", - "es" : "+ Crear nuevo equipo" + "es" : "+ Crear nuevo equipo", + "ca" : "+ Crear un nou equip" } }, "dashboard.default-team-name" : { @@ -370,7 +408,8 @@ "translations" : { "en" : "Your Penpot", "fr" : "Votre Penpot", - "es" : "Tu Penpot" + "es" : "Tu Penpot", + "ca" : "El teu Penpot" } }, "dashboard.delete-team" : { @@ -378,7 +417,8 @@ "translations" : { "en" : "Delete team", "fr" : "Supprimer l’équipe", - "es" : "Eliminar equipo" + "es" : "Eliminar equipo", + "ca" : "Suprimir equip" } }, "dashboard.draft-title" : { @@ -387,7 +427,8 @@ "en" : "Draft", "fr" : "Brouillon", "ru" : "Черновик", - "es" : "Borrador" + "es" : "Borrador", + "ca" : "Esborrany" } }, "dashboard.empty-files" : { @@ -396,7 +437,8 @@ "en" : "You still have no files here", "fr" : "Vous n’avez encore aucun fichier ici", "ru" : "Файлов пока нет", - "es" : "Todavía no hay ningún archivo aquí" + "es" : "Todavía no hay ningún archivo aquí", + "ca" : "Encara no hi ha cap arxiu aquí" } }, "dashboard.invite-profile" : { @@ -404,7 +446,8 @@ "translations" : { "en" : "Invite to team", "fr" : "Inviter dans l’équipe", - "es" : "Invitar al equipo" + "es" : "Invitar al equipo", + "ca" : "Convidar a l'equip" } }, "dashboard.leave-team" : { @@ -412,7 +455,8 @@ "translations" : { "en" : "Leave team", "fr" : "Quitter l’équipe", - "es" : "Abandonar equipo" + "es" : "Abandonar equipo", + "ca" : "Abandonar l'equip" } }, "dashboard.libraries-title" : { @@ -421,7 +465,8 @@ "en" : "Shared Libraries", "fr" : "Bibliothèques Partagées", "ru" : "", - "es" : "Bibliotecas Compartidas" + "es" : "Bibliotecas Compartidas", + "ca" : "Biblioteques Compartides" } }, "dashboard.loading-files" : { @@ -429,7 +474,8 @@ "translations" : { "en" : "loading your files …", "fr" : "chargement de vos fichiers…", - "es" : "cargando tus ficheros …" + "es" : "cargando tus ficheros …", + "ca" : "carregan els teus fitxers" } }, "dashboard.new-file" : { @@ -438,7 +484,8 @@ "en" : "+ New File", "fr" : "+ Nouveau fichier", "ru" : "+ Новый файл", - "es" : "+ Nuevo Archivo" + "es" : "+ Nuevo Archivo", + "ca" : "+ Nou Arxiu" } }, "dashboard.new-project" : { @@ -447,7 +494,8 @@ "en" : "+ New project", "fr" : "+ Nouveau projet", "ru" : "+ Новый проект", - "es" : "+ Nuevo proyecto" + "es" : "+ Nuevo proyecto", + "ca" : "+ Nou projecte" } }, "dashboard.no-matches-for" : { @@ -456,7 +504,8 @@ "en" : "No matches found for “%s“", "fr" : "Aucune correspondance pour « %s »", "ru" : "Совпадений для “%s“ не найдено", - "es" : "No se encuentra “%s“" + "es" : "No se encuentra “%s“", + "ca" : "No s'ha trobat cap coincidència amb “%s“" } }, "dashboard.no-projects-placeholder" : { @@ -464,7 +513,8 @@ "translations" : { "en" : "Pinned projects will appear here", "fr" : "Les projets épinglés apparaîtront ici", - "es" : "Los proyectos fijados aparecerán aquí" + "es" : "Los proyectos fijados aparecerán aquí", + "ca" : "Els projectes fixats apareixeran aquí" } }, "dashboard.notifications.email-changed-successfully" : { @@ -473,7 +523,8 @@ "en" : "Your email address has been updated successfully", "fr" : "Votre adresse e‑mail a été mise à jour avec succès", "ru" : "Ваш email адрес успешно обновлен", - "es" : "Tu dirección de correo ha sido actualizada" + "es" : "Tu dirección de correo ha sido actualizada", + "ca" : "La teva adreça de correu s'ha actualizat" } }, "dashboard.notifications.email-verified-successfully" : { @@ -482,7 +533,8 @@ "en" : "Your email address has been verified successfully", "fr" : "Votre adresse e‑mail a été vérifiée avec succès", "ru" : "Ваш email адрес успешно подтвержден", - "es" : "Tu dirección de correo ha sido verificada" + "es" : "Tu dirección de correo ha sido verificada", + "ca" : "La teva adreça de correu ha sigut verificada" } }, "dashboard.notifications.password-saved" : { @@ -491,7 +543,8 @@ "en" : "Password saved successfully!", "fr" : "Mot de passe enregistré avec succès !", "ru" : "Пароль успешно сохранен!", - "es" : "¡Contraseña guardada!" + "es" : "¡Contraseña guardada!", + "ca" : "La contrasenya s'ha desat correctament" } }, "dashboard.num-of-members" : { @@ -499,7 +552,8 @@ "translations" : { "en" : "%s members", "fr" : "%s membres", - "es" : "%s integrantes" + "es" : "%s integrantes", + "ca" : "%s membres" } }, "dashboard.password-change" : { @@ -508,7 +562,8 @@ "en" : "Change password", "fr" : "Changer le mot de passe", "ru" : "Изменить пароль", - "es" : "Cambiar contraseña" + "es" : "Cambiar contraseña", + "ca" : "Canvia la contrasenya" } }, "dashboard.projects-title" : { @@ -517,7 +572,8 @@ "en" : "Projects", "fr" : "Projets", "ru" : "Проекты", - "es" : "Proyectos" + "es" : "Proyectos", + "ca" : "Projectes" } }, "dashboard.promote-to-owner" : { @@ -525,7 +581,8 @@ "translations" : { "en" : "Promote to owner", "fr" : "Promouvoir propriétaire", - "es" : "Promover a dueño" + "es" : "Promover a dueño", + "ca" : "Promoure a propietari" } }, "dashboard.remove-account" : { @@ -534,7 +591,8 @@ "en" : "Want to remove your account?", "fr" : "Vous souhaitez supprimer votre compte ?", "ru" : "Хотите удалить свой аккаунт?", - "es" : "¿Quieres borrar tu cuenta?" + "es" : "¿Quieres borrar tu cuenta?", + "ca" : "Vols esborrar el teu compte?" } }, "dashboard.remove-shared" : { @@ -543,7 +601,8 @@ "en" : "Remove as Shared Library", "fr" : "Retirer en tant que Bibliothèque Partagée", "ru" : "", - "es" : "Eliminar como Biblioteca Compartida" + "es" : "Eliminar como Biblioteca Compartida", + "ca" : "Elimina com Biblioteca Compartida" } }, "dashboard.search-placeholder" : { @@ -552,7 +611,8 @@ "en" : "Search…", "fr" : "Rechercher…", "ru" : "Поиск …", - "es" : "Buscar…" + "es" : "Buscar…", + "ca" : "Cerca…" } }, "dashboard.searching-for" : { @@ -561,7 +621,8 @@ "en" : "Searching for “%s“…", "fr" : "Recherche de « %s »…", "ru" : "Ищу “%s“…", - "es" : "Buscando “%s“…" + "es" : "Buscando “%s“…", + "ca" : "S'está cercant “%s“…" } }, "dashboard.select-ui-language" : { @@ -570,7 +631,8 @@ "en" : "Select UI language", "fr" : "Sélectionnez la langue de l’interface", "ru" : "Выберите язык интерфейса", - "es" : "Cambiar el idioma de la interfaz" + "es" : "Cambiar el idioma de la interfaz", + "ca" : "Selecciona la llengua de la interfície" } }, "dashboard.select-ui-theme" : { @@ -579,7 +641,8 @@ "en" : "Select theme", "fr" : "Sélectionnez un thème", "ru" : "Выберите тему", - "es" : "Selecciona un tema" + "es" : "Selecciona un tema", + "ca" : "Selecciona un tema" } }, "dashboard.show-all-files" : { @@ -587,7 +650,8 @@ "translations" : { "en" : "Show all files", "fr" : "Voir tous les fichiers", - "es" : "Ver todos los ficheros" + "es" : "Ver todos los ficheros", + "ca" : "Veure tots els fitxers" } }, "labels.recent" : { @@ -595,7 +659,8 @@ "en" : "Recent", "fr" : "Récent", "ru" : "Недавние", - "es" : "Reciente" + "es" : "Reciente", + "ca" : "Recent" }, "unused" : true }, @@ -604,7 +669,8 @@ "translations" : { "en" : "Switch team", "fr" : "Changer d’équipe", - "es" : "Cambiar equipo" + "es" : "Cambiar equipo", + "ca" : "Cambiar d'equip" } }, "dashboard.team-info" : { @@ -612,7 +678,8 @@ "translations" : { "en" : "Team info", "fr" : "Information de l’équipe", - "es" : "Información del equipo" + "es" : "Información del equipo", + "ca" : "Informació de l'equip" } }, "dashboard.team-members" : { @@ -620,7 +687,8 @@ "translations" : { "en" : "Team members", "fr" : "Membres de l’équipe", - "es" : "Integrantes del equipo" + "es" : "Integrantes del equipo", + "ca" : "Membres de l'equip" } }, "dashboard.team-projects" : { @@ -628,7 +696,8 @@ "translations" : { "en" : "Team projects", "fr" : "Projets de l’équipe", - "es" : "Proyectos del equipo" + "es" : "Proyectos del equipo", + "ca" : "Projectes de l'equip" } }, "dashboard.theme-change" : { @@ -637,7 +706,8 @@ "en" : "UI theme", "fr" : "Thème de l’interface", "ru" : "Тема интерфейса пользователя", - "es" : "Tema visual" + "es" : "Tema visual", + "ca" : "Tema de l'interfície" } }, "dashboard.title-search" : { @@ -646,7 +716,8 @@ "en" : "Search results", "fr" : "Résultats de recherche", "ru" : "Результаты поиска", - "es" : "Resultados de búsqueda" + "es" : "Resultados de búsqueda", + "ca" : "Membres de l'equip" } }, "dashboard.type-something" : { @@ -655,7 +726,8 @@ "en" : "Type to search results", "fr" : "Écrivez pour rechercher", "ru" : "Введите для поиска", - "es" : "Escribe algo para buscar" + "es" : "Escribe algo para buscar", + "ca" : "Escriu per cercar resultats" } }, "dashboard.update-settings" : { @@ -664,7 +736,8 @@ "en" : "Update settings", "fr" : "Mettre à jour les paramètres", "ru" : "Обновить настройки", - "es" : "Actualizar opciones" + "es" : "Actualizar opciones", + "ca" : "Actualitzar opcions" } }, "dashboard.your-account-title" : { @@ -672,7 +745,8 @@ "translations" : { "en" : "Your account", "fr" : "Votre compte", - "es" : "Su cuenta" + "es" : "Tu cuenta", + "ca" : "El teu compte" } }, "dashboard.your-email" : { @@ -681,7 +755,8 @@ "en" : "Email", "fr" : "E‑mail", "ru" : "Email", - "es" : "Correo" + "es" : "Correo", + "ca" : "Correu electrónic" } }, "dashboard.your-name" : { @@ -690,7 +765,8 @@ "en" : "Your name", "fr" : "Votre nom complet", "ru" : "Ваше имя", - "es" : "Tu nombre" + "es" : "Tu nombre", + "ca" : "El teu nom" } }, "dashboard.your-penpot" : { @@ -698,7 +774,8 @@ "translations" : { "en" : "Your Penpot", "fr" : "Votre Penpot", - "es" : "Tu Penpot" + "es" : "Tu Penpot", + "ca" : "El teu Penpot" } }, "labels.accept" : { @@ -706,7 +783,8 @@ "en" : "Accept", "fr" : "Accepter", "ru" : "Принять", - "es" : "Aceptar" + "es" : "Aceptar", + "ca" : "Acceptar" }, "unused" : true }, @@ -715,7 +793,8 @@ "en" : "Delete", "fr" : "Supprimer", "ru" : "Удалить", - "es" : "Borrar" + "es" : "Borrar", + "ca" : "Esborrar" }, "unused" : true }, @@ -724,7 +803,8 @@ "en" : "Rename", "fr" : "Renommer", "ru" : "Переименовать", - "es" : "Renombrar" + "es" : "Renombrar", + "ca" : "Canviar de nom" }, "unused" : true }, @@ -733,7 +813,8 @@ "en" : "Save", "fr" : "Enregistrer", "ru" : "Сохранить", - "es" : "Guardar" + "es" : "Guardar", + "ca" : "Desa" }, "unused" : true }, @@ -743,7 +824,8 @@ "en" : "Cancel", "fr" : "Annuler", "ru" : "Отмена", - "es" : "Cancelar" + "es" : "Cancelar", + "ca" : "Cancel·lar" } }, "ds.confirm-ok" : { @@ -752,7 +834,8 @@ "en" : "Ok", "fr" : "Ok", "ru" : "Ok", - "es" : "Ok" + "es" : "Ok", + "ca" : "Ok" } }, "ds.confirm-title" : { @@ -761,7 +844,8 @@ "en" : "Are you sure?", "fr" : "Êtes‑vous sûr ?", "ru" : "Вы уверены?", - "es" : "¿Seguro?" + "es" : "¿Seguro?", + "ca" : "Estàs segur?" } }, "ds.updated-at" : { @@ -770,7 +854,8 @@ "en" : "Updated: %s", "fr" : "Mise à jour : %s", "ru" : "Обновлено: %s", - "es" : "Actualizado: %s" + "es" : "Actualizado: %s", + "ca" : "Actualitzat: %s" } }, "errors.ldap-disabled" : { @@ -785,7 +870,8 @@ "en" : "Username or password seems to be wrong.", "fr" : "Le nom d’utilisateur ou le mot de passe semble être faux.", "ru" : "Неверное имя пользователя или пароль.", - "es" : "El nombre o la contraseña parece incorrecto." + "es" : "El nombre o la contraseña parece incorrecto.", + "ca" : "El nom d'usuari o la contrasenya sembla incorrecte" } }, "errors.clipboard-not-implemented" : { @@ -794,7 +880,8 @@ "en" : "Your browser cannot do this operation", "fr" : "Votre navigateur ne peut pas effectuer cette opération", "ru" : "", - "es" : "Tu navegador no puede realizar esta operación" + "es" : "Tu navegador no puede realizar esta operación", + "ca" : "El teu navegador no pot realitzar aquesta operació" } }, "errors.email-already-exists" : { @@ -803,7 +890,8 @@ "en" : "Email already used", "fr" : "Adresse e‑mail déjà utilisée", "ru" : "Такой email уже используется", - "es" : "Este correo ya está en uso" + "es" : "Este correo ya está en uso", + "ca" : "El correu ja està en ús" } }, "errors.email-already-validated" : { @@ -812,14 +900,16 @@ "en" : "Email already validated.", "fr" : "Adresse e‑mail déjà validée.", "ru" : "Электронная почта уже подтверждена.", - "es" : "Este correo ya está validado." + "es" : "Este correo ya está validado.", + "ca" : "El correu ja està validat" } }, "errors.email-has-permanent-bounces" : { "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/recovery_request.cljs", "src/app/main/ui/settings/change_email.cljs", "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "The email «%s» has many permanent bounce reports.", - "es" : "El email «%s» tiene varios reportes de rebote permanente." + "es" : "El email «%s» tiene varios reportes de rebote permanente.", + "ca" : "El correu «%s» té molts informes de rebot permanents" } }, "errors.email-invalid-confirmation" : { @@ -828,7 +918,8 @@ "en" : "Confirmation email must match", "fr" : "L’adresse e‑mail de confirmation doit correspondre", "ru" : "Email для подтверждения должен совпадать", - "es" : "El correo de confirmación debe coincidir" + "es" : "El correo de confirmación debe coincidir", + "ca" : "El correu de confirmació ha de coincidir" } }, "errors.generic" : { @@ -837,14 +928,16 @@ "en" : "Something wrong has happened.", "fr" : "Un problème s’est produit.", "ru" : "Что-то пошло не так.", - "es" : "Ha ocurrido algún error." + "es" : "Ha ocurrido algún error.", + "ca" : "Alguna cosa ha anat malament" } }, "errors.google-auth-not-enabled" : { "used-in" : [ "src/app/main/ui/auth/login.cljs" ], "translations" : { "en" : "Authentication with google disabled on backend", - "es" : "Autenticación con google esta dehabilitada en el servidor" + "es" : "Autenticación con google esta dehabilitada en el servidor", + "ca" : "L'autenticació amb google ha estat desactivada a aquest servidor" } }, "errors.media-format-unsupported" : { @@ -852,7 +945,8 @@ "en" : "The image format is not supported (must be svg, jpg or png).", "fr" : "Le format d’image n’est pas supporté (doit être svg, jpg ou png).", "ru" : "Формат изображения не поддерживается (должен быть svg, jpg или png).", - "es" : "No se reconoce el formato de imagen (debe ser svg, jpg o png)." + "es" : "No se reconoce el formato de imagen (debe ser svg, jpg o png).", + "ca" : "El format d'imatge no està suportat (deu ser svg, jpg o png)," }, "unused" : true }, @@ -862,7 +956,8 @@ "en" : "The image is too large to be inserted (must be under 5mb).", "fr" : "L’image est trop grande (doit être inférieure à 5 Mo).", "ru" : "Изображение слишком большое для вставки (должно быть меньше 5mb).", - "es" : "La imagen es demasiado grande (debe tener menos de 5mb)." + "es" : "La imagen es demasiado grande (debe tener menos de 5mb).", + "ca" : "La imatge es massa gran (ha de tenir menys de 5 mb)." } }, "errors.media-type-mismatch" : { @@ -871,7 +966,8 @@ "en" : "Seems that the contents of the image does not match the file extension.", "fr" : "Il semble que le contenu de l’image ne correspond pas à l’extension de fichier.", "ru" : "", - "es" : "Parece que el contenido de la imagen no coincide con la etensión del archivo." + "es" : "Parece que el contenido de la imagen no coincide con la etensión del archivo.", + "ca" : "Sembla que el contingut de la imatge no coincideix amb l'extensió del arxiu" } }, "errors.media-type-not-allowed" : { @@ -880,14 +976,16 @@ "en" : "Seems that this is not a valid image.", "fr" : "L’image ne semble pas être valide.", "ru" : "", - "es" : "Parece que no es una imagen válida." + "es" : "Parece que no es una imagen válida.", + "ca" : "La imatge no sembla pas vàlida" } }, "errors.member-is-muted" : { "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "The profile you inviting has emails muted (spam reports or high bounces).", - "es" : "El perfil que esta invitando tiene los emails silenciados (por reportes de spam o alto indice de rebote)." + "es" : "El perfil que esta invitando tiene los emails silenciados (por reportes de spam o alto indice de rebote).", + "ca" : "El perfil que estàs invitant té els emails mutejats (per informes de spam o rebots alts" } }, "errors.network" : { @@ -895,7 +993,8 @@ "en" : "Unable to connect to backend server.", "fr" : "Impossible de se connecter au serveur principal.", "ru" : "Невозможно подключиться к серверу.", - "es" : "Ha sido imposible conectar con el servidor principal." + "es" : "Ha sido imposible conectar con el servidor principal.", + "ca" : "Impossible connectar amb el servidor principal" }, "unused" : true }, @@ -905,7 +1004,8 @@ "en" : "Confirmation password must match", "fr" : "Le mot de passe de confirmation doit correspondre", "ru" : "Пароль для подтверждения должен совпадать", - "es" : "La contraseña de confirmación debe coincidir" + "es" : "La contraseña de confirmación debe coincidir", + "ca" : "La contrasenya de confirmació ha de coincidir" } }, "errors.password-too-short" : { @@ -914,14 +1014,16 @@ "en" : "Password should at least be 8 characters", "fr" : "Le mot de passe doit contenir au moins 8 caractères", "ru" : "Пароль должен быть минимум 8 символов", - "es" : "La contraseña debe tener 8 caracteres como mínimo" + "es" : "La contraseña debe tener 8 caracteres como mínimo", + "ca" : "La contrasenya ha de tenir 8 com a mínim 8 caràcters" } }, "errors.profile-is-muted" : { "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs", "src/app/main/ui/settings/change_email.cljs", "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Your profile has emails muted (spam reports or high bounces).", - "es" : "Tu perfil tiene los emails silenciados (por reportes de spam o alto indice de rebote)." + "es" : "Tu perfil tiene los emails silenciados (por reportes de spam o alto indice de rebote).", + "ca" : "El teu perfil te els emails mutejats (per informes de spam o rebots alts)." } }, "errors.registration-disabled" : { @@ -930,7 +1032,8 @@ "en" : "The registration is currently disabled.", "fr" : "L’enregistrement est actuellement désactivé.", "ru" : "Регистрация сейчас отключена.", - "es" : "El registro está actualmente desactivado." + "es" : "El registro está actualmente desactivado.", + "ca" : "El registre està desactivat actualment" } }, "errors.unexpected-error" : { @@ -939,14 +1042,16 @@ "en" : "An unexpected error occurred.", "fr" : "Une erreur inattendue s’est produite", "ru" : "Произошла ошибка.", - "es" : "Ha ocurrido un error inesperado." + "es" : "Ha ocurrido un error inesperado.", + "ca" : "S'ha produït un error inesperat." } }, "errors.unexpected-token" : { "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ], "translations" : { "en" : "Unknown token", - "es" : "Token desconocido" + "es" : "Token desconocido", + "ca" : "Token desconegut" } }, "errors.wrong-old-password" : { @@ -955,70 +1060,80 @@ "en" : "Old password is incorrect", "fr" : "L’ancien mot de passe est incorrect", "ru" : "Старый пароль неверный", - "es" : "La contraseña anterior no es correcta" + "es" : "La contraseña anterior no es correcta", + "ca" : "La contrasenya anterior no és correcte" } }, "feedback.chat-start" : { "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Join the chat", - "es" : "Unirse al chat" + "es" : "Unirse al chat", + "ca" : "Uneix-te al xat." } }, "feedback.chat-subtitle" : { "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Feeling like talking? Chat with us at Gitter", - "es" : "¿Deseas conversar? Entra al nuestro chat de la comunidad en Gitter" + "es" : "¿Deseas conversar? Entra al nuestro chat de la comunidad en Gitter", + "ca" : "Et ve de gust parlar? Xateja amb nosaltres a Gitter" } }, "feedback.description" : { "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Description", - "es" : "Descripción" + "es" : "Descripción", + "ca" : "Descripció" } }, "feedback.discussions-go-to" : { "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Go to discussions", - "es" : "Ir a las discussiones" + "es" : "Ir a las discusiones", + "ca" : "" } }, "feedback.discussions-subtitle1" : { "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Join Penpot team collaborative communication forum.", - "es" : "Entra al foro colaborativo de Penpot" + "es" : "Entra al foro colaborativo de Penpot", + "ca" : "Uneix-te al fòrum colaboratiu de Penpot." } }, "feedback.discussions-subtitle2" : { "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "You can ask and answer questions, have open-ended conversations, and follow along on decisions affecting the project.", - "es" : "" + "es" : "", + "ca" : "Pots fer i respondre preguntes, tenir converses obertes i seguir les decisións que afecten al projecte" } }, "feedback.discussions-title" : { "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Team discussions", - "es" : "" + "es" : "", + "ca" : "" } }, "feedback.subject" : { "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Subject", - "es" : "Asunto" + "es" : "Asunto", + "ca" : "Tema" } }, "feedback.subtitle" : { "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Please describe the reason of your email, specifying if is an issue, an idea or a doubt. A member of our team will respond as soon as possible.", - "es" : "" + "es" : "", + "ca" : "Si us plau descriu la raó del teu correu, especificant si es una incidència, una idea o un dubte. Un membre del nostre equip respondrà tan aviat como pugui." } }, "feedback.title" : { @@ -1027,7 +1142,8 @@ "en" : "Email", "fr" : "Adresse email", "ru" : "Email", - "es" : "Correo electrónico" + "es" : "Correo electrónico", + "ca" : "Correu electrònic" } }, "generic.error" : { @@ -1036,7 +1152,8 @@ "en" : "An error has occurred", "fr" : "Une erreur s’est produite", "ru" : "Произошла ошибка", - "es" : "Ha ocurrido un error" + "es" : "Ha ocurrido un error", + "ca" : "S'ha produït un error" } }, "handoff.attributes.blur" : { From 5e2bb3f54695d0f0acaf9f565a6b78fac449085e Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 22 Feb 2021 14:45:00 +0100 Subject: [PATCH 38/90] :sparkles: Fix ordering on locales.json file. --- frontend/locales.clj | 22 +- frontend/resources/locales.json | 6097 +++++++++++++++---------------- 2 files changed, 3049 insertions(+), 3070 deletions(-) diff --git a/frontend/locales.clj b/frontend/locales.clj index 003da68e3..a80a0a38a 100644 --- a/frontend/locales.clj +++ b/frontend/locales.clj @@ -65,14 +65,12 @@ [path] (when (fs/regular-file? path) (let [content (json/read-value (io/as-file path))] - (into (sorted-map) content)))) - -(defn- read-edn-file - [path] - (when (fs/regular-file? path) - (let [content (edn/read-string (slurp (io/as-file path)))] - (into (sorted-map) content)))) - + (reduce-kv (fn [res k v] + (let [v (into (sorted-map) v) + v (update v "translations" #(into (sorted-map) %))] + (assoc res k v))) + (sorted-map) + content)))) (defn- add-translation [data {:keys [code file line] :as translation}] @@ -84,7 +82,7 @@ (-> state (dissoc "unused") (update "used-in" conj rpath))))) - (assoc data code {"translations" {"en" nil "fr" nil "es" nil "ru" nil} + (assoc data code {"translations" (sorted-map "en" nil "es" nil) "used-in" [rpath]})))) (defn- clean-removed-translations @@ -112,10 +110,10 @@ (defn- synchronize-translations [data translations] - (loop [data (initial-cleanup data) + (loop [data (initial-cleanup data) imported #{} - c (first translations) - r (rest translations)] + c (first translations) + r (rest translations)] (if (nil? c) (clean-removed-translations data imported) (recur (add-translation data c) diff --git a/frontend/resources/locales.json b/frontend/resources/locales.json index 6999ef414..31d53c4c3 100644 --- a/frontend/resources/locales.json +++ b/frontend/resources/locales.json @@ -1,4863 +1,4844 @@ { "auth.already-have-account" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { + "ca" : "Ja tens un compte?", "en" : "Already have an account?", + "es" : "¿Tienes ya una cuenta?", "fr" : "Vous avez déjà un compte ?", "ru" : "Уже есть аккаунт?", - "es" : "¿Tienes ya una cuenta?", - "ca" : "Ja tens un compte?", "zh_cn" : "已经有账号了？" - } + }, + "used-in" : [ "src/app/main/ui/auth/register.cljs" ] }, "auth.check-your-email" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { + "ca" : "Revisa el teu email i fes click al link per verificar i començar a utilitzar Penpot.", "en" : "Check your email and click on the link to verify and start using Penpot.", "fr" : "Vérifiez votre e‑mail et cliquez sur le lien pour vérifier et commencer à utiliser Penpot.", - "ca" : "Revisa el teu email i fes click al link per verificar i començar a utilitzar Penpot.", "zh_cn" : "请检查你的电子邮箱，点击邮件中的超链接来验证，然后开始使用Penpot。" - } + }, + "used-in" : [ "src/app/main/ui/auth/register.cljs" ] }, "auth.confirm-password" : { - "used-in" : [ "src/app/main/ui/auth/recovery.cljs" ], "translations" : { + "ca" : "Confirmar contrasenya", "en" : "Confirm password", + "es" : "Confirmar contraseña", "fr" : "Confirmez le mot de passe", "ru" : "Подтвердите пароль", - "es" : "Confirmar contraseña", - "ca" : "Confirmar contrasenya", "zh_cn" : "确认密码" - } + }, + "used-in" : [ "src/app/main/ui/auth/recovery.cljs" ] }, "auth.create-demo-account" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/login.cljs" ], "translations" : { + "ca" : "Crea un compte de proba", "en" : "Create demo account", + "es" : "Crear cuanta de prueba", "fr" : "Créer un compte de démonstration", "ru" : "Хотите попробовать?", - "es" : "Crear cuanta de prueba", - "ca" : "Crea un compte de proba", "zh_cn" : "创建演示账号" - } + }, + "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/login.cljs" ] }, "auth.create-demo-profile" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/login.cljs" ], "translations" : { + "ca" : "Vols probar-ho?", "en" : "Just wanna try it?", + "es" : "¿Quieres probar?", "fr" : "Vous voulez juste essayer ?", "ru" : "Хотите попробовать?", - "es" : "¿Quieres probar?", - "ca" : "Vols probar-ho?", "zh_cn" : "只是想试试？" - } + }, + "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/login.cljs" ] }, "auth.demo-warning" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { + "ca" : "Aquest es un servei de PROBA. NO HO UTILITZIS per feina real, els projectes seran esborrats periòdicament.", "en" : "This is a DEMO service, DO NOT USE for real work, the projects will be periodicaly wiped.", + "es" : "Este es un servicio de DEMOSTRACIÓN. NO USAR para trabajo real, los proyectos serán borrados periodicamente.", "fr" : "Il s’agit d’un service DEMO, NE PAS UTILISER pour un travail réel, les projets seront périodiquement supprimés.", "ru" : "Это ДЕМОНСТРАЦИЯ, НЕ ИСПОЛЬЗУЙТЕ для работы, проекты будут периодически удаляться.", - "es" : "Este es un servicio de DEMOSTRACIÓN. NO USAR para trabajo real, los proyectos serán borrados periodicamente.", - "ca" : "Aquest es un servei de PROBA. NO HO UTILITZIS per feina real, els projectes seran esborrats periòdicament.", "zh_cn" : "这是一个演示服务，请【不要】用于真实工作，这些项目将被周期性地抹除。" - } + }, + "used-in" : [ "src/app/main/ui/auth/register.cljs" ] }, "auth.email" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/recovery_request.cljs", "src/app/main/ui/auth/login.cljs" ], "translations" : { + "ca" : "Correu electrònic", "en" : "Email", + "es" : "Correo electrónico", "fr" : "Adresse e‑mail", "ru" : "Email", - "es" : "Correo electrónico", - "ca" : "Correu electrònic", "zh_cn" : "电子邮件" - } + }, + "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/recovery_request.cljs", "src/app/main/ui/auth/login.cljs" ] }, "auth.forgot-password" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs" ], "translations" : { + "ca" : "Has oblidat la contrasenya?", "en" : "Forgot password?", + "es" : "¿Olvidaste tu contraseña?", "fr" : "Mot de passe oublié ?", "ru" : "Забыли пароль?", - "es" : "¿Olvidaste tu contraseña?", - "ca" : "Has oblidat la contrasenya?", "zh_cn" : "忘记密码？" - } + }, + "used-in" : [ "src/app/main/ui/auth/login.cljs" ] }, "auth.fullname" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { + "ca" : "Nom complet", "en" : "Full Name", + "es" : "Nombre completo", "fr" : "Nom complet", "ru" : "Полное имя", - "es" : "Nombre completo", - "ca" : "Nom complet", "zh_cn" : "全名" - } + }, + "used-in" : [ "src/app/main/ui/auth/register.cljs" ] }, "auth.go-back-to-login" : { - "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs" ], "translations" : { + "ca" : "Tornar", "en" : "Go back!", + "es" : "Volver", "fr" : "Retour !", "ru" : "Назад!", - "es" : "Volver", - "ca" : "Tornar", "zh_cn" : "返回！" - } + }, + "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs" ] }, "auth.login-here" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { + "ca" : "Inicia sessió aquí", "en" : "Login here", + "es" : "Entra aquí", "fr" : "Se connecter ici", "ru" : "Войти здесь", - "es" : "Entra aquí", - "ca" : "Inicia sessió aquí", "zh_cn" : "在这里登录" - } + }, + "used-in" : [ "src/app/main/ui/auth/register.cljs" ] }, "auth.login-submit" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs" ], "translations" : { + "ca" : "Accedir", "en" : "Sign in", + "es" : "Entrar", "fr" : "Se connecter", "ru" : "Вход", - "es" : "Entrar", - "ca" : "Accedir", "zh_cn" : "登录" - } + }, + "used-in" : [ "src/app/main/ui/auth/login.cljs" ] }, "auth.login-subtitle" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs" ], "translations" : { + "ca" : "Introdueix les teves dades aquí", "en" : "Enter your details below", + "es" : "Introduce tus datos aquí", "fr" : "Entrez vos informations ci‑dessous", "ru" : "Введите информацию о себе ниже", - "es" : "Introduce tus datos aquí", - "ca" : "Introdueix les teves dades aquí", "zh_cn" : "请在下面输入你的详细信息" - } + }, + "used-in" : [ "src/app/main/ui/auth/login.cljs" ] }, "auth.login-title" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs" ], "translations" : { + "ca" : "Encantats de tornar a veure't", "en" : "Great to see you again!", + "es" : "Encantados de volverte a ver", "fr" : "Ravi de vous revoir !", "ru" : "Рады видеть Вас снова!", - "es" : "Encantados de volverte a ver", - "ca" : "Encantats de tornar a veure't", "zh_cn" : "很高兴又见到你！" - } + }, + "used-in" : [ "src/app/main/ui/auth/login.cljs" ] }, "auth.login-with-github-submit" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/login.cljs" ], "translations" : { + "ca" : "Accedir amb Github", "en" : "Login with Github", + "es" : "Entrar con Github", "fr" : "Se connecter via Github", "ru" : "Вход через Gitnub", - "es" : "Entrar con Github", - "zh_cn" : "使用Github登录", - "ca" : "Accedir amb Github" - } + "zh_cn" : "使用Github登录" + }, + "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/login.cljs" ] }, "auth.login-with-gitlab-submit" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/login.cljs" ], "translations" : { + "ca" : "Accedir amb Gitlab", "en" : "Login with Gitlab", + "es" : "Entrar con Gitlab", "fr" : "Se connecter via Gitlab", "ru" : "Вход через Gitlab", - "es" : "Entrar con Gitlab", - "zh_cn" : "使用Gitlab登录", - "ca" : "Accedir amb Gitlab" - } + "zh_cn" : "使用Gitlab登录" + }, + "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/login.cljs" ] }, "auth.login-with-ldap-submit" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs" ], "translations" : { + "ca" : "Accedir amb LDAP", "en" : "Sign in with LDAP", + "es" : "Entrar con LDAP", "fr" : "Se connecter via LDAP", "ru" : "Вход через LDAP", - "es" : "Entrar con LDAP", - "zh_cn" : "使用LDAP登录", - "ca" : "Accedir amb LDAP" - } + "zh_cn" : "使用LDAP登录" + }, + "used-in" : [ "src/app/main/ui/auth/login.cljs" ] }, "auth.new-password" : { - "used-in" : [ "src/app/main/ui/auth/recovery.cljs" ], "translations" : { + "ca" : "Introdueix la nova contrasenya", "en" : "Type a new password", + "es" : "Introduce la nueva contraseña", "fr" : "Saisissez un nouveau mot de passe", "ru" : "Введите новый пароль", - "es" : "Introduce la nueva contraseña", - "zh_cn" : "输入新的密码", - "ca" : "Introdueix la nova contrasenya" - } + "zh_cn" : "输入新的密码" + }, + "used-in" : [ "src/app/main/ui/auth/recovery.cljs" ] }, "auth.notifications.invalid-token-error" : { - "used-in" : [ "src/app/main/ui/auth/recovery.cljs" ], "translations" : { + "ca" : "El codi de recuperació no és vàlid", "en" : "The recovery token is invalid.", + "es" : "El código de recuperación no es válido.", "fr" : "Le code de récupération n’est pas valide.", "ru" : "Неверный код восстановления.", - "es" : "El código de recuperación no es válido.", - "zh_cn" : "恢复令牌无效。", - "ca" : "El codi de recuperació no és vàlid" - } + "zh_cn" : "恢复令牌无效。" + }, + "used-in" : [ "src/app/main/ui/auth/recovery.cljs" ] }, "auth.notifications.password-changed-succesfully" : { - "used-in" : [ "src/app/main/ui/auth/recovery.cljs" ], "translations" : { + "ca" : "La contrasenya s'ha canviat correctament", "en" : "Password successfully changed", + "es" : "La contraseña ha sido cambiada", "fr" : "Mot de passe changé avec succès", "ru" : "Пароль изменен успешно", - "es" : "La contraseña ha sido cambiada", - "zh_cn" : "密码修改成功", - "ca" : "La contrasenya s'ha canviat correctament" - } + "zh_cn" : "密码修改成功" + }, + "used-in" : [ "src/app/main/ui/auth/recovery.cljs" ] }, "auth.notifications.profile-not-verified" : { - "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs" ], "translations" : { + "ca" : "El perfil encara no s'ha verificat, si us plau verifica-ho abans de continuar.", "en" : "Profile is not verified, please verify profile before continue.", - "fr" : "Le profil n’est pas vérifié. Veuillez vérifier le profil avant de continuer.", "es" : "El perfil aun no ha sido verificado, por favor valida el perfil antes de continuar.", - "zh_cn" : "个人资料未验证，请于验证后继续。", - "ca" : "El perfil encara no s'ha verificat, si us plau verifica-ho abans de continuar." - } + "fr" : "Le profil n’est pas vérifié. Veuillez vérifier le profil avant de continuer.", + "zh_cn" : "个人资料未验证，请于验证后继续。" + }, + "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs" ] }, "auth.notifications.recovery-token-sent" : { - "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs" ], "translations" : { + "ca" : "Hem enviat un link de recuperació de contrasenya al teu email.", "en" : "Password recovery link sent to your inbox.", + "es" : "Hemos enviado a tu buzón un enlace para recuperar tu contraseña.", "fr" : "Lien de récupération de mot de passe envoyé.", "ru" : "Ссылка для восстановления пароля отправлена на почту.", - "es" : "Hemos enviado a tu buzón un enlace para recuperar tu contraseña.", - "zh_cn" : "找回密码链接已发至你的收件箱。", - "ca" : "Hem enviat un link de recuperació de contrasenya al teu email." - } + "zh_cn" : "找回密码链接已发至你的收件箱。" + }, + "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs" ] }, "auth.notifications.team-invitation-accepted" : { - "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ], "translations" : { + "ca" : "T'has unit al equip", "en" : "Joined the team succesfully", - "fr" : "Vous avez rejoint l’équipe avec succès", "es" : "Te uniste al equipo", - "zh_cn" : "成功加入团队", - "ca" : "T'has unit al equip" - } + "fr" : "Vous avez rejoint l’équipe avec succès", + "zh_cn" : "成功加入团队" + }, + "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ] }, "auth.password" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/login.cljs" ], "translations" : { + "ca" : "Contrasenya", "en" : "Password", + "es" : "Contraseña", "fr" : "Mot de passe", "ru" : "Пароль", - "es" : "Contraseña", - "zh_cn" : "密码", - "ca" : "Contrasenya" - } + "zh_cn" : "密码" + }, + "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/login.cljs" ] }, "auth.password-length-hint" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { + "ca" : "Com a mínim 8 caràcters", "en" : "At least 8 characters", + "es" : "8 caracteres como mínimo", "fr" : "Au moins 8 caractères", "ru" : "Минимум 8 символов", - "es" : "8 caracteres como mínimo", - "zh_cn" : "至少8位字符", - "ca" : "Com a mínim 8 caràcters" - } + "zh_cn" : "至少8位字符" + }, + "used-in" : [ "src/app/main/ui/auth/register.cljs" ] }, "auth.recovery-request-submit" : { - "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs" ], "translations" : { + "ca" : "Recuperar contrasenya", "en" : "Recover Password", + "es" : "Recuperar contraseña", "fr" : "Récupérer le mot de passe", "ru" : "Восстановить пароль", - "es" : "Recuperar contraseña", - "zh_cn" : "找回密码", - "ca" : "Recuperar contrasenya" - } + "zh_cn" : "找回密码" + }, + "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs" ] }, "auth.recovery-request-subtitle" : { - "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs" ], "translations" : { + "ca" : "T'enviarem un correu electrónic amb instruccions", "en" : "We'll send you an email with instructions", + "es" : "Te enviaremos un correo electrónico con instrucciones", "fr" : "Nous vous enverrons un e‑mail avec des instructions", "ru" : "Письмо с инструкциями отправлено на почту.", - "es" : "Te enviaremos un correo electrónico con instrucciones", - "zh_cn" : "我们将给你发送一封带有说明的电子邮件", - "ca" : "T'enviarem un correu electrónic amb instruccions" - } + "zh_cn" : "我们将给你发送一封带有说明的电子邮件" + }, + "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs" ] }, "auth.recovery-request-title" : { - "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs" ], "translations" : { + "ca" : "Has oblidat la teva contrasenya?", "en" : "Forgot password?", + "es" : "¿Olvidaste tu contraseña?", "fr" : "Mot de passe oublié ?", "ru" : "Забыли пароль?", - "es" : "¿Olvidaste tu contraseña?", - "zh_cn" : "忘记密码？", - "ca" : "Has oblidat la teva contrasenya?" - } + "zh_cn" : "忘记密码？" + }, + "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs" ] }, "auth.recovery-submit" : { - "used-in" : [ "src/app/main/ui/auth/recovery.cljs" ], "translations" : { + "ca" : "Canvia la teva contrasenya", "en" : "Change your password", + "es" : "Cambiar tu contraseña", "fr" : "Changez votre mot de passe", "ru" : "Изменить пароль", - "es" : "Cambiar tu contraseña", - "zh_cn" : "修改密码", - "ca" : "Canvia la teva contrasenya" - } + "zh_cn" : "修改密码" + }, + "used-in" : [ "src/app/main/ui/auth/recovery.cljs" ] }, "auth.register" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs" ], "translations" : { + "ca" : "Encara no tens compte?", "en" : "No account yet?", + "es" : "¿No tienes una cuenta?", "fr" : "Pas encore de compte ?", "ru" : "Еще нет аккаунта?", - "es" : "¿No tienes una cuenta?", - "zh_cn" : "现在还没有账户？", - "ca" : "Encara no tens compte?" - } + "zh_cn" : "现在还没有账户？" + }, + "used-in" : [ "src/app/main/ui/auth/login.cljs" ] }, "auth.register-submit" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/login.cljs" ], "translations" : { + "ca" : "Crea un compte", "en" : "Create an account", + "es" : "Crear una cuenta", "fr" : "Créer un compte", "ru" : "Создать аккаунт", - "es" : "Crear una cuenta", - "zh_cn" : "创建账户", - "ca" : "Crea un compte" - } + "zh_cn" : "创建账户" + }, + "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/login.cljs" ] }, "auth.register-subtitle" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { + "ca" : "Es gratuit, es Open Source", "en" : "It's free, it's Open Source", - "fr" : "C’est gratuit, c’est Open Source", - "ru" : "Это бесплатно, это Open Source", "es" : "Es gratis, es Open Source", - "ca" : "Es gratuit, es Open Source" - } + "fr" : "C’est gratuit, c’est Open Source", + "ru" : "Это бесплатно, это Open Source" + }, + "used-in" : [ "src/app/main/ui/auth/register.cljs" ] }, "auth.register-title" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { + "ca" : "Crea un compte", "en" : "Create an account", - "fr" : "Créer un compte", - "ru" : "Создать аккаунт", "es" : "Crear una cuenta", - "ca" : "Crea un compte" - } + "fr" : "Créer un compte", + "ru" : "Создать аккаунт" + }, + "used-in" : [ "src/app/main/ui/auth/register.cljs" ] }, "auth.sidebar-tagline" : { - "used-in" : [ "src/app/main/ui/auth.cljs" ], "translations" : { + "ca" : "La solució de codi obert per disenyar i prototipar", "en" : "The open-source solution for design and prototyping.", - "fr" : "La solution Open Source pour la conception et le prototypage.", - "ru" : "Open Source решение для дизайна и прототипирования.", "es" : "La solución de código abierto para diseñar y prototipar", - "ca" : "La solució de codi obert per disenyar i prototipar" - } + "fr" : "La solution Open Source pour la conception et le prototypage.", + "ru" : "Open Source решение для дизайна и прототипирования." + }, + "used-in" : [ "src/app/main/ui/auth.cljs" ] }, "auth.verification-email-sent" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { + "ca" : "Em enviat un correu de verificació a", "en" : "We've sent a verification email to", - "fr" : "Nous avons envoyé un e-mail de vérification à", - "ca" : "Em enviat un correu de verificació a" - } + "fr" : "Nous avons envoyé un e-mail de vérification à" + }, + "used-in" : [ "src/app/main/ui/auth/register.cljs" ] }, "dashboard.add-shared" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { + "ca" : "Afegeix una Biblioteca Compartida", "en" : "Add as Shared Library", - "fr" : "Ajouter une Bibliothèque Partagée", - "ru" : "", "es" : "Añadir como Biblioteca Compartida", - "ca" : "Afegeix una Biblioteca Compartida" - } + "fr" : "Ajouter une Bibliothèque Partagée", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ] }, "dashboard.change-email" : { - "used-in" : [ "src/app/main/ui/settings/profile.cljs" ], "translations" : { + "ca" : "Canviar correu", "en" : "Change email", - "fr" : "Changer adresse e‑mail", - "ru" : "Сменить email адрес", "es" : "Cambiar correo", - "ca" : "Canviar correu" - } + "fr" : "Changer adresse e‑mail", + "ru" : "Сменить email адрес" + }, + "used-in" : [ "src/app/main/ui/settings/profile.cljs" ] }, "dashboard.create-new-team" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { + "ca" : "+ Crear un nou equip", "en" : "+ Create new team", - "fr" : "+ Créer nouvelle équipe", "es" : "+ Crear nuevo equipo", - "ca" : "+ Crear un nou equip" - } + "fr" : "+ Créer nouvelle équipe" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, "dashboard.default-team-name" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { + "ca" : "El teu Penpot", "en" : "Your Penpot", - "fr" : "Votre Penpot", "es" : "Tu Penpot", - "ca" : "El teu Penpot" - } + "fr" : "Votre Penpot" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, "dashboard.delete-team" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { + "ca" : "Suprimir equip", "en" : "Delete team", - "fr" : "Supprimer l’équipe", "es" : "Eliminar equipo", - "ca" : "Suprimir equip" - } + "fr" : "Supprimer l’équipe" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, "dashboard.draft-title" : { - "used-in" : [ "src/app/main/ui/dashboard/files.cljs" ], "translations" : { + "ca" : "Esborrany", "en" : "Draft", - "fr" : "Brouillon", - "ru" : "Черновик", "es" : "Borrador", - "ca" : "Esborrany" - } + "fr" : "Brouillon", + "ru" : "Черновик" + }, + "used-in" : [ "src/app/main/ui/dashboard/files.cljs" ] }, "dashboard.empty-files" : { - "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { + "ca" : "Encara no hi ha cap arxiu aquí", "en" : "You still have no files here", - "fr" : "Vous n’avez encore aucun fichier ici", - "ru" : "Файлов пока нет", "es" : "Todavía no hay ningún archivo aquí", - "ca" : "Encara no hi ha cap arxiu aquí" - } + "fr" : "Vous n’avez encore aucun fichier ici", + "ru" : "Файлов пока нет" + }, + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ] }, "dashboard.invite-profile" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { + "ca" : "Convidar a l'equip", "en" : "Invite to team", - "fr" : "Inviter dans l’équipe", "es" : "Invitar al equipo", - "ca" : "Convidar a l'equip" - } + "fr" : "Inviter dans l’équipe" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, "dashboard.leave-team" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { + "ca" : "Abandonar l'equip", "en" : "Leave team", - "fr" : "Quitter l’équipe", "es" : "Abandonar equipo", - "ca" : "Abandonar l'equip" - } + "fr" : "Quitter l’équipe" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ] }, "dashboard.libraries-title" : { - "used-in" : [ "src/app/main/ui/dashboard/libraries.cljs" ], "translations" : { + "ca" : "Biblioteques Compartides", "en" : "Shared Libraries", - "fr" : "Bibliothèques Partagées", - "ru" : "", "es" : "Bibliotecas Compartidas", - "ca" : "Biblioteques Compartides" - } + "fr" : "Bibliothèques Partagées", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/dashboard/libraries.cljs" ] }, "dashboard.loading-files" : { - "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { + "ca" : "carregan els teus fitxers", "en" : "loading your files …", - "fr" : "chargement de vos fichiers…", "es" : "cargando tus ficheros …", - "ca" : "carregan els teus fitxers" - } + "fr" : "chargement de vos fichiers…" + }, + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ] }, "dashboard.new-file" : { - "used-in" : [ "src/app/main/ui/dashboard/projects.cljs", "src/app/main/ui/dashboard/files.cljs" ], "translations" : { + "ca" : "+ Nou Arxiu", "en" : "+ New File", - "fr" : "+ Nouveau fichier", - "ru" : "+ Новый файл", "es" : "+ Nuevo Archivo", - "ca" : "+ Nou Arxiu" - } + "fr" : "+ Nouveau fichier", + "ru" : "+ Новый файл" + }, + "used-in" : [ "src/app/main/ui/dashboard/projects.cljs", "src/app/main/ui/dashboard/files.cljs" ] }, "dashboard.new-project" : { - "used-in" : [ "src/app/main/ui/dashboard/projects.cljs" ], "translations" : { + "ca" : "+ Nou projecte", "en" : "+ New project", - "fr" : "+ Nouveau projet", - "ru" : "+ Новый проект", "es" : "+ Nuevo proyecto", - "ca" : "+ Nou projecte" - } + "fr" : "+ Nouveau projet", + "ru" : "+ Новый проект" + }, + "used-in" : [ "src/app/main/ui/dashboard/projects.cljs" ] }, "dashboard.no-matches-for" : { - "used-in" : [ "src/app/main/ui/dashboard/search.cljs" ], "translations" : { + "ca" : "No s'ha trobat cap coincidència amb “%s“", "en" : "No matches found for “%s“", - "fr" : "Aucune correspondance pour « %s »", - "ru" : "Совпадений для “%s“ не найдено", "es" : "No se encuentra “%s“", - "ca" : "No s'ha trobat cap coincidència amb “%s“" - } + "fr" : "Aucune correspondance pour « %s »", + "ru" : "Совпадений для “%s“ не найдено" + }, + "used-in" : [ "src/app/main/ui/dashboard/search.cljs" ] }, "dashboard.no-projects-placeholder" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { + "ca" : "Els projectes fixats apareixeran aquí", "en" : "Pinned projects will appear here", - "fr" : "Les projets épinglés apparaîtront ici", "es" : "Los proyectos fijados aparecerán aquí", - "ca" : "Els projectes fixats apareixeran aquí" - } + "fr" : "Les projets épinglés apparaîtront ici" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, "dashboard.notifications.email-changed-successfully" : { - "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ], "translations" : { + "ca" : "La teva adreça de correu s'ha actualizat", "en" : "Your email address has been updated successfully", - "fr" : "Votre adresse e‑mail a été mise à jour avec succès", - "ru" : "Ваш email адрес успешно обновлен", "es" : "Tu dirección de correo ha sido actualizada", - "ca" : "La teva adreça de correu s'ha actualizat" - } + "fr" : "Votre adresse e‑mail a été mise à jour avec succès", + "ru" : "Ваш email адрес успешно обновлен" + }, + "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ] }, "dashboard.notifications.email-verified-successfully" : { - "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ], "translations" : { + "ca" : "La teva adreça de correu ha sigut verificada", "en" : "Your email address has been verified successfully", - "fr" : "Votre adresse e‑mail a été vérifiée avec succès", - "ru" : "Ваш email адрес успешно подтвержден", "es" : "Tu dirección de correo ha sido verificada", - "ca" : "La teva adreça de correu ha sigut verificada" - } + "fr" : "Votre adresse e‑mail a été vérifiée avec succès", + "ru" : "Ваш email адрес успешно подтвержден" + }, + "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ] }, "dashboard.notifications.password-saved" : { - "used-in" : [ "src/app/main/ui/settings/password.cljs" ], "translations" : { + "ca" : "La contrasenya s'ha desat correctament", "en" : "Password saved successfully!", - "fr" : "Mot de passe enregistré avec succès !", - "ru" : "Пароль успешно сохранен!", "es" : "¡Contraseña guardada!", - "ca" : "La contrasenya s'ha desat correctament" - } + "fr" : "Mot de passe enregistré avec succès !", + "ru" : "Пароль успешно сохранен!" + }, + "used-in" : [ "src/app/main/ui/settings/password.cljs" ] }, "dashboard.num-of-members" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { + "ca" : "%s membres", "en" : "%s members", - "fr" : "%s membres", "es" : "%s integrantes", - "ca" : "%s membres" - } + "fr" : "%s membres" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, "dashboard.password-change" : { - "used-in" : [ "src/app/main/ui/settings/password.cljs" ], "translations" : { + "ca" : "Canvia la contrasenya", "en" : "Change password", - "fr" : "Changer le mot de passe", - "ru" : "Изменить пароль", "es" : "Cambiar contraseña", - "ca" : "Canvia la contrasenya" - } + "fr" : "Changer le mot de passe", + "ru" : "Изменить пароль" + }, + "used-in" : [ "src/app/main/ui/settings/password.cljs" ] }, "dashboard.projects-title" : { - "used-in" : [ "src/app/main/ui/dashboard/projects.cljs" ], "translations" : { + "ca" : "Projectes", "en" : "Projects", - "fr" : "Projets", - "ru" : "Проекты", "es" : "Proyectos", - "ca" : "Projectes" - } + "fr" : "Projets", + "ru" : "Проекты" + }, + "used-in" : [ "src/app/main/ui/dashboard/projects.cljs" ] }, "dashboard.promote-to-owner" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { + "ca" : "Promoure a propietari", "en" : "Promote to owner", - "fr" : "Promouvoir propriétaire", "es" : "Promover a dueño", - "ca" : "Promoure a propietari" - } + "fr" : "Promouvoir propriétaire" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, "dashboard.remove-account" : { - "used-in" : [ "src/app/main/ui/settings/profile.cljs" ], "translations" : { + "ca" : "Vols esborrar el teu compte?", "en" : "Want to remove your account?", - "fr" : "Vous souhaitez supprimer votre compte ?", - "ru" : "Хотите удалить свой аккаунт?", "es" : "¿Quieres borrar tu cuenta?", - "ca" : "Vols esborrar el teu compte?" - } + "fr" : "Vous souhaitez supprimer votre compte ?", + "ru" : "Хотите удалить свой аккаунт?" + }, + "used-in" : [ "src/app/main/ui/settings/profile.cljs" ] }, "dashboard.remove-shared" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { + "ca" : "Elimina com Biblioteca Compartida", "en" : "Remove as Shared Library", - "fr" : "Retirer en tant que Bibliothèque Partagée", - "ru" : "", "es" : "Eliminar como Biblioteca Compartida", - "ca" : "Elimina com Biblioteca Compartida" - } + "fr" : "Retirer en tant que Bibliothèque Partagée", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ] }, "dashboard.search-placeholder" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { + "ca" : "Cerca…", "en" : "Search…", - "fr" : "Rechercher…", - "ru" : "Поиск …", "es" : "Buscar…", - "ca" : "Cerca…" - } + "fr" : "Rechercher…", + "ru" : "Поиск …" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, "dashboard.searching-for" : { - "used-in" : [ "src/app/main/ui/dashboard/search.cljs" ], "translations" : { + "ca" : "S'está cercant “%s“…", "en" : "Searching for “%s“…", - "fr" : "Recherche de « %s »…", - "ru" : "Ищу “%s“…", "es" : "Buscando “%s“…", - "ca" : "S'está cercant “%s“…" - } + "fr" : "Recherche de « %s »…", + "ru" : "Ищу “%s“…" + }, + "used-in" : [ "src/app/main/ui/dashboard/search.cljs" ] }, "dashboard.select-ui-language" : { - "used-in" : [ "src/app/main/ui/settings/options.cljs" ], "translations" : { + "ca" : "Selecciona la llengua de la interfície", "en" : "Select UI language", - "fr" : "Sélectionnez la langue de l’interface", - "ru" : "Выберите язык интерфейса", "es" : "Cambiar el idioma de la interfaz", - "ca" : "Selecciona la llengua de la interfície" - } + "fr" : "Sélectionnez la langue de l’interface", + "ru" : "Выберите язык интерфейса" + }, + "used-in" : [ "src/app/main/ui/settings/options.cljs" ] }, "dashboard.select-ui-theme" : { - "used-in" : [ "src/app/main/ui/settings/options.cljs" ], "translations" : { + "ca" : "Selecciona un tema", "en" : "Select theme", - "fr" : "Sélectionnez un thème", - "ru" : "Выберите тему", "es" : "Selecciona un tema", - "ca" : "Selecciona un tema" - } + "fr" : "Sélectionnez un thème", + "ru" : "Выберите тему" + }, + "used-in" : [ "src/app/main/ui/settings/options.cljs" ] }, "dashboard.show-all-files" : { - "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { + "ca" : "Veure tots els fitxers", "en" : "Show all files", - "fr" : "Voir tous les fichiers", "es" : "Ver todos los ficheros", - "ca" : "Veure tots els fitxers" - } - }, - "labels.recent" : { - "translations" : { - "en" : "Recent", - "fr" : "Récent", - "ru" : "Недавние", - "es" : "Reciente", - "ca" : "Recent" + "fr" : "Voir tous les fichiers" }, - "unused" : true + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ] }, "dashboard.switch-team" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { + "ca" : "Cambiar d'equip", "en" : "Switch team", - "fr" : "Changer d’équipe", "es" : "Cambiar equipo", - "ca" : "Cambiar d'equip" - } + "fr" : "Changer d’équipe" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, "dashboard.team-info" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { + "ca" : "Informació de l'equip", "en" : "Team info", - "fr" : "Information de l’équipe", "es" : "Información del equipo", - "ca" : "Informació de l'equip" - } + "fr" : "Information de l’équipe" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, "dashboard.team-members" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { + "ca" : "Membres de l'equip", "en" : "Team members", - "fr" : "Membres de l’équipe", "es" : "Integrantes del equipo", - "ca" : "Membres de l'equip" - } + "fr" : "Membres de l’équipe" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, "dashboard.team-projects" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { + "ca" : "Projectes de l'equip", "en" : "Team projects", - "fr" : "Projets de l’équipe", "es" : "Proyectos del equipo", - "ca" : "Projectes de l'equip" - } + "fr" : "Projets de l’équipe" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, "dashboard.theme-change" : { - "used-in" : [ "src/app/main/ui/settings/options.cljs" ], "translations" : { + "ca" : "Tema de l'interfície", "en" : "UI theme", - "fr" : "Thème de l’interface", - "ru" : "Тема интерфейса пользователя", "es" : "Tema visual", - "ca" : "Tema de l'interfície" - } + "fr" : "Thème de l’interface", + "ru" : "Тема интерфейса пользователя" + }, + "used-in" : [ "src/app/main/ui/settings/options.cljs" ] }, "dashboard.title-search" : { - "used-in" : [ "src/app/main/ui/dashboard/search.cljs" ], "translations" : { + "ca" : "Membres de l'equip", "en" : "Search results", - "fr" : "Résultats de recherche", - "ru" : "Результаты поиска", "es" : "Resultados de búsqueda", - "ca" : "Membres de l'equip" - } + "fr" : "Résultats de recherche", + "ru" : "Результаты поиска" + }, + "used-in" : [ "src/app/main/ui/dashboard/search.cljs" ] }, "dashboard.type-something" : { - "used-in" : [ "src/app/main/ui/dashboard/search.cljs" ], "translations" : { + "ca" : "Escriu per cercar resultats", "en" : "Type to search results", - "fr" : "Écrivez pour rechercher", - "ru" : "Введите для поиска", "es" : "Escribe algo para buscar", - "ca" : "Escriu per cercar resultats" - } + "fr" : "Écrivez pour rechercher", + "ru" : "Введите для поиска" + }, + "used-in" : [ "src/app/main/ui/dashboard/search.cljs" ] }, "dashboard.update-settings" : { - "used-in" : [ "src/app/main/ui/settings/profile.cljs", "src/app/main/ui/settings/password.cljs", "src/app/main/ui/settings/options.cljs" ], "translations" : { + "ca" : "Actualitzar opcions", "en" : "Update settings", - "fr" : "Mettre à jour les paramètres", - "ru" : "Обновить настройки", "es" : "Actualizar opciones", - "ca" : "Actualitzar opcions" - } + "fr" : "Mettre à jour les paramètres", + "ru" : "Обновить настройки" + }, + "used-in" : [ "src/app/main/ui/settings/profile.cljs", "src/app/main/ui/settings/password.cljs", "src/app/main/ui/settings/options.cljs" ] }, "dashboard.your-account-title" : { - "used-in" : [ "src/app/main/ui/settings.cljs" ], "translations" : { + "ca" : "El teu compte", "en" : "Your account", - "fr" : "Votre compte", "es" : "Tu cuenta", - "ca" : "El teu compte" - } + "fr" : "Votre compte" + }, + "used-in" : [ "src/app/main/ui/settings.cljs" ] }, "dashboard.your-email" : { - "used-in" : [ "src/app/main/ui/settings/profile.cljs" ], "translations" : { + "ca" : "Correu electrónic", "en" : "Email", - "fr" : "E‑mail", - "ru" : "Email", "es" : "Correo", - "ca" : "Correu electrónic" - } + "fr" : "E‑mail", + "ru" : "Email" + }, + "used-in" : [ "src/app/main/ui/settings/profile.cljs" ] }, "dashboard.your-name" : { - "used-in" : [ "src/app/main/ui/settings/profile.cljs" ], "translations" : { + "ca" : "El teu nom", "en" : "Your name", - "fr" : "Votre nom complet", - "ru" : "Ваше имя", "es" : "Tu nombre", - "ca" : "El teu nom" - } + "fr" : "Votre nom complet", + "ru" : "Ваше имя" + }, + "used-in" : [ "src/app/main/ui/settings/profile.cljs" ] }, "dashboard.your-penpot" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { + "ca" : "El teu Penpot", "en" : "Your Penpot", - "fr" : "Votre Penpot", "es" : "Tu Penpot", - "ca" : "El teu Penpot" - } - }, - "labels.accept" : { - "translations" : { - "en" : "Accept", - "fr" : "Accepter", - "ru" : "Принять", - "es" : "Aceptar", - "ca" : "Acceptar" + "fr" : "Votre Penpot" }, - "unused" : true - }, - "labels.delete" : { - "translations" : { - "en" : "Delete", - "fr" : "Supprimer", - "ru" : "Удалить", - "es" : "Borrar", - "ca" : "Esborrar" - }, - "unused" : true - }, - "labels.rename" : { - "translations" : { - "en" : "Rename", - "fr" : "Renommer", - "ru" : "Переименовать", - "es" : "Renombrar", - "ca" : "Canviar de nom" - }, - "unused" : true - }, - "labels.save" : { - "translations" : { - "en" : "Save", - "fr" : "Enregistrer", - "ru" : "Сохранить", - "es" : "Guardar", - "ca" : "Desa" - }, - "unused" : true + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, "ds.confirm-cancel" : { - "used-in" : [ "src/app/main/ui/confirm.cljs" ], "translations" : { + "ca" : "Cancel·lar", "en" : "Cancel", - "fr" : "Annuler", - "ru" : "Отмена", "es" : "Cancelar", - "ca" : "Cancel·lar" - } + "fr" : "Annuler", + "ru" : "Отмена" + }, + "used-in" : [ "src/app/main/ui/confirm.cljs" ] }, "ds.confirm-ok" : { - "used-in" : [ "src/app/main/ui/confirm.cljs" ], "translations" : { + "ca" : "Ok", "en" : "Ok", - "fr" : "Ok", - "ru" : "Ok", "es" : "Ok", - "ca" : "Ok" - } + "fr" : "Ok", + "ru" : "Ok" + }, + "used-in" : [ "src/app/main/ui/confirm.cljs" ] }, "ds.confirm-title" : { - "used-in" : [ "src/app/main/ui/confirm.cljs", "src/app/main/ui/confirm.cljs" ], "translations" : { + "ca" : "Estàs segur?", "en" : "Are you sure?", - "fr" : "Êtes‑vous sûr ?", - "ru" : "Вы уверены?", "es" : "¿Seguro?", - "ca" : "Estàs segur?" - } + "fr" : "Êtes‑vous sûr ?", + "ru" : "Вы уверены?" + }, + "used-in" : [ "src/app/main/ui/confirm.cljs", "src/app/main/ui/confirm.cljs" ] }, "ds.updated-at" : { - "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ], "translations" : { + "ca" : "Actualitzat: %s", "en" : "Updated: %s", - "fr" : "Mise à jour : %s", - "ru" : "Обновлено: %s", "es" : "Actualizado: %s", - "ca" : "Actualitzat: %s" - } + "fr" : "Mise à jour : %s", + "ru" : "Обновлено: %s" + }, + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ] + }, + "errors.clipboard-not-implemented" : { + "translations" : { + "ca" : "El teu navegador no pot realitzar aquesta operació", + "en" : "Your browser cannot do this operation", + "es" : "Tu navegador no puede realizar esta operación", + "fr" : "Votre navigateur ne peut pas effectuer cette opération", + "ru" : "" + }, + "used-in" : [ "src/app/main/data/workspace.cljs" ] + }, + "errors.email-already-exists" : { + "translations" : { + "ca" : "El correu ja està en ús", + "en" : "Email already used", + "es" : "Este correo ya está en uso", + "fr" : "Adresse e‑mail déjà utilisée", + "ru" : "Такой email уже используется" + }, + "used-in" : [ "src/app/main/ui/auth/verify_token.cljs", "src/app/main/ui/settings/change_email.cljs" ] + }, + "errors.email-already-validated" : { + "translations" : { + "ca" : "El correu ja està validat", + "en" : "Email already validated.", + "es" : "Este correo ya está validado.", + "fr" : "Adresse e‑mail déjà validée.", + "ru" : "Электронная почта уже подтверждена." + }, + "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ] + }, + "errors.email-has-permanent-bounces" : { + "translations" : { + "ca" : "El correu «%s» té molts informes de rebot permanents", + "en" : "The email «%s» has many permanent bounce reports.", + "es" : "El email «%s» tiene varios reportes de rebote permanente." + }, + "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/recovery_request.cljs", "src/app/main/ui/settings/change_email.cljs", "src/app/main/ui/dashboard/team.cljs" ] + }, + "errors.email-invalid-confirmation" : { + "translations" : { + "ca" : "El correu de confirmació ha de coincidir", + "en" : "Confirmation email must match", + "es" : "El correo de confirmación debe coincidir", + "fr" : "L’adresse e‑mail de confirmation doit correspondre", + "ru" : "Email для подтверждения должен совпадать" + }, + "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ] + }, + "errors.generic" : { + "translations" : { + "ca" : "Alguna cosa ha anat malament", + "en" : "Something wrong has happened.", + "es" : "Ha ocurrido algún error.", + "fr" : "Un problème s’est produit.", + "ru" : "Что-то пошло не так." + }, + "used-in" : [ "src/app/main/ui/auth/verify_token.cljs", "src/app/main/ui/settings/profile.cljs", "src/app/main/ui/settings/feedback.cljs", "src/app/main/ui/settings/feedback.cljs", "src/app/main/ui/settings/options.cljs", "src/app/main/ui/dashboard/team.cljs" ] + }, + "errors.google-auth-not-enabled" : { + "translations" : { + "ca" : "L'autenticació amb google ha estat desactivada a aquest servidor", + "en" : "Authentication with google disabled on backend", + "es" : "Autenticación con google esta dehabilitada en el servidor" + }, + "used-in" : [ "src/app/main/ui/auth/login.cljs" ] }, "errors.ldap-disabled" : { "translations" : { "en" : "LDAP authentication is disabled.", "es" : "La autheticacion via LDAP esta deshabilitada." - } - }, - "errors.wrong-credentials" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs" ], - "translations" : { - "en" : "Username or password seems to be wrong.", - "fr" : "Le nom d’utilisateur ou le mot de passe semble être faux.", - "ru" : "Неверное имя пользователя или пароль.", - "es" : "El nombre o la contraseña parece incorrecto.", - "ca" : "El nom d'usuari o la contrasenya sembla incorrecte" - } - }, - "errors.clipboard-not-implemented" : { - "used-in" : [ "src/app/main/data/workspace.cljs" ], - "translations" : { - "en" : "Your browser cannot do this operation", - "fr" : "Votre navigateur ne peut pas effectuer cette opération", - "ru" : "", - "es" : "Tu navegador no puede realizar esta operación", - "ca" : "El teu navegador no pot realitzar aquesta operació" - } - }, - "errors.email-already-exists" : { - "used-in" : [ "src/app/main/ui/auth/verify_token.cljs", "src/app/main/ui/settings/change_email.cljs" ], - "translations" : { - "en" : "Email already used", - "fr" : "Adresse e‑mail déjà utilisée", - "ru" : "Такой email уже используется", - "es" : "Este correo ya está en uso", - "ca" : "El correu ja està en ús" - } - }, - "errors.email-already-validated" : { - "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ], - "translations" : { - "en" : "Email already validated.", - "fr" : "Adresse e‑mail déjà validée.", - "ru" : "Электронная почта уже подтверждена.", - "es" : "Este correo ya está validado.", - "ca" : "El correu ja està validat" - } - }, - "errors.email-has-permanent-bounces" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/recovery_request.cljs", "src/app/main/ui/settings/change_email.cljs", "src/app/main/ui/dashboard/team.cljs" ], - "translations" : { - "en" : "The email «%s» has many permanent bounce reports.", - "es" : "El email «%s» tiene varios reportes de rebote permanente.", - "ca" : "El correu «%s» té molts informes de rebot permanents" - } - }, - "errors.email-invalid-confirmation" : { - "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ], - "translations" : { - "en" : "Confirmation email must match", - "fr" : "L’adresse e‑mail de confirmation doit correspondre", - "ru" : "Email для подтверждения должен совпадать", - "es" : "El correo de confirmación debe coincidir", - "ca" : "El correu de confirmació ha de coincidir" - } - }, - "errors.generic" : { - "used-in" : [ "src/app/main/ui/auth/verify_token.cljs", "src/app/main/ui/settings/profile.cljs", "src/app/main/ui/settings/feedback.cljs", "src/app/main/ui/settings/feedback.cljs", "src/app/main/ui/settings/options.cljs", "src/app/main/ui/dashboard/team.cljs" ], - "translations" : { - "en" : "Something wrong has happened.", - "fr" : "Un problème s’est produit.", - "ru" : "Что-то пошло не так.", - "es" : "Ha ocurrido algún error.", - "ca" : "Alguna cosa ha anat malament" - } - }, - "errors.google-auth-not-enabled" : { - "used-in" : [ "src/app/main/ui/auth/login.cljs" ], - "translations" : { - "en" : "Authentication with google disabled on backend", - "es" : "Autenticación con google esta dehabilitada en el servidor", - "ca" : "L'autenticació amb google ha estat desactivada a aquest servidor" - } + }, + "used-in" : [ "src/app/main/ui/auth/login.cljs" ] }, "errors.media-format-unsupported" : { "translations" : { + "ca" : "El format d'imatge no està suportat (deu ser svg, jpg o png),", "en" : "The image format is not supported (must be svg, jpg or png).", - "fr" : "Le format d’image n’est pas supporté (doit être svg, jpg ou png).", - "ru" : "Формат изображения не поддерживается (должен быть svg, jpg или png).", "es" : "No se reconoce el formato de imagen (debe ser svg, jpg o png).", - "ca" : "El format d'imatge no està suportat (deu ser svg, jpg o png)," + "fr" : "Le format d’image n’est pas supporté (doit être svg, jpg ou png).", + "ru" : "Формат изображения не поддерживается (должен быть svg, jpg или png)." }, "unused" : true }, "errors.media-too-large" : { - "used-in" : [ "src/app/main/data/workspace/persistence.cljs" ], "translations" : { + "ca" : "La imatge es massa gran (ha de tenir menys de 5 mb).", "en" : "The image is too large to be inserted (must be under 5mb).", - "fr" : "L’image est trop grande (doit être inférieure à 5 Mo).", - "ru" : "Изображение слишком большое для вставки (должно быть меньше 5mb).", "es" : "La imagen es demasiado grande (debe tener menos de 5mb).", - "ca" : "La imatge es massa gran (ha de tenir menys de 5 mb)." - } + "fr" : "L’image est trop grande (doit être inférieure à 5 Mo).", + "ru" : "Изображение слишком большое для вставки (должно быть меньше 5mb)." + }, + "used-in" : [ "src/app/main/data/workspace/persistence.cljs" ] }, "errors.media-type-mismatch" : { - "used-in" : [ "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/media.cljs" ], "translations" : { + "ca" : "Sembla que el contingut de la imatge no coincideix amb l'extensió del arxiu", "en" : "Seems that the contents of the image does not match the file extension.", - "fr" : "Il semble que le contenu de l’image ne correspond pas à l’extension de fichier.", - "ru" : "", "es" : "Parece que el contenido de la imagen no coincide con la etensión del archivo.", - "ca" : "Sembla que el contingut de la imatge no coincideix amb l'extensió del arxiu" - } + "fr" : "Il semble que le contenu de l’image ne correspond pas à l’extension de fichier.", + "ru" : "" + }, + "used-in" : [ "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/media.cljs" ] }, "errors.media-type-not-allowed" : { - "used-in" : [ "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/media.cljs" ], "translations" : { + "ca" : "La imatge no sembla pas vàlida", "en" : "Seems that this is not a valid image.", - "fr" : "L’image ne semble pas être valide.", - "ru" : "", "es" : "Parece que no es una imagen válida.", - "ca" : "La imatge no sembla pas vàlida" - } + "fr" : "L’image ne semble pas être valide.", + "ru" : "" + }, + "used-in" : [ "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/media.cljs" ] }, "errors.member-is-muted" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], "translations" : { + "ca" : "El perfil que estàs invitant té els emails mutejats (per informes de spam o rebots alts", "en" : "The profile you inviting has emails muted (spam reports or high bounces).", - "es" : "El perfil que esta invitando tiene los emails silenciados (por reportes de spam o alto indice de rebote).", - "ca" : "El perfil que estàs invitant té els emails mutejats (per informes de spam o rebots alts" - } + "es" : "El perfil que esta invitando tiene los emails silenciados (por reportes de spam o alto indice de rebote)." + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, "errors.network" : { "translations" : { + "ca" : "Impossible connectar amb el servidor principal", "en" : "Unable to connect to backend server.", - "fr" : "Impossible de se connecter au serveur principal.", - "ru" : "Невозможно подключиться к серверу.", "es" : "Ha sido imposible conectar con el servidor principal.", - "ca" : "Impossible connectar amb el servidor principal" + "fr" : "Impossible de se connecter au serveur principal.", + "ru" : "Невозможно подключиться к серверу." }, "unused" : true }, "errors.password-invalid-confirmation" : { - "used-in" : [ "src/app/main/ui/settings/password.cljs" ], "translations" : { + "ca" : "La contrasenya de confirmació ha de coincidir", "en" : "Confirmation password must match", - "fr" : "Le mot de passe de confirmation doit correspondre", - "ru" : "Пароль для подтверждения должен совпадать", "es" : "La contraseña de confirmación debe coincidir", - "ca" : "La contrasenya de confirmació ha de coincidir" - } + "fr" : "Le mot de passe de confirmation doit correspondre", + "ru" : "Пароль для подтверждения должен совпадать" + }, + "used-in" : [ "src/app/main/ui/settings/password.cljs" ] }, "errors.password-too-short" : { - "used-in" : [ "src/app/main/ui/settings/password.cljs" ], "translations" : { + "ca" : "La contrasenya ha de tenir 8 com a mínim 8 caràcters", "en" : "Password should at least be 8 characters", - "fr" : "Le mot de passe doit contenir au moins 8 caractères", - "ru" : "Пароль должен быть минимум 8 символов", "es" : "La contraseña debe tener 8 caracteres como mínimo", - "ca" : "La contrasenya ha de tenir 8 com a mínim 8 caràcters" - } + "fr" : "Le mot de passe doit contenir au moins 8 caractères", + "ru" : "Пароль должен быть минимум 8 символов" + }, + "used-in" : [ "src/app/main/ui/settings/password.cljs" ] }, "errors.profile-is-muted" : { - "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs", "src/app/main/ui/settings/change_email.cljs", "src/app/main/ui/dashboard/team.cljs" ], "translations" : { + "ca" : "El teu perfil te els emails mutejats (per informes de spam o rebots alts).", "en" : "Your profile has emails muted (spam reports or high bounces).", - "es" : "Tu perfil tiene los emails silenciados (por reportes de spam o alto indice de rebote).", - "ca" : "El teu perfil te els emails mutejats (per informes de spam o rebots alts)." - } + "es" : "Tu perfil tiene los emails silenciados (por reportes de spam o alto indice de rebote)." + }, + "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs", "src/app/main/ui/settings/change_email.cljs", "src/app/main/ui/dashboard/team.cljs" ] }, "errors.registration-disabled" : { - "used-in" : [ "src/app/main/ui/auth/register.cljs" ], "translations" : { + "ca" : "El registre està desactivat actualment", "en" : "The registration is currently disabled.", - "fr" : "L’enregistrement est actuellement désactivé.", - "ru" : "Регистрация сейчас отключена.", "es" : "El registro está actualmente desactivado.", - "ca" : "El registre està desactivat actualment" - } + "fr" : "L’enregistrement est actuellement désactivé.", + "ru" : "Регистрация сейчас отключена." + }, + "used-in" : [ "src/app/main/ui/auth/register.cljs" ] }, "errors.unexpected-error" : { - "used-in" : [ "src/app/main/data/media.cljs", "src/app/main/ui/workspace/sidebar/options/exports.cljs", "src/app/main/ui/handoff/exports.cljs" ], "translations" : { + "ca" : "S'ha produït un error inesperat.", "en" : "An unexpected error occurred.", - "fr" : "Une erreur inattendue s’est produite", - "ru" : "Произошла ошибка.", "es" : "Ha ocurrido un error inesperado.", - "ca" : "S'ha produït un error inesperat." - } + "fr" : "Une erreur inattendue s’est produite", + "ru" : "Произошла ошибка." + }, + "used-in" : [ "src/app/main/data/media.cljs", "src/app/main/ui/workspace/sidebar/options/exports.cljs", "src/app/main/ui/handoff/exports.cljs" ] }, "errors.unexpected-token" : { - "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ], "translations" : { + "ca" : "Token desconegut", "en" : "Unknown token", - "es" : "Token desconocido", - "ca" : "Token desconegut" - } + "es" : "Token desconocido" + }, + "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ] + }, + "errors.wrong-credentials" : { + "translations" : { + "ca" : "El nom d'usuari o la contrasenya sembla incorrecte", + "en" : "Username or password seems to be wrong.", + "es" : "El nombre o la contraseña parece incorrecto.", + "fr" : "Le nom d’utilisateur ou le mot de passe semble être faux.", + "ru" : "Неверное имя пользователя или пароль." + }, + "used-in" : [ "src/app/main/ui/auth/login.cljs" ] }, "errors.wrong-old-password" : { - "used-in" : [ "src/app/main/ui/settings/password.cljs" ], "translations" : { + "ca" : "La contrasenya anterior no és correcte", "en" : "Old password is incorrect", - "fr" : "L’ancien mot de passe est incorrect", - "ru" : "Старый пароль неверный", "es" : "La contraseña anterior no es correcta", - "ca" : "La contrasenya anterior no és correcte" - } + "fr" : "L’ancien mot de passe est incorrect", + "ru" : "Старый пароль неверный" + }, + "used-in" : [ "src/app/main/ui/settings/password.cljs" ] }, "feedback.chat-start" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { + "ca" : "Uneix-te al xat.", "en" : "Join the chat", - "es" : "Unirse al chat", - "ca" : "Uneix-te al xat." - } + "es" : "Unirse al chat" + }, + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, "feedback.chat-subtitle" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { + "ca" : "Et ve de gust parlar? Xateja amb nosaltres a Gitter", "en" : "Feeling like talking? Chat with us at Gitter", - "es" : "¿Deseas conversar? Entra al nuestro chat de la comunidad en Gitter", - "ca" : "Et ve de gust parlar? Xateja amb nosaltres a Gitter" - } + "es" : "¿Deseas conversar? Entra al nuestro chat de la comunidad en Gitter" + }, + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, "feedback.description" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { + "ca" : "Descripció", "en" : "Description", - "es" : "Descripción", - "ca" : "Descripció" - } + "es" : "Descripción" + }, + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, "feedback.discussions-go-to" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { + "ca" : "", "en" : "Go to discussions", - "es" : "Ir a las discusiones", - "ca" : "" - } + "es" : "Ir a las discusiones" + }, + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, "feedback.discussions-subtitle1" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { + "ca" : "Uneix-te al fòrum colaboratiu de Penpot.", "en" : "Join Penpot team collaborative communication forum.", - "es" : "Entra al foro colaborativo de Penpot", - "ca" : "Uneix-te al fòrum colaboratiu de Penpot." - } + "es" : "Entra al foro colaborativo de Penpot" + }, + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, "feedback.discussions-subtitle2" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { + "ca" : "Pots fer i respondre preguntes, tenir converses obertes i seguir les decisións que afecten al projecte", "en" : "You can ask and answer questions, have open-ended conversations, and follow along on decisions affecting the project.", - "es" : "", - "ca" : "Pots fer i respondre preguntes, tenir converses obertes i seguir les decisións que afecten al projecte" - } + "es" : "" + }, + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, "feedback.discussions-title" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { + "ca" : "", "en" : "Team discussions", - "es" : "", - "ca" : "" - } + "es" : "" + }, + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, "feedback.subject" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { + "ca" : "Tema", "en" : "Subject", - "es" : "Asunto", - "ca" : "Tema" - } + "es" : "Asunto" + }, + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, "feedback.subtitle" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { + "ca" : "Si us plau descriu la raó del teu correu, especificant si es una incidència, una idea o un dubte. Un membre del nostre equip respondrà tan aviat como pugui.", "en" : "Please describe the reason of your email, specifying if is an issue, an idea or a doubt. A member of our team will respond as soon as possible.", - "es" : "", - "ca" : "Si us plau descriu la raó del teu correu, especificant si es una incidència, una idea o un dubte. Un membre del nostre equip respondrà tan aviat como pugui." - } + "es" : "" + }, + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, "feedback.title" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { + "ca" : "Correu electrònic", "en" : "Email", - "fr" : "Adresse email", - "ru" : "Email", "es" : "Correo electrónico", - "ca" : "Correu electrònic" - } + "fr" : "Adresse email", + "ru" : "Email" + }, + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, "generic.error" : { - "used-in" : [ "src/app/main/ui/settings/password.cljs" ], "translations" : { + "ca" : "S'ha produït un error", "en" : "An error has occurred", - "fr" : "Une erreur s’est produite", - "ru" : "Произошла ошибка", "es" : "Ha ocurrido un error", - "ca" : "S'ha produït un error" - } + "fr" : "Une erreur s’est produite", + "ru" : "Произошла ошибка" + }, + "used-in" : [ "src/app/main/ui/settings/password.cljs" ] }, "handoff.attributes.blur" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/blur.cljs" ], "translations" : { "en" : "Blur", - "fr" : "Flou", - "es" : "Desenfocado" - } + "es" : "Desenfocado", + "fr" : "Flou" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/blur.cljs" ] }, "handoff.attributes.blur.value" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/blur.cljs" ], "translations" : { "en" : "Value", - "fr" : "Valeur", - "es" : "Valor" - } + "es" : "Valor", + "fr" : "Valeur" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/blur.cljs" ] }, "handoff.attributes.color.hex" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/common.cljs" ], "translations" : { "en" : "HEX", - "fr" : "HEX", - "es" : "HEX" - } + "es" : "HEX", + "fr" : "HEX" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/common.cljs" ] }, "handoff.attributes.color.hsla" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/common.cljs" ], "translations" : { "en" : "HSLA", - "fr" : "HSLA", - "es" : "HSLA" - } + "es" : "HSLA", + "fr" : "HSLA" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/common.cljs" ] }, "handoff.attributes.color.rgba" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/common.cljs" ], "translations" : { "en" : "RGBA", - "fr" : "RGBA", - "es" : "RGBA" - } - }, - "labels.content" : { - "translations" : { - "en" : "Content", - "fr" : "Contenu", - "es" : "Contenido" + "es" : "RGBA", + "fr" : "RGBA" }, - "unused" : true + "used-in" : [ "src/app/main/ui/handoff/attributes/common.cljs" ] }, "handoff.attributes.fill" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/fill.cljs" ], "translations" : { "en" : "Fill", - "fr" : "Remplir", - "es" : "Relleno" - } + "es" : "Relleno", + "fr" : "Remplir" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/fill.cljs" ] }, "handoff.attributes.image.download" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/image.cljs" ], "translations" : { "en" : "Download source image", - "fr" : "Télécharger l’image source", - "es" : "Descargar imagen original" - } + "es" : "Descargar imagen original", + "fr" : "Télécharger l’image source" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/image.cljs" ] }, "handoff.attributes.image.height" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/image.cljs" ], "translations" : { "en" : "Height", - "fr" : "Hauteur", - "es" : "Altura" - } + "es" : "Altura", + "fr" : "Hauteur" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/image.cljs" ] }, "handoff.attributes.image.width" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/image.cljs" ], "translations" : { "en" : "Width", - "fr" : "Largeur", - "es" : "Ancho" - } + "es" : "Ancho", + "fr" : "Largeur" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/image.cljs" ] }, "handoff.attributes.layout" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ], "translations" : { "en" : "Layout", - "fr" : "Mise en page", - "es" : "Estructura" - } + "es" : "Estructura", + "fr" : "Mise en page" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ] }, "handoff.attributes.layout.height" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ], "translations" : { "en" : "Height", - "fr" : "Hauteur", - "es" : "Altura" - } + "es" : "Altura", + "fr" : "Hauteur" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ] }, "handoff.attributes.layout.left" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ], "translations" : { "en" : "Left", - "fr" : "Gauche", - "es" : "Izquierda" - } + "es" : "Izquierda", + "fr" : "Gauche" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ] }, "handoff.attributes.layout.radius" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ], "translations" : { "en" : "Radius", - "fr" : "Rayon", - "es" : "Derecha" - } + "es" : "Derecha", + "fr" : "Rayon" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs", "src/app/main/ui/handoff/attributes/layout.cljs" ] }, "handoff.attributes.layout.rotation" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ], "translations" : { "en" : "Rotation", - "fr" : "Rotation", - "es" : "Rotación" - } + "es" : "Rotación", + "fr" : "Rotation" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ] }, "handoff.attributes.layout.top" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ], "translations" : { "en" : "Top", - "fr" : "Haut", - "es" : "Arriba" - } + "es" : "Arriba", + "fr" : "Haut" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ] }, "handoff.attributes.layout.width" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ], "translations" : { "en" : "Width", - "fr" : "Largeur", - "es" : "Ancho" - } + "es" : "Ancho", + "fr" : "Largeur" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ] }, "handoff.attributes.shadow" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ], "translations" : { "en" : "Shadow", - "fr" : "Ombre", - "es" : "Sombra" - } + "es" : "Sombra", + "fr" : "Ombre" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ] }, "handoff.attributes.shadow.shorthand.blur" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ], "translations" : { "en" : "B", - "fr" : "B", - "es" : "B" - } + "es" : "B", + "fr" : "B" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ] }, "handoff.attributes.shadow.shorthand.offset-x" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ], "translations" : { "en" : "X", - "fr" : "X", - "es" : "X" - } + "es" : "X", + "fr" : "X" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ] }, "handoff.attributes.shadow.shorthand.offset-y" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ], "translations" : { "en" : "Y", - "fr" : "Y", - "es" : "Y" - } + "es" : "Y", + "fr" : "Y" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ] }, "handoff.attributes.shadow.shorthand.spread" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ], "translations" : { "en" : "S", - "fr" : "S", - "es" : "S" - } + "es" : "S", + "fr" : "S" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ] }, "handoff.attributes.stroke" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/stroke.cljs" ], "translations" : { "en" : "Stroke", - "fr" : "Contour", - "es" : "Borde" - } - }, - "labels.centered" : { - "translations" : { - "en" : "Center", - "fr" : "Centré", - "es" : "Centrado" + "es" : "Borde", + "fr" : "Contour" }, - "unused" : true + "used-in" : [ "src/app/main/ui/handoff/attributes/stroke.cljs" ] }, "handoff.attributes.stroke.style.dotted" : { "translations" : { "en" : "Dotted", - "fr" : "Pointillé", - "es" : "Punteado" + "es" : "Punteado", + "fr" : "Pointillé" }, "unused" : true }, "handoff.attributes.stroke.style.mixed" : { "translations" : { "en" : "Mixed", - "fr" : "Mixte", - "es" : "Mixto" + "es" : "Mixto", + "fr" : "Mixte" }, "unused" : true }, "handoff.attributes.stroke.style.none" : { "translations" : { "en" : "None", - "fr" : "Aucun", - "es" : "Ninguno" + "es" : "Ninguno", + "fr" : "Aucun" }, "unused" : true }, "handoff.attributes.stroke.style.solid" : { "translations" : { "en" : "Solid", - "fr" : "Solide", - "es" : "Sólido" + "es" : "Sólido", + "fr" : "Solide" }, "unused" : true }, "handoff.attributes.stroke.width" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/stroke.cljs" ], "translations" : { "en" : "Width", - "fr" : "Épaisseur", - "es" : "Ancho" - } + "es" : "Ancho", + "fr" : "Épaisseur" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/stroke.cljs" ] }, "handoff.attributes.typography" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ], "translations" : { "en" : "Typography", - "fr" : "Typographie", - "es" : "Tipografía" - } + "es" : "Tipografía", + "fr" : "Typographie" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ] }, "handoff.attributes.typography.font-family" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ], "translations" : { "en" : "Font Family", - "fr" : "Police de caractères", - "es" : "Familia tipográfica" - } + "es" : "Familia tipográfica", + "fr" : "Police de caractères" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ] }, "handoff.attributes.typography.font-size" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ], "translations" : { "en" : "Font Size", - "fr" : "Taille de police", - "es" : "Tamaño de fuente" - } + "es" : "Tamaño de fuente", + "fr" : "Taille de police" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ] }, "handoff.attributes.typography.font-style" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ], "translations" : { "en" : "Font Style", - "fr" : "Style de police", - "es" : "Estilo de fuente" - } + "es" : "Estilo de fuente", + "fr" : "Style de police" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ] }, "handoff.attributes.typography.letter-spacing" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ], "translations" : { "en" : "Letter Spacing", - "fr" : "Interlettrage", - "es" : "Espaciado de letras" - } + "es" : "Espaciado de letras", + "fr" : "Interlettrage" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ] }, "handoff.attributes.typography.line-height" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ], "translations" : { "en" : "Line Height", - "fr" : "Interlignage", - "es" : "Interlineado" - } + "es" : "Interlineado", + "fr" : "Interlignage" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ] }, "handoff.attributes.typography.text-decoration" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ], "translations" : { "en" : "Text Decoration", - "fr" : "Décoration de texte", - "es" : "Decoración de texto" - } + "es" : "Decoración de texto", + "fr" : "Décoration de texte" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ] }, "handoff.attributes.typography.text-decoration.none" : { "translations" : { "en" : "None", - "fr" : "Aucune", - "es" : "Ninguna" + "es" : "Ninguna", + "fr" : "Aucune" }, "unused" : true }, "handoff.attributes.typography.text-decoration.strikethrough" : { "translations" : { "en" : "Strikethrough", - "fr" : "Barré", - "es" : "Tachar" + "es" : "Tachar", + "fr" : "Barré" }, "unused" : true }, "handoff.attributes.typography.text-decoration.underline" : { "translations" : { "en" : "Underline", - "fr" : "Soulignage", - "es" : "Subrayar" + "es" : "Subrayar", + "fr" : "Soulignage" }, "unused" : true }, "handoff.attributes.typography.text-transform" : { - "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ], "translations" : { "en" : "Text Transform", - "fr" : "Transformation de texte", - "es" : "Transformación de texto" - } + "es" : "Transformación de texto", + "fr" : "Transformation de texte" + }, + "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ] }, "handoff.attributes.typography.text-transform.lowercase" : { "translations" : { "en" : "Lower Case", - "fr" : "Minuscule", - "es" : "Minúsculas" + "es" : "Minúsculas", + "fr" : "Minuscule" }, "unused" : true }, "handoff.attributes.typography.text-transform.none" : { "translations" : { "en" : "None", - "fr" : "Aucune", - "es" : "Ninguna" + "es" : "Ninguna", + "fr" : "Aucune" }, "unused" : true }, "handoff.attributes.typography.text-transform.titlecase" : { "translations" : { "en" : "Title Case", - "fr" : "Premières Lettres en Capitales", - "es" : "Primera en mayúscula" + "es" : "Primera en mayúscula", + "fr" : "Premières Lettres en Capitales" }, "unused" : true }, "handoff.attributes.typography.text-transform.uppercase" : { "translations" : { "en" : "Upper Case", - "fr" : "Capitales", - "es" : "Mayúsculas" + "es" : "Mayúsculas", + "fr" : "Capitales" }, "unused" : true }, "handoff.tabs.code" : { - "used-in" : [ "src/app/main/ui/handoff/right_sidebar.cljs" ], "translations" : { "en" : "Code", - "fr" : "Code", - "es" : "Código" - } + "es" : "Código", + "fr" : "Code" + }, + "used-in" : [ "src/app/main/ui/handoff/right_sidebar.cljs" ] }, "handoff.tabs.code.selected.circle" : { "translations" : { "en" : "Circle", - "fr" : "Cercle", - "es" : "Círculo" + "es" : "Círculo", + "fr" : "Cercle" }, "unused" : true }, "handoff.tabs.code.selected.curve" : { "translations" : { "en" : "Curve", - "fr" : "Courbe", - "es" : "Curva" + "es" : "Curva", + "fr" : "Courbe" }, "unused" : true }, "handoff.tabs.code.selected.frame" : { "translations" : { "en" : "Artboard", - "fr" : "Plan de travail", - "es" : "Mesa de trabajo" + "es" : "Mesa de trabajo", + "fr" : "Plan de travail" }, "unused" : true }, "handoff.tabs.code.selected.group" : { "translations" : { "en" : "Group", - "fr" : "Groupe", - "es" : "Grupo" + "es" : "Grupo", + "fr" : "Groupe" }, "unused" : true }, "handoff.tabs.code.selected.image" : { "translations" : { "en" : "Image", - "fr" : "Image", - "es" : "Imagen" + "es" : "Imagen", + "fr" : "Image" }, "unused" : true }, "handoff.tabs.code.selected.multiple" : { - "used-in" : [ "src/app/main/ui/handoff/right_sidebar.cljs" ], "translations" : { "en" : "%s Selected", - "fr" : "%s Sélectionné", - "es" : "%s Seleccionado" - } + "es" : "%s Seleccionado", + "fr" : "%s Sélectionné" + }, + "used-in" : [ "src/app/main/ui/handoff/right_sidebar.cljs" ] }, "handoff.tabs.code.selected.path" : { "translations" : { "en" : "Path", - "fr" : "Chemin", - "es" : "Trazado" + "es" : "Trazado", + "fr" : "Chemin" }, "unused" : true }, "handoff.tabs.code.selected.rect" : { "translations" : { "en" : "Rectangle", - "fr" : "Rectangle", - "es" : "Rectángulo" + "es" : "Rectángulo", + "fr" : "Rectangle" }, "unused" : true }, "handoff.tabs.code.selected.svg-raw" : { "translations" : { "en" : "SVG", - "fr" : "SVG", - "es" : "SVG" + "es" : "SVG", + "fr" : "SVG" }, "unused" : true }, "handoff.tabs.code.selected.text" : { "translations" : { "en" : "Text", - "fr" : "Texte", - "es" : "Texto" + "es" : "Texto", + "fr" : "Texte" }, "unused" : true }, "handoff.tabs.info" : { - "used-in" : [ "src/app/main/ui/handoff/right_sidebar.cljs" ], "translations" : { "en" : "Info", - "fr" : "Information", - "es" : "Información" - } + "es" : "Información", + "fr" : "Information" + }, + "used-in" : [ "src/app/main/ui/handoff/right_sidebar.cljs" ] }, "history.alert-message" : { "translations" : { "en" : "You are seeing version %s", + "es" : "Estás viendo la versión %s", "fr" : "Vous voyez la version %s", - "ru" : "Ваша версия %s", - "es" : "Estás viendo la versión %s" + "ru" : "Ваша версия %s" + }, + "unused" : true + }, + "labels.accept" : { + "translations" : { + "ca" : "Acceptar", + "en" : "Accept", + "es" : "Aceptar", + "fr" : "Accepter", + "ru" : "Принять" }, "unused" : true }, "labels.admin" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Admin", - "fr" : "Administration", - "es" : "Administración" - } + "es" : "Administración", + "fr" : "Administration" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs" ] }, "labels.all" : { - "used-in" : [ "src/app/main/ui/workspace/comments.cljs" ], "translations" : { "en" : "All", - "fr" : "Tous", - "es" : "Todo" - } + "es" : "Todo", + "fr" : "Tous" + }, + "used-in" : [ "src/app/main/ui/workspace/comments.cljs" ] }, "labels.bad-gateway.desc-message" : { - "used-in" : [ "src/app/main/ui/static.cljs" ], "translations" : { "en" : "Looks like you need to wait a bit and retry; we are performing small maintenance of our servers.", - "fr" : "Il semble que vous deviez attendre un peu et réessayer ; nous effectuons une petite maintenance de nos serveurs.", - "es" : "Parece que necesitas esperar un poco y volverlo a intentar; estamos realizando operaciones de mantenimiento en nuestros servidores." - } + "es" : "Parece que necesitas esperar un poco y volverlo a intentar; estamos realizando operaciones de mantenimiento en nuestros servidores.", + "fr" : "Il semble que vous deviez attendre un peu et réessayer ; nous effectuons une petite maintenance de nos serveurs." + }, + "used-in" : [ "src/app/main/ui/static.cljs" ] }, "labels.bad-gateway.main-message" : { - "used-in" : [ "src/app/main/ui/static.cljs" ], "translations" : { "en" : "Bad Gateway", - "fr" : "Bad Gateway", - "es" : "Bad Gateway" - } + "es" : "Bad Gateway", + "fr" : "Bad Gateway" + }, + "used-in" : [ "src/app/main/ui/static.cljs" ] }, "labels.cancel" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Cancel", + "es" : "Cancelar", "fr" : "Annuler", - "ru" : "Отмена", - "es" : "Cancelar" - } + "ru" : "Отмена" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] + }, + "labels.centered" : { + "translations" : { + "en" : "Center", + "es" : "Centrado", + "fr" : "Centré" + }, + "unused" : true }, "labels.comments" : { - "used-in" : [ "src/app/main/ui/dashboard/comments.cljs" ], "translations" : { "en" : "Comments", - "fr" : "Commentaires", - "es" : "Comentarios" - } + "es" : "Comentarios", + "fr" : "Commentaires" + }, + "used-in" : [ "src/app/main/ui/dashboard/comments.cljs" ] }, "labels.confirm-password" : { - "used-in" : [ "src/app/main/ui/settings/password.cljs" ], "translations" : { "en" : "Confirm password", + "es" : "Confirmar contraseña", "fr" : "Confirmer le mot de passe", - "ru" : "Подтвердите пароль", - "es" : "Confirmar contraseña" - } + "ru" : "Подтвердите пароль" + }, + "used-in" : [ "src/app/main/ui/settings/password.cljs" ] + }, + "labels.content" : { + "translations" : { + "en" : "Content", + "es" : "Contenido", + "fr" : "Contenu" + }, + "unused" : true }, "labels.create-team" : { - "used-in" : [ "src/app/main/ui/dashboard/team_form.cljs", "src/app/main/ui/dashboard/team_form.cljs" ], "translations" : { "en" : "Create new team", "es" : "Crea un nuevo equipo" - } + }, + "used-in" : [ "src/app/main/ui/dashboard/team_form.cljs", "src/app/main/ui/dashboard/team_form.cljs" ] }, "labels.dashboard" : { - "used-in" : [ "src/app/main/ui/settings/sidebar.cljs" ], "translations" : { "en" : "Dashboard", - "fr" : "Tableau de bord", - "es" : "Panel" - } + "es" : "Panel", + "fr" : "Tableau de bord" + }, + "used-in" : [ "src/app/main/ui/settings/sidebar.cljs" ] }, "labels.delete" : { - "used-in" : [ "src/app/main/ui/dashboard/grid.cljs", "src/app/main/ui/dashboard/files.cljs" ], "translations" : { "en" : "Delete", + "es" : "Borrar", "fr" : "Supprimer", - "ru" : "Удалить", - "es" : "Borrar" - } + "ru" : "Удалить" + }, + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs", "src/app/main/ui/dashboard/files.cljs" ] }, "labels.delete-comment" : { - "used-in" : [ "src/app/main/ui/comments.cljs" ], "translations" : { "en" : "Delete comment", - "fr" : "Supprimer le commentaire", - "es" : "Eliminar comentario" - } + "es" : "Eliminar comentario", + "fr" : "Supprimer le commentaire" + }, + "used-in" : [ "src/app/main/ui/comments.cljs" ] }, "labels.delete-comment-thread" : { - "used-in" : [ "src/app/main/ui/comments.cljs" ], "translations" : { "en" : "Delete thread", - "fr" : "Supprimer le fil", - "es" : "Eliminar hilo" - } + "es" : "Eliminar hilo", + "fr" : "Supprimer le fil" + }, + "used-in" : [ "src/app/main/ui/comments.cljs" ] }, "labels.drafts" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Drafts", + "es" : "Borradores", "fr" : "Brouillons", - "ru" : "Черновики", - "es" : "Borradores" - } + "ru" : "Черновики" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, "labels.edit" : { - "used-in" : [ "src/app/main/ui/comments.cljs" ], "translations" : { "en" : "Edit", - "fr" : "Modifier", - "es" : "Editar" - } + "es" : "Editar", + "fr" : "Modifier" + }, + "used-in" : [ "src/app/main/ui/comments.cljs" ] }, "labels.editor" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Editor", - "fr" : "Éditeur", - "es" : "Editor" - } + "es" : "Editor", + "fr" : "Éditeur" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs" ] }, "labels.email" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs" ], "translations" : { "en" : "Email", + "es" : "Correo electrónico", "fr" : "Adresse e‑mail", - "ru" : "Email", - "es" : "Correo electrónico" - } + "ru" : "Email" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs" ] }, "labels.feedback-disabled" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Feedback disabled", "es" : "El modulo de recepción de opiniones esta deshabilitado." - } + }, + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, "labels.feedback-sent" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], "translations" : { "en" : "Feedback sent", "es" : "Opinión enviada" - } + }, + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, "labels.give-feedback" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/settings/sidebar.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ], "translations" : { "en" : "Give feedback", + "es" : "Danos tu opinión", "fr" : "Donnez votre avis", - "ru" : "Дать обратную связь", - "es" : "Danos tu opinión" - } + "ru" : "Дать обратную связь" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/settings/sidebar.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ] }, "labels.hide-resolved-comments" : { - "used-in" : [ "src/app/main/ui/workspace/comments.cljs", "src/app/main/ui/viewer/header.cljs" ], "translations" : { "en" : "Hide resolved comments", - "fr" : "Masquer les commentaires résolus", - "es" : "Ocultar comentarios resueltos" - } - }, - "labels.internal-error.desc-message" : { - "used-in" : [ "src/app/main/ui/static.cljs" ], - "translations" : { - "en" : "Something bad happened. Please retry the operation and if the problem persists, contact with support.", - "fr" : "Un problème s’est produit. Veuillez réessayer l’opération et, si le problème persiste, contacter le service technique.", - "es" : "Ha ocurrido algo extraño. Por favor, reintenta la operación, y si el problema persiste, contacta con el servicio técnico." - } - }, - "labels.internal-error.main-message" : { - "used-in" : [ "src/app/main/ui/static.cljs" ], - "translations" : { - "en" : "Internal Error", - "fr" : "Erreur interne", - "es" : "Error interno" - } - }, - "labels.language" : { - "used-in" : [ "src/app/main/ui/settings/options.cljs" ], - "translations" : { - "en" : "Language", - "fr" : "Langue", - "ru" : "Язык", - "es" : "Idioma" - } - }, - "labels.logout" : { - "used-in" : [ "src/app/main/ui/settings.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ], - "translations" : { - "en" : "Logout", - "fr" : "Se déconnecter", - "ru" : "Выход", - "es" : "Salir" - } - }, - "labels.members" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ], - "translations" : { - "en" : "Members", - "fr" : "Membres", - "es" : "Integrantes" - } - }, - "labels.name" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], - "translations" : { - "en" : "Name", - "fr" : "Nom", - "ru" : "Имя", - "es" : "Nombre" - } - }, - "labels.new-password" : { - "used-in" : [ "src/app/main/ui/settings/password.cljs" ], - "translations" : { - "en" : "New password", - "fr" : "Nouveau mot de passe", - "ru" : "Новый пароль", - "es" : "Nueva contraseña" - } - }, - "labels.no-comments-available" : { - "used-in" : [ "src/app/main/ui/workspace/comments.cljs", "src/app/main/ui/dashboard/comments.cljs" ], - "translations" : { - "en" : "You have no pending comment notifications", - "fr" : "Vous n’avez aucune notification de commentaire en attente", - "es" : "No tienes notificaciones de comentarios pendientes" - } - }, - "labels.not-found.auth-info" : { - "used-in" : [ "src/app/main/ui/static.cljs" ], - "translations" : { - "en" : "You’re signed in as", - "fr" : "Vous êtes connecté en tant que", - "es" : "Estás identificado como" - } - }, - "labels.not-found.desc-message" : { - "used-in" : [ "src/app/main/ui/static.cljs" ], - "translations" : { - "en" : "This page might not exist or you don’t have permissions to access to it.", - "fr" : "Cette page n’existe pas ou vous ne disposez pas des permissions nécessaires pour y accéder.", - "es" : "Esta página no existe o no tienes permisos para verla." - } - }, - "labels.not-found.main-message" : { - "used-in" : [ "src/app/main/ui/static.cljs" ], - "translations" : { - "en" : "Oops!", - "fr" : "Oups !", - "es" : "¡Huy!" - } - }, - "labels.num-of-files" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], - "translations" : { - "en" : [ "1 file", "%s files" ], - "fr" : [ "1 fichier", "%s fichiers" ], - "es" : [ "1 archivo", "%s archivos" ] - } - }, - "labels.num-of-projects" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], - "translations" : { - "en" : [ "1 project", "%s projects" ], - "fr" : [ "1 projet", "%s projets" ], - "es" : [ "1 proyecto", "%s proyectos" ] - } - }, - "labels.old-password" : { - "used-in" : [ "src/app/main/ui/settings/password.cljs" ], - "translations" : { - "en" : "Old password", - "fr" : "Ancien mot de passe", - "ru" : "Старый пароль", - "es" : "Contraseña anterior" - } - }, - "labels.only-yours" : { - "used-in" : [ "src/app/main/ui/workspace/comments.cljs" ], - "translations" : { - "en" : "Only yours", - "fr" : "Seulement les vôtres", - "es" : "Sólo los tuyos" - } - }, - "labels.owner" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs" ], - "translations" : { - "en" : "Owner", - "fr" : "Propriétaire", - "es" : "Dueño" - } - }, - "labels.password" : { - "used-in" : [ "src/app/main/ui/settings/sidebar.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ], - "translations" : { - "en" : "Password", - "fr" : "Mot de passe", - "ru" : "Пароль", - "es" : "Contraseña" - } - }, - "labels.permissions" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], - "translations" : { - "en" : "Permissions", - "fr" : "Permissions", - "es" : "Permisos" - } - }, - "labels.profile" : { - "used-in" : [ "src/app/main/ui/settings/sidebar.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ], - "translations" : { - "en" : "Profile", - "fr" : "Profil", - "ru" : "Профиль", - "es" : "Perfil" - } - }, - "labels.projects" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], - "translations" : { - "en" : "Projects", - "fr" : "Projets", - "ru" : "Проекты", - "es" : "Proyectos" - } - }, - "labels.remove" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs", "src/app/main/ui/dashboard/team.cljs" ], - "translations" : { - "en" : "Remove", - "fr" : "Retirer", - "ru" : "", - "es" : "Quitar" - } - }, - "labels.rename" : { - "used-in" : [ "src/app/main/ui/dashboard/grid.cljs", "src/app/main/ui/dashboard/sidebar.cljs", "src/app/main/ui/dashboard/files.cljs" ], - "translations" : { - "en" : "Rename", - "fr" : "Renommer", - "es" : "Renombrar" - } - }, - "labels.rename-team" : { - "used-in" : [ "src/app/main/ui/dashboard/team_form.cljs" ], - "translations" : { - "en" : "Rename team", - "es" : "Renomba el equipo" - } - }, - "labels.retry" : { - "used-in" : [ "src/app/main/ui/static.cljs", "src/app/main/ui/static.cljs", "src/app/main/ui/static.cljs" ], - "translations" : { - "en" : "Retry", - "fr" : "Réessayer", - "es" : "Reintentar" - } - }, - "labels.role" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], - "translations" : { - "en" : "Role", - "fr" : "Rôle", - "es" : "Cargo" - } - }, - "labels.send" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], - "translations" : { - "en" : "Send", - "es" : "Enviar" - } - }, - "labels.sending" : { - "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ], - "translations" : { - "en" : "Sending...", - "es" : "Enviando..." - } - }, - "labels.service-unavailable.desc-message" : { - "used-in" : [ "src/app/main/ui/static.cljs" ], - "translations" : { - "en" : "We are in programmed maintenance of our systems.", - "fr" : "Nous sommes en maintenance planifiée de nos systèmes.", - "es" : "Estamos en una operación de mantenimiento programado de nuestros sistemas." - } - }, - "labels.service-unavailable.main-message" : { - "used-in" : [ "src/app/main/ui/static.cljs" ], - "translations" : { - "en" : "Service Unavailable", - "fr" : "Service non disponible", - "es" : "El servicio no está disponible" - } - }, - "labels.settings" : { - "used-in" : [ "src/app/main/ui/settings/sidebar.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ], - "translations" : { - "en" : "Settings", - "fr" : "Configuration", - "ru" : "Параметры", - "es" : "Configuración" - } - }, - "labels.shared-libraries" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], - "translations" : { - "en" : "Shared Libraries", - "fr" : "Bibliothèques Partagées", - "ru" : "", - "es" : "Bibliotecas Compartidas" - } - }, - "labels.show-all-comments" : { - "used-in" : [ "src/app/main/ui/workspace/comments.cljs", "src/app/main/ui/viewer/header.cljs" ], - "translations" : { - "en" : "Show all comments", - "fr" : "Afficher tous les commentaires", - "es" : "Mostrar todos los comentarios" - } - }, - "labels.show-your-comments" : { - "used-in" : [ "src/app/main/ui/workspace/comments.cljs", "src/app/main/ui/viewer/header.cljs" ], - "translations" : { - "en" : "Show only yours comments", - "fr" : "Afficher uniquement vos commentaires", - "es" : "Mostrar sólo tus comentarios" - } - }, - "labels.sign-out" : { - "used-in" : [ "src/app/main/ui/static.cljs" ], - "translations" : { - "en" : "Sign out", - "fr" : "Se déconnecter", - "ru" : "Выход", - "es" : "Salir" - } - }, - "labels.update" : { - "used-in" : [ "src/app/main/ui/settings/profile.cljs" ], - "translations" : { - "en" : "Update", - "fr" : "Actualiser", - "ru" : "Обновить", - "es" : "Actualizar" - } - }, - "labels.update-team" : { - "used-in" : [ "src/app/main/ui/dashboard/team_form.cljs" ], - "translations" : { - "en" : "Update team", - "es" : "Actualiza el equipo" - } - }, - "labels.viewer" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], - "translations" : { - "en" : "Viewer", - "fr" : "Spectateur", - "es" : "Visualizador" - } - }, - "labels.write-new-comment" : { - "used-in" : [ "src/app/main/ui/comments.cljs" ], - "translations" : { - "en" : "Write new comment", - "fr" : "Écrire un nouveau commentaire", - "es" : "Escribir un nuevo comentario" - } - }, - "media.loading" : { - "used-in" : [ "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/media.cljs" ], - "translations" : { - "en" : "Loading image…", - "fr" : "Chargement de l’image…", - "ru" : "Загружаю изображение…", - "es" : "Cargando imagen…" - } - }, - "modals.add-shared-confirm.accept" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ], - "translations" : { - "en" : "Add as Shared Library", - "fr" : "Ajouter comme Bibliothèque Partagée", - "ru" : "", - "es" : "Añadir como Biblioteca Compartida" - } - }, - "modals.add-shared-confirm.hint" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ], - "translations" : { - "en" : "Once added as Shared Library, the assets of this file library will be available to be used among the rest of your files.", - "fr" : "Une fois ajoutées en tant que Bibliothèque Partagée, les ressources de cette bibliothèque de fichiers seront disponibles pour être utilisées parmi le reste de vos fichiers.", - "ru" : "", - "es" : "Una vez añadido como Biblioteca Compartida, los recursos de este archivo estarán disponibles para ser usado por el resto de tus archivos." - } - }, - "modals.add-shared-confirm.message" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ], - "translations" : { - "en" : "Add “%s” as Shared Library", - "fr" : "Ajouter « %s » comme Bibliothèque Partagée", - "ru" : "", - "es" : "Añadir “%s” como Biblioteca Compartida" - } - }, - "modals.change-email.confirm-email" : { - "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ], - "translations" : { - "en" : "Verify new email", - "fr" : "Vérifier la nouvelle adresse e‑mail", - "ru" : "Подтвердить новый email адрес", - "es" : "Verificar el nuevo correo" - } - }, - "modals.change-email.info" : { - "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ], - "translations" : { - "en" : "We'll send you an email to your current email “%s” to verify your identity.", - "fr" : "Nous enverrons un e‑mail à votre adresse actuelle « %s » pour vérifier votre identité.", - "ru" : "Мы отправим письмо для подтверждения подлиности на текущий email адрес “%s”.", - "es" : "Enviaremos un mensaje a tu correo actual “%s” para verificar tu identidad." - } - }, - "modals.change-email.new-email" : { - "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ], - "translations" : { - "en" : "New email", - "fr" : "Nouvel e‑mail", - "ru" : "Новый email адрес", - "es" : "Nuevo correo" - } - }, - "modals.change-email.submit" : { - "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ], - "translations" : { - "en" : "Change email", - "fr" : "Changer adresse e‑mail", - "ru" : "Сменить email адрес", - "es" : "Cambiar correo" - } - }, - "modals.change-email.title" : { - "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ], - "translations" : { - "en" : "Change your email", - "fr" : "Changez votre adresse e‑mail", - "ru" : "Сменить email адрес", - "es" : "Cambiar tu correo" - } - }, - "modals.delete-account.cancel" : { - "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ], - "translations" : { - "en" : "Cancel and keep my account", - "fr" : "Annuler et conserver mon compte", - "ru" : "Отменить и сохранить мой аккаунт", - "es" : "Cancelar y mantener mi cuenta" - } - }, - "modals.delete-account.confirm" : { - "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ], - "translations" : { - "en" : "Yes, delete my account", - "fr" : "Oui, supprimer mon compte", - "ru" : "Да, удалить мой аккаунт", - "es" : "Si, borrar mi cuenta" - } - }, - "modals.delete-account.info" : { - "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ], - "translations" : { - "en" : "By removing your account you’ll lose all your current projects and archives.", - "fr" : "En supprimant votre compte, vous perdrez tous vos projets et archives actuelles.", - "ru" : "Удалив аккаунт Вы потеряете все прокты и архивы.", - "es" : "Si borras tu cuenta perderás todos tus proyectos y archivos." - } - }, - "modals.delete-account.title" : { - "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ], - "translations" : { - "en" : "Are you sure you want to delete your account?", - "fr" : "Êtes‑vous sûr de vouloir supprimer votre compte ?", - "ru" : "Вы уверены, что хотите удалить аккаунт?", - "es" : "¿Seguro que quieres borrar tu cuenta?" - } - }, - "modals.delete-comment-thread.accept" : { - "used-in" : [ "src/app/main/ui/comments.cljs" ], - "translations" : { - "en" : "Delete conversation", - "fr" : "Supprimer la conversation", - "es" : "Eliminar conversación" - } - }, - "modals.delete-comment-thread.message" : { - "used-in" : [ "src/app/main/ui/comments.cljs" ], - "translations" : { - "en" : "Are you sure you want to delete this conversation? All comments in this thread will be deleted.", - "fr" : "Êtes‑vous sûr de vouloir supprimer cette conversation ? Tous les commentaires de ce fil seront supprimés.", - "es" : "¿Seguro que quieres eliminar esta conversación? Todos los comentarios en este hilo serán eliminados." - } - }, - "modals.delete-comment-thread.title" : { - "used-in" : [ "src/app/main/ui/comments.cljs" ], - "translations" : { - "en" : "Delete conversation", - "fr" : "Supprimer une conversation", - "es" : "Eliminar conversación" - } - }, - "modals.delete-file-confirm.accept" : { - "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ], - "translations" : { - "en" : "Delete file", - "fr" : "Supprimer le fichier", - "es" : "Eliminar archivo" - } - }, - "modals.delete-file-confirm.message" : { - "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ], - "translations" : { - "en" : "Are you sure you want to delete this file?", - "fr" : "Êtes‑vous sûr de vouloir supprimer ce fichier ?", - "es" : "¿Seguro que quieres eliminar este archivo?" - } - }, - "modals.delete-file-confirm.title" : { - "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ], - "translations" : { - "en" : "Deleting file", - "fr" : "Supprimer un fichier", - "es" : "Eliminando archivo" - } - }, - "modals.delete-page.body" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs" ], - "translations" : { - "en" : "Are you sure you want to delete this page?", - "fr" : "Êtes‑vous sûr de vouloir supprimer cette page ?", - "es" : "¿Seguro que quieres borrar esta página?" - } - }, - "modals.delete-page.title" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs" ], - "translations" : { - "en" : "Delete page", - "fr" : "Supprimer une page", - "es" : "Borrar página" - } - }, - "modals.delete-project-confirm.accept" : { - "used-in" : [ "src/app/main/ui/dashboard/files.cljs" ], - "translations" : { - "en" : "Delete project", - "fr" : "Supprimer le projet", - "es" : "Eliminar proyecto" - } - }, - "modals.delete-project-confirm.message" : { - "used-in" : [ "src/app/main/ui/dashboard/files.cljs" ], - "translations" : { - "en" : "Are you sure you want to delete this project?", - "fr" : "Êtes‑vous sûr de vouloir supprimer ce projet ?", - "es" : "¿Seguro que quieres eliminar este proyecto?" - } - }, - "modals.delete-project-confirm.title" : { - "used-in" : [ "src/app/main/ui/dashboard/files.cljs" ], - "translations" : { - "en" : "Delete project", - "fr" : "Supprimer un projet", - "es" : "Eliminar proyecto" - } - }, - "modals.delete-team-confirm.accept" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], - "translations" : { - "en" : "Delete team", - "fr" : "Supprimer l’équipe", - "es" : "Eliminar equipo" - } - }, - "modals.delete-team-confirm.message" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], - "translations" : { - "en" : "Are you sure you want to delete this team? All projects and files associated with team will be permanently deleted.", - "fr" : "Êtes‑vous sûr de vouloir supprimer cette équipe ? Tous les projets et fichiers associés à l’équipe seront définitivement supprimés.", - "es" : "¿Seguro que quieres eliminar este equipo? Todos los proyectos y archivos asociados con el equipo serán eliminados permamentemente." - } - }, - "modals.delete-team-confirm.title" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], - "translations" : { - "en" : "Deleting team", - "fr" : "Suppression d’une équipe", - "es" : "Eliminando equipo" - } - }, - "modals.delete-team-member-confirm.accept" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], - "translations" : { - "en" : "Delete member", - "fr" : "Supprimer le membre", - "es" : "Eliminando miembro" - } - }, - "modals.delete-team-member-confirm.message" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], - "translations" : { - "en" : "Are you sure you want to delete this member from the team?", - "fr" : "Êtes‑vous sûr de vouloir supprimer ce membre de l’équipe ?", - "es" : "¿Seguro que quieres eliminar este integrante del equipo?" - } - }, - "modals.delete-team-member-confirm.title" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], - "translations" : { - "en" : "Delete team member", - "fr" : "Supprimer un membre d’équipe", - "es" : "Eliminar integrante del equipo" - } - }, - "modals.invite-member.title" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], - "translations" : { - "en" : "Invite to join the team", - "fr" : "Inviter à rejoindre l’équipe", - "es" : "Invitar a unirse al equipo" - } - }, - "modals.leave-and-reassign.hint1" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], - "translations" : { - "en" : "You are %s owner.", - "fr" : "Vous êtes le propriétaire de %s.", - "es" : "Eres %s dueño." - } - }, - "modals.leave-and-reassign.hint2" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], - "translations" : { - "en" : "Select other member to promote before leave", - "fr" : "Sélectionnez un autre membre à promouvoir avant de quitter l’équipe", - "es" : "Promociona otro miembro a dueño antes de abandonar el equipo" - } - }, - "modals.leave-and-reassign.promote-and-leave" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], - "translations" : { - "en" : "Promote and leave", - "fr" : "Promouvoir et quitter", - "es" : "Promocionar y abandonar" - } - }, - "modals.leave-and-reassign.select-memeber-to-promote" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], - "translations" : { - "en" : "Select a member to promote", - "fr" : "Sélectionnez un membre à promouvoir", - "es" : "Selecciona un miembro a promocionar" - } - }, - "modals.leave-and-reassign.title" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], - "translations" : { - "en" : "Select a member to promote", - "fr" : "Sélectionnez un membre à promouvoir", - "es" : "Selecciona un miembro a promocionar" - } - }, - "modals.leave-confirm.accept" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], - "translations" : { - "en" : "Leave team", - "fr" : "Quitter l’équipe", - "es" : "Abandonar el equipo" - } - }, - "modals.leave-confirm.message" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], - "translations" : { - "en" : "Are you sure you want to leave this team?", - "fr" : "Êtes‑vous sûr de vouloir quitter cette équipe ?", - "es" : "¿Seguro que quieres abandonar este equipo?" - } - }, - "modals.leave-confirm.title" : { - "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ], - "translations" : { - "en" : "Leaving team", - "fr" : "Quitter l’équipe", - "es" : "Abandonando el equipo" - } - }, - "modals.promote-owner-confirm.accept" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], - "translations" : { - "en" : "Promote", - "fr" : "Promouvoir", - "es" : "Promocionar" - } - }, - "modals.promote-owner-confirm.message" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], - "translations" : { - "en" : "Are you sure you want to promote this user to owner?", - "fr" : "Êtes‑vous sûr de vouloir promouvoir cette personne propriétaire ?", - "es" : "¿Seguro que quieres promocionar este usuario a dueño?" - } - }, - "modals.promote-owner-confirm.title" : { - "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ], - "translations" : { - "en" : "Promote to owner", - "fr" : "Promouvoir propriétaire", - "es" : "Promocionar a dueño" - } - }, - "modals.remove-shared-confirm.accept" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ], - "translations" : { - "en" : "Remove as Shared Library", - "fr" : "Supprimer en tant que Bibliothèque Partagée", - "ru" : "", - "es" : "Eliminar como Biblioteca Compartida" - } - }, - "modals.remove-shared-confirm.hint" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ], - "translations" : { - "en" : "Once removed as Shared Library, the File Library of this file will stop being available to be used among the rest of your files.", - "fr" : "Une fois supprimée en tant que Bibliothèque Partagée, la Bibliothèque de ce fichier ne pourra plus être utilisée par le reste de vos fichiers.", - "ru" : "", - "es" : "Una vez eliminado como Biblioteca Compartida, la Biblioteca de este archivo dejará de estar disponible para ser usada por el resto de tus archivos." - } - }, - "modals.remove-shared-confirm.message" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ], - "translations" : { - "en" : "Remove “%s” as Shared Library", - "fr" : "Retirer « %s » en tant que Bibliothèque Partagée", - "ru" : "", - "es" : "Añadir “%s” como Biblioteca Compartida" - } - }, - "modals.update-remote-component.accept" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], - "translations" : { - "en" : "Update component", - "fr" : "Actualiser le composant", - "ru" : "", - "es" : "Actualizar componente" - } - }, - "modals.update-remote-component.cancel" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], - "translations" : { - "en" : "Cancel", - "fr" : "Annuler", - "ru" : "", - "es" : "Cancelar" - } - }, - "modals.update-remote-component.hint" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], - "translations" : { - "en" : "You are about to update a component in a shared library. This may affect other files that use it.", - "fr" : "Vous êtes sur le point de mettre à jour le composant d’une Bibliothèque Partagée. Cela peut affecter d’autres fichiers qui l’utilisent.", - "ru" : "", - "es" : "Vas a actualizar un componente en una librería compartida. Esto puede afectar a otros archivos que la usen." - } - }, - "modals.update-remote-component.message" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], - "translations" : { - "en" : "Update a component in a shared library", - "fr" : "Actualiser le composant d’une bibliothèque", - "ru" : "", - "es" : "Actualizar un componente en librería" - } - }, - "notifications.profile-deletion-not-allowed" : { - "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ], - "translations" : { - "en" : "You can't delete you profile. Reassign your teams before proceed.", - "fr" : "Vous ne pouvez pas supprimer votre profil. Réassignez vos équipes avant de continuer.", - "ru" : "Вы не можете удалить профиль. Сначала смените команду.", - "es" : "No puedes borrar tu perfil. Reasigna tus equipos antes de seguir." - } - }, - "notifications.profile-saved" : { - "used-in" : [ "src/app/main/ui/settings/profile.cljs", "src/app/main/ui/settings/feedback.cljs", "src/app/main/ui/settings/options.cljs" ], - "translations" : { - "en" : "Profile saved successfully!", - "fr" : "Profil enregistré avec succès !", - "ru" : "Профиль успешно сохранен!", - "es" : "Perfil guardado correctamente!" - } - }, - "notifications.validation-email-sent" : { - "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ], - "translations" : { - "en" : "Verification email sent to %s. Check your email!", - "fr" : "E‑mail de vérification envoyé à %s. Vérifiez votre e‑mail !", - "es" : "Verificación de email enviada a %s. Comprueba tu correo." - } - }, - "profile.recovery.go-to-login" : { - "used-in" : [ "src/app/main/ui/auth/recovery.cljs" ], - "translations" : { - "en" : "Go to login", - "fr" : "Aller à la page de connexion", - "ru" : null, - "es" : null - } - }, - "settings.multiple" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs", "src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs", "src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs", "src/app/main/ui/workspace/sidebar/options/typography.cljs", "src/app/main/ui/workspace/sidebar/options/typography.cljs", "src/app/main/ui/workspace/sidebar/options/typography.cljs", "src/app/main/ui/workspace/sidebar/options/shadow.cljs", "src/app/main/ui/workspace/sidebar/options/blur.cljs" ], - "translations" : { - "en" : "Mixed", - "fr" : "Divers", - "ru" : "Смешаный", - "es" : "Varios" - } - }, - "viewer.empty-state" : { - "used-in" : [ "src/app/main/ui/handoff.cljs", "src/app/main/ui/viewer.cljs" ], - "translations" : { - "en" : "No frames found on the page.", - "fr" : "Aucun cadre trouvé sur la page.", - "ru" : "На странице не найдено ни одного кадра", - "es" : "No se ha encontrado ningún tablero." - } - }, - "viewer.frame-not-found" : { - "used-in" : [ "src/app/main/ui/handoff.cljs", "src/app/main/ui/viewer.cljs" ], - "translations" : { - "en" : "Frame not found.", - "fr" : "Cadre introuvable.", - "ru" : "Кадры не найдены.", - "es" : "No se encuentra el tablero." - } - }, - "viewer.header.dont-show-interactions" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], - "translations" : { - "en" : "Don't show interactions", - "fr" : "Ne pas afficher les interactions", - "ru" : "Не показывать взаимодействия", - "es" : "No mostrar interacciones" - } - }, - "viewer.header.edit-page" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], - "translations" : { - "en" : "Edit page", - "fr" : "Modifier la page", - "ru" : "Редактировать страницу", - "es" : "Editar página" - } - }, - "viewer.header.fullscreen" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], - "translations" : { - "en" : "Full Screen", - "fr" : "Plein écran", - "ru" : "Полный экран", - "es" : "Pantalla completa" - } - }, - "viewer.header.share.copy-link" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], - "translations" : { - "en" : "Copy link", - "fr" : "Copier le lien", - "ru" : "Копировать ссылку", - "es" : "Copiar enlace" - } - }, - "viewer.header.share.create-link" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], - "translations" : { - "en" : "Create link", - "fr" : "Créer le lien", - "ru" : "Создать ссылку", - "es" : "Crear enlace" - } - }, - "viewer.header.share.placeholder" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], - "translations" : { - "en" : "Share link will appear here", - "fr" : "Le lien de partage apparaîtra ici", - "ru" : "Здесь будет ссылка для обмена", - "es" : "El enlace para compartir aparecerá aquí" - } - }, - "viewer.header.share.remove-link" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], - "translations" : { - "en" : "Remove link", - "fr" : "Supprimer le lien", - "ru" : "Удалить ссылку", - "es" : "Eliminar enlace" - } - }, - "viewer.header.share.subtitle" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], - "translations" : { - "en" : "Anyone with the link will have access", - "fr" : "Toute personne disposant du lien aura accès", - "ru" : "Любой, у кого есть ссылка будет иметь доступ", - "es" : "Cualquiera con el enlace podrá acceder" - } - }, - "viewer.header.share.title" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs", "src/app/main/ui/viewer/header.cljs", "src/app/main/ui/viewer/header.cljs" ], - "translations" : { - "en" : "Share link", - "fr" : "Lien de partage", - "ru" : "Поделиться ссылкой", - "es" : "Enlace" - } - }, - "viewer.header.show-interactions" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], - "translations" : { - "en" : "Show interactions", - "fr" : "Afficher les interactions", - "ru" : "Показывать взаимодействия", - "es" : "Mostrar interacciones" - } - }, - "viewer.header.show-interactions-on-click" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], - "translations" : { - "en" : "Show interactions on click", - "fr" : "Afficher les interactions au clic", - "ru" : "Показывать взаимодействия по клику", - "es" : "Mostrar interacciones al hacer click" - } - }, - "viewer.header.sitemap" : { - "used-in" : [ "src/app/main/ui/viewer/header.cljs" ], - "translations" : { - "en" : "Sitemap", - "fr" : "Plan du site", - "ru" : "План сайта", - "es" : "Mapa del sitio" - } - }, - "workspace.align.hcenter" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ], - "translations" : { - "en" : "Align horizontal center", - "fr" : "Aligner horizontalement au centre", - "ru" : "Выровнять по горизонтали", - "es" : "Alinear al centro" - } - }, - "workspace.align.hdistribute" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ], - "translations" : { - "en" : "Distribute horizontal spacing", - "fr" : "Répartir l’espacement horizontal", - "ru" : "Распределить горизонтальное пространство", - "es" : "Distribuir espacio horizontal" - } - }, - "workspace.align.hleft" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ], - "translations" : { - "en" : "Align left", - "fr" : "Aligner à gauche", - "ru" : "Выровнять по левому краю", - "es" : "Alinear a la izquierda" - } - }, - "workspace.align.hright" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ], - "translations" : { - "en" : "Align right", - "fr" : "Aligner à droite", - "ru" : "Выровнять по правому краю", - "es" : "Alinear a la derecha" - } - }, - "workspace.align.vbottom" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ], - "translations" : { - "en" : "Align bottom", - "fr" : "Aligner en bas", - "ru" : "Выровнять по нижнему краю", - "es" : "Alinear abajo" - } - }, - "workspace.align.vcenter" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ], - "translations" : { - "en" : "Align vertical center", - "fr" : "Aligner verticalement au centre", - "ru" : "Выровнять по вертикали", - "es" : "Alinear al centro" - } - }, - "workspace.align.vdistribute" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ], - "translations" : { - "en" : "Distribute vertical spacing", - "fr" : "Répartir l’espacement vertical", - "ru" : "Распределить вертикальное пространство", - "es" : "Distribuir espacio vertical" - } - }, - "workspace.align.vtop" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ], - "translations" : { - "en" : "Align top", - "fr" : "Aligner en haut", - "ru" : "Выровнять по верхнему краю", - "es" : "Alinear arriba" - } - }, - "workspace.assets.assets" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ], - "translations" : { - "en" : "Assets", - "fr" : "Ressources", - "ru" : "", - "es" : "Recursos" - } - }, - "workspace.assets.box-filter-all" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ], - "translations" : { - "en" : "All assets", - "fr" : "Toutes", - "ru" : "", - "es" : "Todos" - } - }, - "workspace.assets.box-filter-graphics" : { - "translations" : { - "en" : "Graphics", - "fr" : "Graphiques", - "ru" : "", - "es" : "Gráficos" + "es" : "Ocultar comentarios resueltos", + "fr" : "Masquer les commentaires résolus" }, - "unused" : true - }, - "workspace.assets.colors" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ], - "translations" : { - "en" : "Colors", - "fr" : "Couleurs", - "ru" : "", - "es" : "Colores" - } - }, - "workspace.assets.components" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ], - "translations" : { - "en" : "Components", - "fr" : "Composants", - "ru" : "", - "es" : "Componentes" - } - }, - "workspace.assets.delete" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ], - "translations" : { - "en" : "Delete", - "fr" : "Supprimer", - "ru" : "", - "es" : "Borrar" - } - }, - "workspace.assets.duplicate" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ], - "translations" : { - "en" : "Duplicate", - "fr" : "Dupliquer", - "ru" : "", - "es" : "Duplicar" - } - }, - "workspace.assets.edit" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ], - "translations" : { - "en" : "Edit", - "fr" : "Modifier", - "ru" : "", - "es" : "Editar" - } - }, - "workspace.assets.file-library" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ], - "translations" : { - "en" : "File library", - "fr" : "Bibliothèque du fichier", - "ru" : "", - "es" : "Biblioteca del archivo" - } - }, - "workspace.assets.graphics" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ], - "translations" : { - "en" : "Graphics", - "fr" : "Graphiques", - "ru" : "", - "es" : "Gráficos" - } - }, - "workspace.assets.libraries" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ], - "translations" : { - "en" : "Libraries", - "fr" : "Bibliothèques", - "ru" : "", - "es" : "Bibliotecas" - } - }, - "workspace.assets.not-found" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ], - "translations" : { - "en" : "No assets found", - "fr" : "Aucune ressource trouvée", - "ru" : "", - "es" : "No se encontraron recursos" - } - }, - "workspace.assets.rename" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ], - "translations" : { - "en" : "Rename", - "fr" : "Renommer", - "ru" : "", - "es" : "Renombrar" - } - }, - "workspace.assets.search" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ], - "translations" : { - "en" : "Search assets", - "fr" : "Chercher des ressources", - "ru" : "", - "es" : "Buscar recursos" - } - }, - "workspace.assets.shared" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ], - "translations" : { - "en" : "SHARED", - "fr" : "PARTAGÉ", - "ru" : "", - "es" : "COMPARTIDA" - } - }, - "workspace.assets.typography" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ], - "translations" : { - "en" : "Typographies", - "fr" : "Typographies", - "es" : "Tipografías" - } - }, - "workspace.assets.typography.font-id" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], - "translations" : { - "en" : "Font", - "fr" : "Police", - "es" : "Fuente" - } - }, - "workspace.assets.typography.font-size" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], - "translations" : { - "en" : "Size", - "fr" : "Taille", - "es" : "Tamaño" - } - }, - "workspace.assets.typography.font-variant-id" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], - "translations" : { - "en" : "Variant", - "fr" : "Variante", - "es" : "Variante" - } - }, - "workspace.assets.typography.go-to-edit" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], - "translations" : { - "en" : "Go to style library file to edit", - "fr" : "Accéder au fichier de bibliothèque de styles à modifier", - "es" : "Ir al archivo de la biblioteca del estilo para editar" - } - }, - "workspace.assets.typography.letter-spacing" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], - "translations" : { - "en" : "Letter Spacing", - "fr" : "Interlettrage", - "es" : "Interletrado" - } - }, - "workspace.assets.typography.line-height" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], - "translations" : { - "en" : "Line Height", - "fr" : "Interlignage", - "es" : "Interlineado" - } - }, - "workspace.assets.typography.sample" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs", "src/app/main/ui/handoff/attributes/text.cljs", "src/app/main/ui/handoff/attributes/text.cljs" ], - "translations" : { - "en" : "Ag", - "fr" : "Ag", - "es" : "Ag" - } - }, - "workspace.assets.typography.text-transform" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], - "translations" : { - "en" : "Text Transform", - "fr" : "Transformer le texte", - "es" : "Transformar texto" - } - }, - "workspace.gradients.linear" : { - "used-in" : [ "src/app/main/data/workspace/libraries.cljs", "src/app/main/ui/components/color_bullet.cljs" ], - "translations" : { - "en" : "Linear gradient", - "fr" : "Dégradé linéaire", - "es" : "Degradado lineal" - } - }, - "workspace.gradients.radial" : { - "used-in" : [ "src/app/main/data/workspace/libraries.cljs", "src/app/main/ui/components/color_bullet.cljs" ], - "translations" : { - "en" : "Radial gradient", - "fr" : "Dégradé radial", - "es" : "Degradado radial" - } - }, - "workspace.header.menu.disable-dynamic-alignment" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "Disable dynamic alignment", - "fr" : "Désactiver l’alignement dynamique", - "ru" : "Отключить активное выравнивание", - "es" : "Desactivar alineamiento dinámico" - } - }, - "workspace.header.menu.disable-snap-grid" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "Disable snap to grid", - "fr" : "Désactiver l’alignement sur la grille", - "ru" : "Отключить привязку к сетке", - "es" : "Desactivar alinear a la rejilla" - } - }, - "workspace.header.menu.enable-dynamic-alignment" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "Enable dynamic aligment", - "fr" : "Activer l’alignement dynamique", - "ru" : "Включить активное выравнивание", - "es" : "Activar alineamiento dinámico" - } - }, - "workspace.header.menu.enable-snap-grid" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "Snap to grid", - "fr" : "Aligner sur la grille", - "ru" : "Привяка к сетке", - "es" : "Alinear a la rejilla" - } - }, - "workspace.header.menu.hide-assets" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "Hide assets", - "fr" : "Masquer les ressources", - "ru" : "", - "es" : "Ocultar recursos" - } - }, - "workspace.header.menu.hide-grid" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "Hide grids", - "fr" : "Masquer la grille", - "ru" : "Спрятать сетку", - "es" : "Ocultar rejillas" - } - }, - "workspace.header.menu.hide-layers" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "Hide layers", - "fr" : "Masquer les calques", - "ru" : "Спрятать слои", - "es" : "Ocultar capas" - } - }, - "workspace.header.menu.hide-palette" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "Hide color palette", - "fr" : "Masquer la palette de couleurs", - "ru" : "Спрятать палитру цветов", - "es" : "Ocultar paleta de colores" - } - }, - "workspace.header.menu.hide-rules" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "Hide rules", - "fr" : "Masquer les règles", - "ru" : "Спрятать линейки", - "es" : "Ocultar reglas" - } - }, - "workspace.header.menu.select-all" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "Select all", - "fr" : "Tout sélectionner", - "ru" : "", - "es" : "Seleccionar todo" - } - }, - "workspace.header.menu.show-assets" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "Show assets", - "fr" : "Montrer les ressources", - "ru" : "", - "es" : "Mostrar recursos" - } - }, - "workspace.header.menu.show-grid" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "Show grid", - "fr" : "Montrer la grille", - "ru" : "Показать сетку", - "es" : "Mostrar rejilla" - } - }, - "workspace.header.menu.show-layers" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "Show layers", - "fr" : "Montrer les calques", - "ru" : "Показать слои", - "es" : "Mostrar capas" - } - }, - "workspace.header.menu.show-palette" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "Show color palette", - "fr" : "Montrer la palette de couleurs", - "ru" : "Показать палитру цветов", - "es" : "Mostrar paleta de colores" - } - }, - "workspace.header.menu.show-rules" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "Show rules", - "fr" : "Montrer les règles", - "ru" : "Показать линейки", - "es" : "Mostrar reglas" - } - }, - "workspace.header.save-error" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "Error on saving", - "fr" : "Erreur d’enregistrement", - "es" : "Error al guardar" - } - }, - "workspace.header.saved" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "Saved", - "fr" : "Enregistré", - "es" : "Guardado" - } - }, - "workspace.header.saving" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "Saving", - "fr" : "Enregistrement", - "es" : "Guardando" - } - }, - "workspace.header.unsaved" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "Unsaved changes", - "fr" : "Modifications non sauvegardées", - "es" : "Cambios sin guardar" - } - }, - "workspace.header.viewer" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], - "translations" : { - "en" : "View mode (%s)", - "fr" : "Mode spectateur (%s)", - "ru" : "Режим просмотра (%s)", - "es" : "Modo de visualización (%s)" - } - }, - "workspace.libraries.add" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], - "translations" : { - "en" : "Add", - "fr" : "Ajouter", - "ru" : "", - "es" : "Añadir" - } - }, - "workspace.libraries.colors" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], - "translations" : { - "en" : "%s colors", - "fr" : "%s couleurs", - "ru" : "", - "es" : "%s colors" - } - }, - "workspace.libraries.colors.big-thumbnails" : { - "used-in" : [ "src/app/main/ui/workspace/colorpalette.cljs" ], - "translations" : { - "en" : "Big thumbnails", - "fr" : "Grandes vignettes", - "es" : "Miniaturas grandes" - } - }, - "workspace.libraries.colors.file-library" : { - "used-in" : [ "src/app/main/ui/workspace/colorpicker/libraries.cljs", "src/app/main/ui/workspace/colorpalette.cljs" ], - "translations" : { - "en" : "File library", - "fr" : "Bibliothèque du fichier", - "es" : "Biblioteca del archivo" - } - }, - "workspace.libraries.colors.recent-colors" : { - "used-in" : [ "src/app/main/ui/workspace/colorpicker/libraries.cljs", "src/app/main/ui/workspace/colorpalette.cljs" ], - "translations" : { - "en" : "Recent colors", - "fr" : "Couleurs récentes", - "es" : "Colores recientes" - } - }, - "workspace.libraries.colors.save-color" : { - "used-in" : [ "src/app/main/ui/workspace/colorpicker.cljs" ], - "translations" : { - "en" : "Save color style", - "fr" : "Enregistrer le style de couleur", - "es" : "Guardar estilo de color" - } - }, - "workspace.libraries.colors.small-thumbnails" : { - "used-in" : [ "src/app/main/ui/workspace/colorpalette.cljs" ], - "translations" : { - "en" : "Small thumbnails", - "fr" : "Petites vignettes", - "es" : "Miniaturas pequeñas" - } - }, - "workspace.libraries.components" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], - "translations" : { - "en" : "%s components", - "fr" : "%s composants", - "ru" : "", - "es" : "%s componentes" - } - }, - "workspace.libraries.file-library" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], - "translations" : { - "en" : "File library", - "fr" : "Bibliothèque du fichier", - "ru" : "", - "es" : "Biblioteca de este archivo" - } - }, - "workspace.libraries.graphics" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], - "translations" : { - "en" : "%s graphics", - "fr" : "%s graphiques", - "ru" : "", - "es" : "%s gráficos" - } - }, - "workspace.libraries.in-this-file" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], - "translations" : { - "en" : "LIBRARIES IN THIS FILE", - "fr" : "BIBLIOTHÈQUES DANS CE FICHIER", - "ru" : "", - "es" : "BIBLIOTECAS EN ESTE ARCHIVO" - } - }, - "workspace.libraries.libraries" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], - "translations" : { - "en" : "LIBRARIES", - "fr" : "BIBLIOTHÈQUES", - "ru" : "", - "es" : "BIBLIOTECAS" - } - }, - "workspace.libraries.library" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], - "translations" : { - "en" : "LIBRARY", - "fr" : "BIBLIOTHÈQUE", - "ru" : "", - "es" : "BIBLIOTECA" - } - }, - "workspace.libraries.no-libraries-need-sync" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], - "translations" : { - "en" : "There are no Shared Libraries that need update", - "fr" : "Aucune Bibliothèque Partagée n’a besoin d’être mise à jour", - "ru" : "", - "es" : "No hay bibliotecas que necesiten ser actualizadas" - } - }, - "workspace.libraries.no-matches-for" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], - "translations" : { - "en" : "No matches found for “%s“", - "fr" : "Aucune correspondance pour « %s »", - "ru" : "Совпадений для “%s“ не найдено", - "es" : "No se encuentra “%s“" - } - }, - "workspace.libraries.no-shared-libraries-available" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], - "translations" : { - "en" : "There are no Shared Libraries available", - "fr" : "Aucune Bibliothèque Partagée disponible", - "ru" : "", - "es" : "No hay bibliotecas compartidas disponibles" - } - }, - "workspace.libraries.search-shared-libraries" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], - "translations" : { - "en" : "Search shared libraries", - "fr" : "Rechercher des Bibliothèques Partagées", - "ru" : "", - "es" : "Buscar bibliotecas compartidas" - } - }, - "workspace.libraries.shared-libraries" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], - "translations" : { - "en" : "SHARED LIBRARIES", - "fr" : "BIBLIOTHÈQUES PARTAGÉES", - "ru" : "", - "es" : "BIBLIOTECAS COMPARTIDAS" - } - }, - "workspace.libraries.text.multiple-typography" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], - "translations" : { - "en" : "Multiple typographies", - "fr" : "Multiple typographies", - "es" : "Varias tipografías" - } - }, - "workspace.libraries.text.multiple-typography-tooltip" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], - "translations" : { - "en" : "Unlink all typographies", - "fr" : "Dissocier toutes les typographies", - "es" : "Desvincular todas las tipografías" - } - }, - "workspace.libraries.typography" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], - "translations" : { - "en" : "%s typographies", - "fr" : "%s typographies", - "es" : "%s tipografías" - } - }, - "workspace.libraries.update" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], - "translations" : { - "en" : "Update", - "fr" : "Actualiser", - "ru" : "", - "es" : "Actualizar" - } - }, - "workspace.libraries.updates" : { - "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ], - "translations" : { - "en" : "UPDATES", - "fr" : "MISES À JOUR", - "ru" : "", - "es" : "ACTUALIZACIONES" - } - }, - "workspace.library.all" : { - "translations" : { - "en" : "All libraries", - "fr" : "Toutes les bibliothèques", - "ru" : "Все библиотеки", - "es" : "Todas" - }, - "unused" : true + "used-in" : [ "src/app/main/ui/workspace/comments.cljs", "src/app/main/ui/viewer/header.cljs" ] }, "labels.icons" : { "translations" : { "en" : "Icons", + "es" : "Iconos", "fr" : "Icônes", - "ru" : "Иконки", - "es" : "Iconos" + "ru" : "Иконки" }, "unused" : true }, "labels.images" : { "translations" : { "en" : "Images", + "es" : "Imágenes", "fr" : "Images", - "ru" : "Изображения", - "es" : "Imágenes" + "ru" : "Изображения" + }, + "unused" : true + }, + "labels.internal-error.desc-message" : { + "translations" : { + "en" : "Something bad happened. Please retry the operation and if the problem persists, contact with support.", + "es" : "Ha ocurrido algo extraño. Por favor, reintenta la operación, y si el problema persiste, contacta con el servicio técnico.", + "fr" : "Un problème s’est produit. Veuillez réessayer l’opération et, si le problème persiste, contacter le service technique." + }, + "used-in" : [ "src/app/main/ui/static.cljs" ] + }, + "labels.internal-error.main-message" : { + "translations" : { + "en" : "Internal Error", + "es" : "Error interno", + "fr" : "Erreur interne" + }, + "used-in" : [ "src/app/main/ui/static.cljs" ] + }, + "labels.language" : { + "translations" : { + "en" : "Language", + "es" : "Idioma", + "fr" : "Langue", + "ru" : "Язык" + }, + "used-in" : [ "src/app/main/ui/settings/options.cljs" ] + }, + "labels.logout" : { + "translations" : { + "en" : "Logout", + "es" : "Salir", + "fr" : "Se déconnecter", + "ru" : "Выход" + }, + "used-in" : [ "src/app/main/ui/settings.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ] + }, + "labels.members" : { + "translations" : { + "en" : "Members", + "es" : "Integrantes", + "fr" : "Membres" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ] + }, + "labels.name" : { + "translations" : { + "en" : "Name", + "es" : "Nombre", + "fr" : "Nom", + "ru" : "Имя" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] + }, + "labels.new-password" : { + "translations" : { + "en" : "New password", + "es" : "Nueva contraseña", + "fr" : "Nouveau mot de passe", + "ru" : "Новый пароль" + }, + "used-in" : [ "src/app/main/ui/settings/password.cljs" ] + }, + "labels.no-comments-available" : { + "translations" : { + "en" : "You have no pending comment notifications", + "es" : "No tienes notificaciones de comentarios pendientes", + "fr" : "Vous n’avez aucune notification de commentaire en attente" + }, + "used-in" : [ "src/app/main/ui/workspace/comments.cljs", "src/app/main/ui/dashboard/comments.cljs" ] + }, + "labels.not-found.auth-info" : { + "translations" : { + "en" : "You’re signed in as", + "es" : "Estás identificado como", + "fr" : "Vous êtes connecté en tant que" + }, + "used-in" : [ "src/app/main/ui/static.cljs" ] + }, + "labels.not-found.desc-message" : { + "translations" : { + "en" : "This page might not exist or you don’t have permissions to access to it.", + "es" : "Esta página no existe o no tienes permisos para verla.", + "fr" : "Cette page n’existe pas ou vous ne disposez pas des permissions nécessaires pour y accéder." + }, + "used-in" : [ "src/app/main/ui/static.cljs" ] + }, + "labels.not-found.main-message" : { + "translations" : { + "en" : "Oops!", + "es" : "¡Huy!", + "fr" : "Oups !" + }, + "used-in" : [ "src/app/main/ui/static.cljs" ] + }, + "labels.num-of-files" : { + "translations" : { + "en" : [ "1 file", "%s files" ], + "es" : [ "1 archivo", "%s archivos" ], + "fr" : [ "1 fichier", "%s fichiers" ] + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] + }, + "labels.num-of-projects" : { + "translations" : { + "en" : [ "1 project", "%s projects" ], + "es" : [ "1 proyecto", "%s proyectos" ], + "fr" : [ "1 projet", "%s projets" ] + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] + }, + "labels.old-password" : { + "translations" : { + "en" : "Old password", + "es" : "Contraseña anterior", + "fr" : "Ancien mot de passe", + "ru" : "Старый пароль" + }, + "used-in" : [ "src/app/main/ui/settings/password.cljs" ] + }, + "labels.only-yours" : { + "translations" : { + "en" : "Only yours", + "es" : "Sólo los tuyos", + "fr" : "Seulement les vôtres" + }, + "used-in" : [ "src/app/main/ui/workspace/comments.cljs" ] + }, + "labels.owner" : { + "translations" : { + "en" : "Owner", + "es" : "Dueño", + "fr" : "Propriétaire" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs" ] + }, + "labels.password" : { + "translations" : { + "en" : "Password", + "es" : "Contraseña", + "fr" : "Mot de passe", + "ru" : "Пароль" + }, + "used-in" : [ "src/app/main/ui/settings/sidebar.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ] + }, + "labels.permissions" : { + "translations" : { + "en" : "Permissions", + "es" : "Permisos", + "fr" : "Permissions" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] + }, + "labels.profile" : { + "translations" : { + "en" : "Profile", + "es" : "Perfil", + "fr" : "Profil", + "ru" : "Профиль" + }, + "used-in" : [ "src/app/main/ui/settings/sidebar.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ] + }, + "labels.projects" : { + "translations" : { + "en" : "Projects", + "es" : "Proyectos", + "fr" : "Projets", + "ru" : "Проекты" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] + }, + "labels.recent" : { + "translations" : { + "ca" : "Recent", + "en" : "Recent", + "es" : "Reciente", + "fr" : "Récent", + "ru" : "Недавние" + }, + "unused" : true + }, + "labels.remove" : { + "translations" : { + "en" : "Remove", + "es" : "Quitar", + "fr" : "Retirer", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs", "src/app/main/ui/dashboard/team.cljs" ] + }, + "labels.rename" : { + "translations" : { + "en" : "Rename", + "es" : "Renombrar", + "fr" : "Renommer" + }, + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs", "src/app/main/ui/dashboard/sidebar.cljs", "src/app/main/ui/dashboard/files.cljs" ] + }, + "labels.rename-team" : { + "translations" : { + "en" : "Rename team", + "es" : "Renomba el equipo" + }, + "used-in" : [ "src/app/main/ui/dashboard/team_form.cljs" ] + }, + "labels.retry" : { + "translations" : { + "en" : "Retry", + "es" : "Reintentar", + "fr" : "Réessayer" + }, + "used-in" : [ "src/app/main/ui/static.cljs", "src/app/main/ui/static.cljs", "src/app/main/ui/static.cljs" ] + }, + "labels.role" : { + "translations" : { + "en" : "Role", + "es" : "Cargo", + "fr" : "Rôle" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] + }, + "labels.save" : { + "translations" : { + "ca" : "Desa", + "en" : "Save", + "es" : "Guardar", + "fr" : "Enregistrer", + "ru" : "Сохранить" + }, + "unused" : true + }, + "labels.send" : { + "translations" : { + "en" : "Send", + "es" : "Enviar" + }, + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] + }, + "labels.sending" : { + "translations" : { + "en" : "Sending...", + "es" : "Enviando..." + }, + "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] + }, + "labels.service-unavailable.desc-message" : { + "translations" : { + "en" : "We are in programmed maintenance of our systems.", + "es" : "Estamos en una operación de mantenimiento programado de nuestros sistemas.", + "fr" : "Nous sommes en maintenance planifiée de nos systèmes." + }, + "used-in" : [ "src/app/main/ui/static.cljs" ] + }, + "labels.service-unavailable.main-message" : { + "translations" : { + "en" : "Service Unavailable", + "es" : "El servicio no está disponible", + "fr" : "Service non disponible" + }, + "used-in" : [ "src/app/main/ui/static.cljs" ] + }, + "labels.settings" : { + "translations" : { + "en" : "Settings", + "es" : "Configuración", + "fr" : "Configuration", + "ru" : "Параметры" + }, + "used-in" : [ "src/app/main/ui/settings/sidebar.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ] + }, + "labels.shared-libraries" : { + "translations" : { + "en" : "Shared Libraries", + "es" : "Bibliotecas Compartidas", + "fr" : "Bibliothèques Partagées", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] + }, + "labels.show-all-comments" : { + "translations" : { + "en" : "Show all comments", + "es" : "Mostrar todos los comentarios", + "fr" : "Afficher tous les commentaires" + }, + "used-in" : [ "src/app/main/ui/workspace/comments.cljs", "src/app/main/ui/viewer/header.cljs" ] + }, + "labels.show-your-comments" : { + "translations" : { + "en" : "Show only yours comments", + "es" : "Mostrar sólo tus comentarios", + "fr" : "Afficher uniquement vos commentaires" + }, + "used-in" : [ "src/app/main/ui/workspace/comments.cljs", "src/app/main/ui/viewer/header.cljs" ] + }, + "labels.sign-out" : { + "translations" : { + "en" : "Sign out", + "es" : "Salir", + "fr" : "Se déconnecter", + "ru" : "Выход" + }, + "used-in" : [ "src/app/main/ui/static.cljs" ] + }, + "labels.update" : { + "translations" : { + "en" : "Update", + "es" : "Actualizar", + "fr" : "Actualiser", + "ru" : "Обновить" + }, + "used-in" : [ "src/app/main/ui/settings/profile.cljs" ] + }, + "labels.update-team" : { + "translations" : { + "en" : "Update team", + "es" : "Actualiza el equipo" + }, + "used-in" : [ "src/app/main/ui/dashboard/team_form.cljs" ] + }, + "labels.viewer" : { + "translations" : { + "en" : "Viewer", + "es" : "Visualizador", + "fr" : "Spectateur" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] + }, + "labels.write-new-comment" : { + "translations" : { + "en" : "Write new comment", + "es" : "Escribir un nuevo comentario", + "fr" : "Écrire un nouveau commentaire" + }, + "used-in" : [ "src/app/main/ui/comments.cljs" ] + }, + "media.loading" : { + "translations" : { + "en" : "Loading image…", + "es" : "Cargando imagen…", + "fr" : "Chargement de l’image…", + "ru" : "Загружаю изображение…" + }, + "used-in" : [ "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/media.cljs" ] + }, + "modals.add-shared-confirm.accept" : { + "translations" : { + "en" : "Add as Shared Library", + "es" : "Añadir como Biblioteca Compartida", + "fr" : "Ajouter comme Bibliothèque Partagée", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ] + }, + "modals.add-shared-confirm.hint" : { + "translations" : { + "en" : "Once added as Shared Library, the assets of this file library will be available to be used among the rest of your files.", + "es" : "Una vez añadido como Biblioteca Compartida, los recursos de este archivo estarán disponibles para ser usado por el resto de tus archivos.", + "fr" : "Une fois ajoutées en tant que Bibliothèque Partagée, les ressources de cette bibliothèque de fichiers seront disponibles pour être utilisées parmi le reste de vos fichiers.", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ] + }, + "modals.add-shared-confirm.message" : { + "translations" : { + "en" : "Add “%s” as Shared Library", + "es" : "Añadir “%s” como Biblioteca Compartida", + "fr" : "Ajouter « %s » comme Bibliothèque Partagée", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ] + }, + "modals.change-email.confirm-email" : { + "translations" : { + "en" : "Verify new email", + "es" : "Verificar el nuevo correo", + "fr" : "Vérifier la nouvelle adresse e‑mail", + "ru" : "Подтвердить новый email адрес" + }, + "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ] + }, + "modals.change-email.info" : { + "translations" : { + "en" : "We'll send you an email to your current email “%s” to verify your identity.", + "es" : "Enviaremos un mensaje a tu correo actual “%s” para verificar tu identidad.", + "fr" : "Nous enverrons un e‑mail à votre adresse actuelle « %s » pour vérifier votre identité.", + "ru" : "Мы отправим письмо для подтверждения подлиности на текущий email адрес “%s”." + }, + "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ] + }, + "modals.change-email.new-email" : { + "translations" : { + "en" : "New email", + "es" : "Nuevo correo", + "fr" : "Nouvel e‑mail", + "ru" : "Новый email адрес" + }, + "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ] + }, + "modals.change-email.submit" : { + "translations" : { + "en" : "Change email", + "es" : "Cambiar correo", + "fr" : "Changer adresse e‑mail", + "ru" : "Сменить email адрес" + }, + "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ] + }, + "modals.change-email.title" : { + "translations" : { + "en" : "Change your email", + "es" : "Cambiar tu correo", + "fr" : "Changez votre adresse e‑mail", + "ru" : "Сменить email адрес" + }, + "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ] + }, + "modals.delete-account.cancel" : { + "translations" : { + "en" : "Cancel and keep my account", + "es" : "Cancelar y mantener mi cuenta", + "fr" : "Annuler et conserver mon compte", + "ru" : "Отменить и сохранить мой аккаунт" + }, + "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ] + }, + "modals.delete-account.confirm" : { + "translations" : { + "en" : "Yes, delete my account", + "es" : "Si, borrar mi cuenta", + "fr" : "Oui, supprimer mon compte", + "ru" : "Да, удалить мой аккаунт" + }, + "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ] + }, + "modals.delete-account.info" : { + "translations" : { + "en" : "By removing your account you’ll lose all your current projects and archives.", + "es" : "Si borras tu cuenta perderás todos tus proyectos y archivos.", + "fr" : "En supprimant votre compte, vous perdrez tous vos projets et archives actuelles.", + "ru" : "Удалив аккаунт Вы потеряете все прокты и архивы." + }, + "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ] + }, + "modals.delete-account.title" : { + "translations" : { + "en" : "Are you sure you want to delete your account?", + "es" : "¿Seguro que quieres borrar tu cuenta?", + "fr" : "Êtes‑vous sûr de vouloir supprimer votre compte ?", + "ru" : "Вы уверены, что хотите удалить аккаунт?" + }, + "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ] + }, + "modals.delete-comment-thread.accept" : { + "translations" : { + "en" : "Delete conversation", + "es" : "Eliminar conversación", + "fr" : "Supprimer la conversation" + }, + "used-in" : [ "src/app/main/ui/comments.cljs" ] + }, + "modals.delete-comment-thread.message" : { + "translations" : { + "en" : "Are you sure you want to delete this conversation? All comments in this thread will be deleted.", + "es" : "¿Seguro que quieres eliminar esta conversación? Todos los comentarios en este hilo serán eliminados.", + "fr" : "Êtes‑vous sûr de vouloir supprimer cette conversation ? Tous les commentaires de ce fil seront supprimés." + }, + "used-in" : [ "src/app/main/ui/comments.cljs" ] + }, + "modals.delete-comment-thread.title" : { + "translations" : { + "en" : "Delete conversation", + "es" : "Eliminar conversación", + "fr" : "Supprimer une conversation" + }, + "used-in" : [ "src/app/main/ui/comments.cljs" ] + }, + "modals.delete-file-confirm.accept" : { + "translations" : { + "en" : "Delete file", + "es" : "Eliminar archivo", + "fr" : "Supprimer le fichier" + }, + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ] + }, + "modals.delete-file-confirm.message" : { + "translations" : { + "en" : "Are you sure you want to delete this file?", + "es" : "¿Seguro que quieres eliminar este archivo?", + "fr" : "Êtes‑vous sûr de vouloir supprimer ce fichier ?" + }, + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ] + }, + "modals.delete-file-confirm.title" : { + "translations" : { + "en" : "Deleting file", + "es" : "Eliminando archivo", + "fr" : "Supprimer un fichier" + }, + "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ] + }, + "modals.delete-page.body" : { + "translations" : { + "en" : "Are you sure you want to delete this page?", + "es" : "¿Seguro que quieres borrar esta página?", + "fr" : "Êtes‑vous sûr de vouloir supprimer cette page ?" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs" ] + }, + "modals.delete-page.title" : { + "translations" : { + "en" : "Delete page", + "es" : "Borrar página", + "fr" : "Supprimer une page" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs" ] + }, + "modals.delete-project-confirm.accept" : { + "translations" : { + "en" : "Delete project", + "es" : "Eliminar proyecto", + "fr" : "Supprimer le projet" + }, + "used-in" : [ "src/app/main/ui/dashboard/files.cljs" ] + }, + "modals.delete-project-confirm.message" : { + "translations" : { + "en" : "Are you sure you want to delete this project?", + "es" : "¿Seguro que quieres eliminar este proyecto?", + "fr" : "Êtes‑vous sûr de vouloir supprimer ce projet ?" + }, + "used-in" : [ "src/app/main/ui/dashboard/files.cljs" ] + }, + "modals.delete-project-confirm.title" : { + "translations" : { + "en" : "Delete project", + "es" : "Eliminar proyecto", + "fr" : "Supprimer un projet" + }, + "used-in" : [ "src/app/main/ui/dashboard/files.cljs" ] + }, + "modals.delete-team-confirm.accept" : { + "translations" : { + "en" : "Delete team", + "es" : "Eliminar equipo", + "fr" : "Supprimer l’équipe" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] + }, + "modals.delete-team-confirm.message" : { + "translations" : { + "en" : "Are you sure you want to delete this team? All projects and files associated with team will be permanently deleted.", + "es" : "¿Seguro que quieres eliminar este equipo? Todos los proyectos y archivos asociados con el equipo serán eliminados permamentemente.", + "fr" : "Êtes‑vous sûr de vouloir supprimer cette équipe ? Tous les projets et fichiers associés à l’équipe seront définitivement supprimés." + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] + }, + "modals.delete-team-confirm.title" : { + "translations" : { + "en" : "Deleting team", + "es" : "Eliminando equipo", + "fr" : "Suppression d’une équipe" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] + }, + "modals.delete-team-member-confirm.accept" : { + "translations" : { + "en" : "Delete member", + "es" : "Eliminando miembro", + "fr" : "Supprimer le membre" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] + }, + "modals.delete-team-member-confirm.message" : { + "translations" : { + "en" : "Are you sure you want to delete this member from the team?", + "es" : "¿Seguro que quieres eliminar este integrante del equipo?", + "fr" : "Êtes‑vous sûr de vouloir supprimer ce membre de l’équipe ?" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] + }, + "modals.delete-team-member-confirm.title" : { + "translations" : { + "en" : "Delete team member", + "es" : "Eliminar integrante del equipo", + "fr" : "Supprimer un membre d’équipe" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] + }, + "modals.invite-member.title" : { + "translations" : { + "en" : "Invite to join the team", + "es" : "Invitar a unirse al equipo", + "fr" : "Inviter à rejoindre l’équipe" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] + }, + "modals.leave-and-reassign.hint1" : { + "translations" : { + "en" : "You are %s owner.", + "es" : "Eres %s dueño.", + "fr" : "Vous êtes le propriétaire de %s." + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] + }, + "modals.leave-and-reassign.hint2" : { + "translations" : { + "en" : "Select other member to promote before leave", + "es" : "Promociona otro miembro a dueño antes de abandonar el equipo", + "fr" : "Sélectionnez un autre membre à promouvoir avant de quitter l’équipe" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] + }, + "modals.leave-and-reassign.promote-and-leave" : { + "translations" : { + "en" : "Promote and leave", + "es" : "Promocionar y abandonar", + "fr" : "Promouvoir et quitter" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] + }, + "modals.leave-and-reassign.select-memeber-to-promote" : { + "translations" : { + "en" : "Select a member to promote", + "es" : "Selecciona un miembro a promocionar", + "fr" : "Sélectionnez un membre à promouvoir" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] + }, + "modals.leave-and-reassign.title" : { + "translations" : { + "en" : "Select a member to promote", + "es" : "Selecciona un miembro a promocionar", + "fr" : "Sélectionnez un membre à promouvoir" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] + }, + "modals.leave-confirm.accept" : { + "translations" : { + "en" : "Leave team", + "es" : "Abandonar el equipo", + "fr" : "Quitter l’équipe" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] + }, + "modals.leave-confirm.message" : { + "translations" : { + "en" : "Are you sure you want to leave this team?", + "es" : "¿Seguro que quieres abandonar este equipo?", + "fr" : "Êtes‑vous sûr de vouloir quitter cette équipe ?" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] + }, + "modals.leave-confirm.title" : { + "translations" : { + "en" : "Leaving team", + "es" : "Abandonando el equipo", + "fr" : "Quitter l’équipe" + }, + "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] + }, + "modals.promote-owner-confirm.accept" : { + "translations" : { + "en" : "Promote", + "es" : "Promocionar", + "fr" : "Promouvoir" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] + }, + "modals.promote-owner-confirm.message" : { + "translations" : { + "en" : "Are you sure you want to promote this user to owner?", + "es" : "¿Seguro que quieres promocionar este usuario a dueño?", + "fr" : "Êtes‑vous sûr de vouloir promouvoir cette personne propriétaire ?" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] + }, + "modals.promote-owner-confirm.title" : { + "translations" : { + "en" : "Promote to owner", + "es" : "Promocionar a dueño", + "fr" : "Promouvoir propriétaire" + }, + "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] + }, + "modals.remove-shared-confirm.accept" : { + "translations" : { + "en" : "Remove as Shared Library", + "es" : "Eliminar como Biblioteca Compartida", + "fr" : "Supprimer en tant que Bibliothèque Partagée", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ] + }, + "modals.remove-shared-confirm.hint" : { + "translations" : { + "en" : "Once removed as Shared Library, the File Library of this file will stop being available to be used among the rest of your files.", + "es" : "Una vez eliminado como Biblioteca Compartida, la Biblioteca de este archivo dejará de estar disponible para ser usada por el resto de tus archivos.", + "fr" : "Une fois supprimée en tant que Bibliothèque Partagée, la Bibliothèque de ce fichier ne pourra plus être utilisée par le reste de vos fichiers.", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ] + }, + "modals.remove-shared-confirm.message" : { + "translations" : { + "en" : "Remove “%s” as Shared Library", + "es" : "Añadir “%s” como Biblioteca Compartida", + "fr" : "Retirer « %s » en tant que Bibliothèque Partagée", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ] + }, + "modals.update-remote-component.accept" : { + "translations" : { + "en" : "Update component", + "es" : "Actualizar componente", + "fr" : "Actualiser le composant", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ] + }, + "modals.update-remote-component.cancel" : { + "translations" : { + "en" : "Cancel", + "es" : "Cancelar", + "fr" : "Annuler", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ] + }, + "modals.update-remote-component.hint" : { + "translations" : { + "en" : "You are about to update a component in a shared library. This may affect other files that use it.", + "es" : "Vas a actualizar un componente en una librería compartida. Esto puede afectar a otros archivos que la usen.", + "fr" : "Vous êtes sur le point de mettre à jour le composant d’une Bibliothèque Partagée. Cela peut affecter d’autres fichiers qui l’utilisent.", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ] + }, + "modals.update-remote-component.message" : { + "translations" : { + "en" : "Update a component in a shared library", + "es" : "Actualizar un componente en librería", + "fr" : "Actualiser le composant d’une bibliothèque", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ] + }, + "notifications.profile-deletion-not-allowed" : { + "translations" : { + "en" : "You can't delete you profile. Reassign your teams before proceed.", + "es" : "No puedes borrar tu perfil. Reasigna tus equipos antes de seguir.", + "fr" : "Vous ne pouvez pas supprimer votre profil. Réassignez vos équipes avant de continuer.", + "ru" : "Вы не можете удалить профиль. Сначала смените команду." + }, + "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ] + }, + "notifications.profile-saved" : { + "translations" : { + "en" : "Profile saved successfully!", + "es" : "Perfil guardado correctamente!", + "fr" : "Profil enregistré avec succès !", + "ru" : "Профиль успешно сохранен!" + }, + "used-in" : [ "src/app/main/ui/settings/profile.cljs", "src/app/main/ui/settings/feedback.cljs", "src/app/main/ui/settings/options.cljs" ] + }, + "notifications.validation-email-sent" : { + "translations" : { + "en" : "Verification email sent to %s. Check your email!", + "es" : "Verificación de email enviada a %s. Comprueba tu correo.", + "fr" : "E‑mail de vérification envoyé à %s. Vérifiez votre e‑mail !" + }, + "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ] + }, + "profile.recovery.go-to-login" : { + "translations" : { + "en" : "Go to login", + "es" : null, + "fr" : "Aller à la page de connexion", + "ru" : null + }, + "used-in" : [ "src/app/main/ui/auth/recovery.cljs" ] + }, + "settings.multiple" : { + "translations" : { + "en" : "Mixed", + "es" : "Varios", + "fr" : "Divers", + "ru" : "Смешаный" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs", "src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs", "src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs", "src/app/main/ui/workspace/sidebar/options/typography.cljs", "src/app/main/ui/workspace/sidebar/options/typography.cljs", "src/app/main/ui/workspace/sidebar/options/typography.cljs", "src/app/main/ui/workspace/sidebar/options/shadow.cljs", "src/app/main/ui/workspace/sidebar/options/blur.cljs" ] + }, + "viewer.empty-state" : { + "translations" : { + "en" : "No frames found on the page.", + "es" : "No se ha encontrado ningún tablero.", + "fr" : "Aucun cadre trouvé sur la page.", + "ru" : "На странице не найдено ни одного кадра" + }, + "used-in" : [ "src/app/main/ui/handoff.cljs", "src/app/main/ui/viewer.cljs" ] + }, + "viewer.frame-not-found" : { + "translations" : { + "en" : "Frame not found.", + "es" : "No se encuentra el tablero.", + "fr" : "Cadre introuvable.", + "ru" : "Кадры не найдены." + }, + "used-in" : [ "src/app/main/ui/handoff.cljs", "src/app/main/ui/viewer.cljs" ] + }, + "viewer.header.dont-show-interactions" : { + "translations" : { + "en" : "Don't show interactions", + "es" : "No mostrar interacciones", + "fr" : "Ne pas afficher les interactions", + "ru" : "Не показывать взаимодействия" + }, + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] + }, + "viewer.header.edit-page" : { + "translations" : { + "en" : "Edit page", + "es" : "Editar página", + "fr" : "Modifier la page", + "ru" : "Редактировать страницу" + }, + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] + }, + "viewer.header.fullscreen" : { + "translations" : { + "en" : "Full Screen", + "es" : "Pantalla completa", + "fr" : "Plein écran", + "ru" : "Полный экран" + }, + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] + }, + "viewer.header.share.copy-link" : { + "translations" : { + "en" : "Copy link", + "es" : "Copiar enlace", + "fr" : "Copier le lien", + "ru" : "Копировать ссылку" + }, + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] + }, + "viewer.header.share.create-link" : { + "translations" : { + "en" : "Create link", + "es" : "Crear enlace", + "fr" : "Créer le lien", + "ru" : "Создать ссылку" + }, + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] + }, + "viewer.header.share.placeholder" : { + "translations" : { + "en" : "Share link will appear here", + "es" : "El enlace para compartir aparecerá aquí", + "fr" : "Le lien de partage apparaîtra ici", + "ru" : "Здесь будет ссылка для обмена" + }, + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] + }, + "viewer.header.share.remove-link" : { + "translations" : { + "en" : "Remove link", + "es" : "Eliminar enlace", + "fr" : "Supprimer le lien", + "ru" : "Удалить ссылку" + }, + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] + }, + "viewer.header.share.subtitle" : { + "translations" : { + "en" : "Anyone with the link will have access", + "es" : "Cualquiera con el enlace podrá acceder", + "fr" : "Toute personne disposant du lien aura accès", + "ru" : "Любой, у кого есть ссылка будет иметь доступ" + }, + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] + }, + "viewer.header.share.title" : { + "translations" : { + "en" : "Share link", + "es" : "Enlace", + "fr" : "Lien de partage", + "ru" : "Поделиться ссылкой" + }, + "used-in" : [ "src/app/main/ui/viewer/header.cljs", "src/app/main/ui/viewer/header.cljs", "src/app/main/ui/viewer/header.cljs" ] + }, + "viewer.header.show-interactions" : { + "translations" : { + "en" : "Show interactions", + "es" : "Mostrar interacciones", + "fr" : "Afficher les interactions", + "ru" : "Показывать взаимодействия" + }, + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] + }, + "viewer.header.show-interactions-on-click" : { + "translations" : { + "en" : "Show interactions on click", + "es" : "Mostrar interacciones al hacer click", + "fr" : "Afficher les interactions au clic", + "ru" : "Показывать взаимодействия по клику" + }, + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] + }, + "viewer.header.sitemap" : { + "translations" : { + "en" : "Sitemap", + "es" : "Mapa del sitio", + "fr" : "Plan du site", + "ru" : "План сайта" + }, + "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] + }, + "workspace.align.hcenter" : { + "translations" : { + "en" : "Align horizontal center", + "es" : "Alinear al centro", + "fr" : "Aligner horizontalement au centre", + "ru" : "Выровнять по горизонтали" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ] + }, + "workspace.align.hdistribute" : { + "translations" : { + "en" : "Distribute horizontal spacing", + "es" : "Distribuir espacio horizontal", + "fr" : "Répartir l’espacement horizontal", + "ru" : "Распределить горизонтальное пространство" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ] + }, + "workspace.align.hleft" : { + "translations" : { + "en" : "Align left", + "es" : "Alinear a la izquierda", + "fr" : "Aligner à gauche", + "ru" : "Выровнять по левому краю" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ] + }, + "workspace.align.hright" : { + "translations" : { + "en" : "Align right", + "es" : "Alinear a la derecha", + "fr" : "Aligner à droite", + "ru" : "Выровнять по правому краю" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ] + }, + "workspace.align.vbottom" : { + "translations" : { + "en" : "Align bottom", + "es" : "Alinear abajo", + "fr" : "Aligner en bas", + "ru" : "Выровнять по нижнему краю" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ] + }, + "workspace.align.vcenter" : { + "translations" : { + "en" : "Align vertical center", + "es" : "Alinear al centro", + "fr" : "Aligner verticalement au centre", + "ru" : "Выровнять по вертикали" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ] + }, + "workspace.align.vdistribute" : { + "translations" : { + "en" : "Distribute vertical spacing", + "es" : "Distribuir espacio vertical", + "fr" : "Répartir l’espacement vertical", + "ru" : "Распределить вертикальное пространство" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ] + }, + "workspace.align.vtop" : { + "translations" : { + "en" : "Align top", + "es" : "Alinear arriba", + "fr" : "Aligner en haut", + "ru" : "Выровнять по верхнему краю" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ] + }, + "workspace.assets.assets" : { + "translations" : { + "en" : "Assets", + "es" : "Recursos", + "fr" : "Ressources", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ] + }, + "workspace.assets.box-filter-all" : { + "translations" : { + "en" : "All assets", + "es" : "Todos", + "fr" : "Toutes", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ] + }, + "workspace.assets.box-filter-graphics" : { + "translations" : { + "en" : "Graphics", + "es" : "Gráficos", + "fr" : "Graphiques", + "ru" : "" + }, + "unused" : true + }, + "workspace.assets.colors" : { + "translations" : { + "en" : "Colors", + "es" : "Colores", + "fr" : "Couleurs", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ] + }, + "workspace.assets.components" : { + "translations" : { + "en" : "Components", + "es" : "Componentes", + "fr" : "Composants", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ] + }, + "workspace.assets.delete" : { + "translations" : { + "en" : "Delete", + "es" : "Borrar", + "fr" : "Supprimer", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ] + }, + "workspace.assets.duplicate" : { + "translations" : { + "en" : "Duplicate", + "es" : "Duplicar", + "fr" : "Dupliquer", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ] + }, + "workspace.assets.edit" : { + "translations" : { + "en" : "Edit", + "es" : "Editar", + "fr" : "Modifier", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ] + }, + "workspace.assets.file-library" : { + "translations" : { + "en" : "File library", + "es" : "Biblioteca del archivo", + "fr" : "Bibliothèque du fichier", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ] + }, + "workspace.assets.graphics" : { + "translations" : { + "en" : "Graphics", + "es" : "Gráficos", + "fr" : "Graphiques", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ] + }, + "workspace.assets.libraries" : { + "translations" : { + "en" : "Libraries", + "es" : "Bibliotecas", + "fr" : "Bibliothèques", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ] + }, + "workspace.assets.not-found" : { + "translations" : { + "en" : "No assets found", + "es" : "No se encontraron recursos", + "fr" : "Aucune ressource trouvée", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ] + }, + "workspace.assets.rename" : { + "translations" : { + "en" : "Rename", + "es" : "Renombrar", + "fr" : "Renommer", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ] + }, + "workspace.assets.search" : { + "translations" : { + "en" : "Search assets", + "es" : "Buscar recursos", + "fr" : "Chercher des ressources", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ] + }, + "workspace.assets.shared" : { + "translations" : { + "en" : "SHARED", + "es" : "COMPARTIDA", + "fr" : "PARTAGÉ", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ] + }, + "workspace.assets.typography" : { + "translations" : { + "en" : "Typographies", + "es" : "Tipografías", + "fr" : "Typographies" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ] + }, + "workspace.assets.typography.font-id" : { + "translations" : { + "en" : "Font", + "es" : "Fuente", + "fr" : "Police" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] + }, + "workspace.assets.typography.font-size" : { + "translations" : { + "en" : "Size", + "es" : "Tamaño", + "fr" : "Taille" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] + }, + "workspace.assets.typography.font-variant-id" : { + "translations" : { + "en" : "Variant", + "es" : "Variante", + "fr" : "Variante" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] + }, + "workspace.assets.typography.go-to-edit" : { + "translations" : { + "en" : "Go to style library file to edit", + "es" : "Ir al archivo de la biblioteca del estilo para editar", + "fr" : "Accéder au fichier de bibliothèque de styles à modifier" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] + }, + "workspace.assets.typography.letter-spacing" : { + "translations" : { + "en" : "Letter Spacing", + "es" : "Interletrado", + "fr" : "Interlettrage" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] + }, + "workspace.assets.typography.line-height" : { + "translations" : { + "en" : "Line Height", + "es" : "Interlineado", + "fr" : "Interlignage" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] + }, + "workspace.assets.typography.sample" : { + "translations" : { + "en" : "Ag", + "es" : "Ag", + "fr" : "Ag" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs", "src/app/main/ui/handoff/attributes/text.cljs", "src/app/main/ui/handoff/attributes/text.cljs" ] + }, + "workspace.assets.typography.text-transform" : { + "translations" : { + "en" : "Text Transform", + "es" : "Transformar texto", + "fr" : "Transformer le texte" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] + }, + "workspace.gradients.linear" : { + "translations" : { + "en" : "Linear gradient", + "es" : "Degradado lineal", + "fr" : "Dégradé linéaire" + }, + "used-in" : [ "src/app/main/data/workspace/libraries.cljs", "src/app/main/ui/components/color_bullet.cljs" ] + }, + "workspace.gradients.radial" : { + "translations" : { + "en" : "Radial gradient", + "es" : "Degradado radial", + "fr" : "Dégradé radial" + }, + "used-in" : [ "src/app/main/data/workspace/libraries.cljs", "src/app/main/ui/components/color_bullet.cljs" ] + }, + "workspace.header.menu.disable-dynamic-alignment" : { + "translations" : { + "en" : "Disable dynamic alignment", + "es" : "Desactivar alineamiento dinámico", + "fr" : "Désactiver l’alignement dynamique", + "ru" : "Отключить активное выравнивание" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.header.menu.disable-snap-grid" : { + "translations" : { + "en" : "Disable snap to grid", + "es" : "Desactivar alinear a la rejilla", + "fr" : "Désactiver l’alignement sur la grille", + "ru" : "Отключить привязку к сетке" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.header.menu.enable-dynamic-alignment" : { + "translations" : { + "en" : "Enable dynamic aligment", + "es" : "Activar alineamiento dinámico", + "fr" : "Activer l’alignement dynamique", + "ru" : "Включить активное выравнивание" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.header.menu.enable-snap-grid" : { + "translations" : { + "en" : "Snap to grid", + "es" : "Alinear a la rejilla", + "fr" : "Aligner sur la grille", + "ru" : "Привяка к сетке" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.header.menu.hide-assets" : { + "translations" : { + "en" : "Hide assets", + "es" : "Ocultar recursos", + "fr" : "Masquer les ressources", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.header.menu.hide-grid" : { + "translations" : { + "en" : "Hide grids", + "es" : "Ocultar rejillas", + "fr" : "Masquer la grille", + "ru" : "Спрятать сетку" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.header.menu.hide-layers" : { + "translations" : { + "en" : "Hide layers", + "es" : "Ocultar capas", + "fr" : "Masquer les calques", + "ru" : "Спрятать слои" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.header.menu.hide-palette" : { + "translations" : { + "en" : "Hide color palette", + "es" : "Ocultar paleta de colores", + "fr" : "Masquer la palette de couleurs", + "ru" : "Спрятать палитру цветов" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.header.menu.hide-rules" : { + "translations" : { + "en" : "Hide rules", + "es" : "Ocultar reglas", + "fr" : "Masquer les règles", + "ru" : "Спрятать линейки" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.header.menu.select-all" : { + "translations" : { + "en" : "Select all", + "es" : "Seleccionar todo", + "fr" : "Tout sélectionner", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.header.menu.show-assets" : { + "translations" : { + "en" : "Show assets", + "es" : "Mostrar recursos", + "fr" : "Montrer les ressources", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.header.menu.show-grid" : { + "translations" : { + "en" : "Show grid", + "es" : "Mostrar rejilla", + "fr" : "Montrer la grille", + "ru" : "Показать сетку" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.header.menu.show-layers" : { + "translations" : { + "en" : "Show layers", + "es" : "Mostrar capas", + "fr" : "Montrer les calques", + "ru" : "Показать слои" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.header.menu.show-palette" : { + "translations" : { + "en" : "Show color palette", + "es" : "Mostrar paleta de colores", + "fr" : "Montrer la palette de couleurs", + "ru" : "Показать палитру цветов" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.header.menu.show-rules" : { + "translations" : { + "en" : "Show rules", + "es" : "Mostrar reglas", + "fr" : "Montrer les règles", + "ru" : "Показать линейки" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.header.save-error" : { + "translations" : { + "en" : "Error on saving", + "es" : "Error al guardar", + "fr" : "Erreur d’enregistrement" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.header.saved" : { + "translations" : { + "en" : "Saved", + "es" : "Guardado", + "fr" : "Enregistré" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.header.saving" : { + "translations" : { + "en" : "Saving", + "es" : "Guardando", + "fr" : "Enregistrement" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.header.unsaved" : { + "translations" : { + "en" : "Unsaved changes", + "es" : "Cambios sin guardar", + "fr" : "Modifications non sauvegardées" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.header.viewer" : { + "translations" : { + "en" : "View mode (%s)", + "es" : "Modo de visualización (%s)", + "fr" : "Mode spectateur (%s)", + "ru" : "Режим просмотра (%s)" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] + }, + "workspace.libraries.add" : { + "translations" : { + "en" : "Add", + "es" : "Añadir", + "fr" : "Ajouter", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] + }, + "workspace.libraries.colors" : { + "translations" : { + "en" : "%s colors", + "es" : "%s colors", + "fr" : "%s couleurs", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] + }, + "workspace.libraries.colors.big-thumbnails" : { + "translations" : { + "en" : "Big thumbnails", + "es" : "Miniaturas grandes", + "fr" : "Grandes vignettes" + }, + "used-in" : [ "src/app/main/ui/workspace/colorpalette.cljs" ] + }, + "workspace.libraries.colors.file-library" : { + "translations" : { + "en" : "File library", + "es" : "Biblioteca del archivo", + "fr" : "Bibliothèque du fichier" + }, + "used-in" : [ "src/app/main/ui/workspace/colorpicker/libraries.cljs", "src/app/main/ui/workspace/colorpalette.cljs" ] + }, + "workspace.libraries.colors.recent-colors" : { + "translations" : { + "en" : "Recent colors", + "es" : "Colores recientes", + "fr" : "Couleurs récentes" + }, + "used-in" : [ "src/app/main/ui/workspace/colorpicker/libraries.cljs", "src/app/main/ui/workspace/colorpalette.cljs" ] + }, + "workspace.libraries.colors.save-color" : { + "translations" : { + "en" : "Save color style", + "es" : "Guardar estilo de color", + "fr" : "Enregistrer le style de couleur" + }, + "used-in" : [ "src/app/main/ui/workspace/colorpicker.cljs" ] + }, + "workspace.libraries.colors.small-thumbnails" : { + "translations" : { + "en" : "Small thumbnails", + "es" : "Miniaturas pequeñas", + "fr" : "Petites vignettes" + }, + "used-in" : [ "src/app/main/ui/workspace/colorpalette.cljs" ] + }, + "workspace.libraries.components" : { + "translations" : { + "en" : "%s components", + "es" : "%s componentes", + "fr" : "%s composants", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] + }, + "workspace.libraries.file-library" : { + "translations" : { + "en" : "File library", + "es" : "Biblioteca de este archivo", + "fr" : "Bibliothèque du fichier", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] + }, + "workspace.libraries.graphics" : { + "translations" : { + "en" : "%s graphics", + "es" : "%s gráficos", + "fr" : "%s graphiques", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] + }, + "workspace.libraries.in-this-file" : { + "translations" : { + "en" : "LIBRARIES IN THIS FILE", + "es" : "BIBLIOTECAS EN ESTE ARCHIVO", + "fr" : "BIBLIOTHÈQUES DANS CE FICHIER", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] + }, + "workspace.libraries.libraries" : { + "translations" : { + "en" : "LIBRARIES", + "es" : "BIBLIOTECAS", + "fr" : "BIBLIOTHÈQUES", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] + }, + "workspace.libraries.library" : { + "translations" : { + "en" : "LIBRARY", + "es" : "BIBLIOTECA", + "fr" : "BIBLIOTHÈQUE", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] + }, + "workspace.libraries.no-libraries-need-sync" : { + "translations" : { + "en" : "There are no Shared Libraries that need update", + "es" : "No hay bibliotecas que necesiten ser actualizadas", + "fr" : "Aucune Bibliothèque Partagée n’a besoin d’être mise à jour", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] + }, + "workspace.libraries.no-matches-for" : { + "translations" : { + "en" : "No matches found for “%s“", + "es" : "No se encuentra “%s“", + "fr" : "Aucune correspondance pour « %s »", + "ru" : "Совпадений для “%s“ не найдено" + }, + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] + }, + "workspace.libraries.no-shared-libraries-available" : { + "translations" : { + "en" : "There are no Shared Libraries available", + "es" : "No hay bibliotecas compartidas disponibles", + "fr" : "Aucune Bibliothèque Partagée disponible", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] + }, + "workspace.libraries.search-shared-libraries" : { + "translations" : { + "en" : "Search shared libraries", + "es" : "Buscar bibliotecas compartidas", + "fr" : "Rechercher des Bibliothèques Partagées", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] + }, + "workspace.libraries.shared-libraries" : { + "translations" : { + "en" : "SHARED LIBRARIES", + "es" : "BIBLIOTECAS COMPARTIDAS", + "fr" : "BIBLIOTHÈQUES PARTAGÉES", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] + }, + "workspace.libraries.text.multiple-typography" : { + "translations" : { + "en" : "Multiple typographies", + "es" : "Varias tipografías", + "fr" : "Multiple typographies" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ] + }, + "workspace.libraries.text.multiple-typography-tooltip" : { + "translations" : { + "en" : "Unlink all typographies", + "es" : "Desvincular todas las tipografías", + "fr" : "Dissocier toutes les typographies" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ] + }, + "workspace.libraries.typography" : { + "translations" : { + "en" : "%s typographies", + "es" : "%s tipografías", + "fr" : "%s typographies" + }, + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] + }, + "workspace.libraries.update" : { + "translations" : { + "en" : "Update", + "es" : "Actualizar", + "fr" : "Actualiser", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] + }, + "workspace.libraries.updates" : { + "translations" : { + "en" : "UPDATES", + "es" : "ACTUALIZACIONES", + "fr" : "MISES À JOUR", + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] + }, + "workspace.library.all" : { + "translations" : { + "en" : "All libraries", + "es" : "Todas", + "fr" : "Toutes les bibliothèques", + "ru" : "Все библиотеки" }, "unused" : true }, "workspace.library.libraries" : { "translations" : { "en" : "Libraries", + "es" : "Bibliotecas", "fr" : "Bibliothèques", - "ru" : "Библиотеки", - "es" : "Bibliotecas" + "ru" : "Библиотеки" }, "unused" : true }, "workspace.library.own" : { "translations" : { "en" : "My libraries", + "es" : "Mis bibliotecas", "fr" : "Mes bibliothèques", - "ru" : "Мои библиотеки", - "es" : "Mis bibliotecas" + "ru" : "Мои библиотеки" }, "unused" : true }, "workspace.library.store" : { "translations" : { "en" : "Store libraries", + "es" : "Predefinidas", "fr" : "Prédéfinies", - "ru" : "Сохраненные библиотеки", - "es" : "Predefinidas" + "ru" : "Сохраненные библиотеки" }, "unused" : true }, "workspace.options.blur-options.background-blur" : { "translations" : { "en" : "Background", - "fr" : "Fond", - "es" : "Fondo" + "es" : "Fondo", + "fr" : "Fond" }, "unused" : true }, "workspace.options.blur-options.layer-blur" : { "translations" : { "en" : "Layer", - "fr" : "Calque", - "es" : "Capa" + "es" : "Capa", + "fr" : "Calque" }, "unused" : true }, "workspace.options.blur-options.title" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/blur.cljs" ], "translations" : { "en" : "Blur", - "fr" : "Flou", - "es" : "Desenfoque" - } + "es" : "Desenfoque", + "fr" : "Flou" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/blur.cljs" ] }, "workspace.options.blur-options.title.group" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/blur.cljs" ], "translations" : { "en" : "Group blur", - "fr" : "Flou de groupe", - "es" : "Desenfoque del grupo" - } + "es" : "Desenfoque del grupo", + "fr" : "Flou de groupe" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/blur.cljs" ] }, "workspace.options.blur-options.title.multiple" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/blur.cljs" ], "translations" : { "en" : "Selection blur", - "fr" : "Flou de sélection", - "es" : "Desenfoque de la selección" - } + "es" : "Desenfoque de la selección", + "fr" : "Flou de sélection" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/blur.cljs" ] }, "workspace.options.canvas-background" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/page.cljs" ], "translations" : { "en" : "Canvas background", + "es" : "Color de fondo", "fr" : "Couleur de fond du canvas", - "ru" : "Фон холста", - "es" : "Color de fondo" - } + "ru" : "Фон холста" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/page.cljs" ] }, "workspace.options.component" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs" ], "translations" : { "en" : "Component", - "fr" : "Composant", - "es" : "Componente" - } + "es" : "Componente", + "fr" : "Composant" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs" ] }, "workspace.options.design" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options.cljs" ], "translations" : { "en" : "Design", + "es" : "Diseño", "fr" : "Conception", - "ru" : "Дизайн", - "es" : "Diseño" - } + "ru" : "Дизайн" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options.cljs" ] }, "workspace.options.export" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs", "src/app/main/ui/handoff/exports.cljs" ], "translations" : { "en" : "Export", + "es" : "Exportar", "fr" : "Export", - "ru" : "Экспорт", - "es" : "Exportar" - } + "ru" : "Экспорт" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs", "src/app/main/ui/handoff/exports.cljs" ] }, "workspace.options.export-object" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs", "src/app/main/ui/handoff/exports.cljs" ], "translations" : { "en" : "Export shape", + "es" : "Exportar forma", "fr" : "Exporter la forme", - "ru" : "Экспорт фигуры", - "es" : "Exportar forma" - } + "ru" : "Экспорт фигуры" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs", "src/app/main/ui/handoff/exports.cljs" ] }, "workspace.options.export.suffix" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs" ], "translations" : { "en" : "Suffix", - "fr" : "Suffixe", - "es" : "Sufijo" - } + "es" : "Sufijo", + "fr" : "Suffixe" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs" ] }, "workspace.options.exporting-object" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs", "src/app/main/ui/handoff/exports.cljs" ], "translations" : { "en" : "Exporting…", + "es" : "Exportando", "fr" : "Export en cours…", - "ru" : "Экспортирую…", - "es" : "Exportando" - } + "ru" : "Экспортирую…" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/exports.cljs", "src/app/main/ui/handoff/exports.cljs" ] }, "workspace.options.fill" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/fill.cljs" ], "translations" : { "en" : "Fill", + "es" : "Relleno", "fr" : "Remplissage", - "ru" : "Заливка", - "es" : "Relleno" - } + "ru" : "Заливка" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/fill.cljs" ] }, "workspace.options.grid.auto" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Auto", + "es" : "Automático", "fr" : "Automatique", - "ru" : "Авто", - "es" : "Automático" - } + "ru" : "Авто" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.column" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Columns", + "es" : "Columnas", "fr" : "Colonnes", - "ru" : "Колонки", - "es" : "Columnas" - } + "ru" : "Колонки" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.params.columns" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Columns", + "es" : "Columnas", "fr" : "Colonnes", - "ru" : "Колонки", - "es" : "Columnas" - } + "ru" : "Колонки" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.params.gutter" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Gutter", + "es" : "Espaciado", "fr" : "Gouttière", - "ru" : "Желоб", - "es" : "Espaciado" - } + "ru" : "Желоб" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.params.height" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Height", + "es" : "Altura", "fr" : "Hauteur", - "ru" : "Высота", - "es" : "Altura" - } + "ru" : "Высота" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.params.margin" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Margin", + "es" : "Margen", "fr" : "Marge", - "ru" : "Поле", - "es" : "Margen" - } + "ru" : "Поле" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.params.rows" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Rows", + "es" : "Filas", "fr" : "Lignes", - "ru" : "Строки", - "es" : "Filas" - } + "ru" : "Строки" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.params.set-default" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Set as default", + "es" : "Establecer valor por defecto", "fr" : "Définir par défaut", - "ru" : "Установить по умолчанию", - "es" : "Establecer valor por defecto" - } + "ru" : "Установить по умолчанию" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.params.size" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Size", + "es" : "Tamaño", "fr" : "Taille", - "ru" : "Размер", - "es" : "Tamaño" - } + "ru" : "Размер" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.params.type" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Type", + "es" : "Tipo", "fr" : "Type", - "ru" : "Тип", - "es" : "Tipo" - } + "ru" : "Тип" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.params.type.bottom" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Bottom", + "es" : "Abajo", "fr" : "Bas", - "ru" : "Низ", - "es" : "Abajo" - } + "ru" : "Низ" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.params.type.center" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Center", + "es" : "Centro", "fr" : "Centre", - "ru" : "Центр", - "es" : "Centro" - } + "ru" : "Центр" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.params.type.left" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Left", + "es" : "Izquierda", "fr" : "Gauche", - "ru" : "Левый", - "es" : "Izquierda" - } + "ru" : "Левый" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.params.type.right" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Right", + "es" : "Derecha", "fr" : "Droite", - "ru" : "Правый", - "es" : "Derecha" - } + "ru" : "Правый" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.params.type.stretch" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Stretch", + "es" : "Estirar", "fr" : "Étirer", - "ru" : "Растягивать", - "es" : "Estirar" - } + "ru" : "Растягивать" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.params.type.top" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Top", + "es" : "Arriba", "fr" : "Haut", - "ru" : "Верх", - "es" : "Arriba" - } + "ru" : "Верх" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.params.use-default" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Use default", + "es" : "Usar valor por defecto", "fr" : "Utiliser la valeur par défaut", - "ru" : "Использовать значение по умолчанию", - "es" : "Usar valor por defecto" - } + "ru" : "Использовать значение по умолчанию" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.params.width" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Width", + "es" : "Ancho", "fr" : "Largeur", - "ru" : "Ширина", - "es" : "Ancho" - } + "ru" : "Ширина" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.row" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Rows", + "es" : "Filas", "fr" : "Lignes", - "ru" : "Строки", - "es" : "Filas" - } + "ru" : "Строки" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.square" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Square", + "es" : "Cuadros", "fr" : "Carré", - "ru" : "Квадрат", - "es" : "Cuadros" - } + "ru" : "Квадрат" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.grid.title" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ], "translations" : { "en" : "Grid & Layouts", + "es" : "Rejilla & Estructuras", "fr" : "Grille & Calques", - "ru" : "Сетка и Макеты", - "es" : "Rejilla & Estructuras" - } + "ru" : "Сетка и Макеты" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame_grid.cljs" ] }, "workspace.options.group-fill" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/fill.cljs" ], "translations" : { "en" : "Group fill", + "es" : "Relleno de grupo", "fr" : "Remplissage de groupe", - "ru" : "Заливка для группы", - "es" : "Relleno de grupo" - } + "ru" : "Заливка для группы" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/fill.cljs" ] }, "workspace.options.group-stroke" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Group stroke", + "es" : "Borde de grupo", "fr" : "Contour de groupe", - "ru" : "Обводка для группы", - "es" : "Borde de grupo" - } + "ru" : "Обводка для группы" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ] }, "workspace.options.navigate-to" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs" ], "translations" : { "en" : "Navigate to", + "es" : "Navegar a", "fr" : "Naviguer vers", - "ru" : "Перейти к", - "es" : "Navegar a" - } + "ru" : "Перейти к" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs" ] }, "workspace.options.none" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs" ], "translations" : { "en" : "None", + "es" : "Ninguno", "fr" : "Aucun", - "ru" : "Не задано", - "es" : "Ninguno" - } + "ru" : "Не задано" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs" ] }, "workspace.options.position" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs", "src/app/main/ui/workspace/sidebar/options/frame.cljs" ], "translations" : { "en" : "Position", + "es" : "Posición", "fr" : "Position", - "ru" : "Позиция", - "es" : "Posición" - } + "ru" : "Позиция" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs", "src/app/main/ui/workspace/sidebar/options/frame.cljs" ] }, "workspace.options.prototype" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options.cljs" ], "translations" : { "en" : "Prototype", + "es" : "Prototipo", "fr" : "Prototype", - "ru" : "Прототип", - "es" : "Prototipo" - } + "ru" : "Прототип" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options.cljs" ] }, "workspace.options.radius" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs" ], "translations" : { "en" : "Radius", + "es" : "Radio", "fr" : "Rayon", - "ru" : "Радиус", - "es" : "Radio" - } + "ru" : "Радиус" + }, + "unused" : true }, "workspace.options.radius.all-corners" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs" ], "translations" : { "en" : "All corners", "es" : "Todas las esquinas" - } + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs" ] }, "workspace.options.radius.single-corners" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs" ], "translations" : { "en" : "Single corners", "es" : "Esquinas individuales" - } + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs" ] }, "workspace.options.rotation" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs" ], "translations" : { "en" : "Rotation", + "es" : "Rotación", "fr" : "Rotation", - "ru" : "Вращение", - "es" : "Rotación" - } + "ru" : "Вращение" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs" ] }, "workspace.options.select-a-shape" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs" ], "translations" : { "en" : "Select a shape, artboard or group to drag a connection to other artboard.", + "es" : "Selecciona una figura, tablero o grupo para arrastrar una conexión a otro tablero.", "fr" : "Sélectionnez une forme, un plan de travail ou un groupe pour faire glisser une connexion vers un autre plan de travail.", - "ru" : "Выберите фигуру, рабочую область или группу чтобы перенести связь на другую рабочую область.", - "es" : "Selecciona una figura, tablero o grupo para arrastrar una conexión a otro tablero." - } + "ru" : "Выберите фигуру, рабочую область или группу чтобы перенести связь на другую рабочую область." + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs" ] }, "workspace.options.select-artboard" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs" ], "translations" : { "en" : "Select artboard", + "es" : "Selecciona un tablero", "fr" : "Sélectionner un plan de travail", - "ru" : "Выберите рабочую область", - "es" : "Selecciona un tablero" - } + "ru" : "Выберите рабочую область" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs" ] }, "workspace.options.selection-fill" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/fill.cljs" ], "translations" : { "en" : "Selection fill", + "es" : "Relleno de selección", "fr" : "Remplissage de sélection", - "ru" : "Заливка выбранного", - "es" : "Relleno de selección" - } + "ru" : "Заливка выбранного" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/fill.cljs" ] }, "workspace.options.selection-stroke" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Selection stroke", + "es" : "Borde de selección", "fr" : "Contour de sélection", - "ru" : "Обводка выбранного", - "es" : "Borde de selección" - } + "ru" : "Обводка выбранного" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ] }, "workspace.options.shadow-options.blur" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ], "translations" : { "en" : "Blur", - "fr" : "Flou", - "es" : "Desenfoque" - } + "es" : "Desenfoque", + "fr" : "Flou" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ] }, "workspace.options.shadow-options.drop-shadow" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ], "translations" : { "en" : "Drop shadow", - "fr" : "Ombre portée", - "es" : "Sombra arrojada" - } + "es" : "Sombra arrojada", + "fr" : "Ombre portée" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ] }, "workspace.options.shadow-options.inner-shadow" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ], "translations" : { "en" : "Inner shadow", - "fr" : "Ombre intérieure", - "es" : "Sombra interior" - } + "es" : "Sombra interior", + "fr" : "Ombre intérieure" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ] }, "workspace.options.shadow-options.offsetx" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ], "translations" : { "en" : "X", - "fr" : "X", - "es" : "X" - } + "es" : "X", + "fr" : "X" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ] }, "workspace.options.shadow-options.offsety" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ], "translations" : { "en" : "Y", - "fr" : "Y", - "es" : "Y" - } + "es" : "Y", + "fr" : "Y" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ] }, "workspace.options.shadow-options.spread" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ], "translations" : { "en" : "Spread", - "fr" : "Diffusion", - "es" : "Difusión" - } + "es" : "Difusión", + "fr" : "Diffusion" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ] }, "workspace.options.shadow-options.title" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ], "translations" : { "en" : "Shadow", - "fr" : "Ombre", - "es" : "Sombra" - } + "es" : "Sombra", + "fr" : "Ombre" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ] }, "workspace.options.shadow-options.title.group" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ], "translations" : { "en" : "Group shadow", - "fr" : "Ombre de groupe", - "es" : "Sombra del grupo" - } + "es" : "Sombra del grupo", + "fr" : "Ombre de groupe" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ] }, "workspace.options.shadow-options.title.multiple" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ], "translations" : { "en" : "Selection shadows", - "fr" : "Ombres de la sélection", - "es" : "Sombras de la seleccíón" - } + "es" : "Sombras de la seleccíón", + "fr" : "Ombres de la sélection" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/shadow.cljs" ] }, "workspace.options.size" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs", "src/app/main/ui/workspace/sidebar/options/frame.cljs" ], "translations" : { "en" : "Size", + "es" : "Tamaño", "fr" : "Taille", - "ru" : "Размер", - "es" : "Tamaño" - } + "ru" : "Размер" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/measures.cljs", "src/app/main/ui/workspace/sidebar/options/frame.cljs" ] }, "workspace.options.size-presets" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame.cljs" ], "translations" : { "en" : "Size presets", + "es" : "Tamaños predefinidos", "fr" : "Tailles prédéfinies", - "ru" : "Предустановки для размеров", - "es" : "Tamaños predefinidos" - } + "ru" : "Предустановки для размеров" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/frame.cljs" ] }, "workspace.options.stroke" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Stroke", + "es" : "Borde", "fr" : "Bordure", - "ru" : "Обводка", - "es" : "Borde" - } + "ru" : "Обводка" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ] }, "workspace.options.stroke.center" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Center", + "es" : "Centro", "fr" : "Centre", - "ru" : "Центр", - "es" : "Centro" - } + "ru" : "Центр" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ] }, "workspace.options.stroke.dashed" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Dashed", + "es" : "Rayado", "fr" : "Tirets", - "ru" : "Пунктирный", - "es" : "Rayado" - } + "ru" : "Пунктирный" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ] }, "workspace.options.stroke.dotted" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Dotted", + "es" : "Punteado", "fr" : "Pointillé", - "ru" : "Точечный", - "es" : "Punteado" - } + "ru" : "Точечный" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ] }, "workspace.options.stroke.inner" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Inside", + "es" : "Interior", "fr" : "Intérieur", - "ru" : "Внутрь", - "es" : "Interior" - } + "ru" : "Внутрь" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ] }, "workspace.options.stroke.mixed" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Mixed", + "es" : "Mezclado", "fr" : "Mixte", - "ru" : "Смешаный", - "es" : "Mezclado" - } + "ru" : "Смешаный" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ] }, "workspace.options.stroke.outer" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Outside", + "es" : "Exterior", "fr" : "Extérieur", - "ru" : "Наружу", - "es" : "Exterior" - } + "ru" : "Наружу" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ] }, "workspace.options.stroke.solid" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ], "translations" : { "en" : "Solid", + "es" : "Sólido", "fr" : "Solide", - "ru" : "Сплошной", - "es" : "Sólido" - } + "ru" : "Сплошной" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs" ] }, "workspace.options.text-options.align-bottom" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Align bottom", + "es" : "Alinear abajo", "fr" : "Aligner en bas", - "ru" : "Выровнять низ", - "es" : "Alinear abajo" - } + "ru" : "Выровнять низ" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ] }, "workspace.options.text-options.align-center" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Align center", + "es" : "Aliniear al centro", "fr" : "Aligner au centre", - "ru" : "Выравнивание по центру", - "es" : "Aliniear al centro" - } + "ru" : "Выравнивание по центру" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ] }, "workspace.options.text-options.align-justify" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Justify", + "es" : "Justificar", "fr" : "Justifier", - "ru" : "Выравнивание по ширине", - "es" : "Justificar" - } + "ru" : "Выравнивание по ширине" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ] }, "workspace.options.text-options.align-left" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Align left", + "es" : "Alinear a la izquierda", "fr" : "Aligner à gauche", - "ru" : "Выравнивание по левому краю", - "es" : "Alinear a la izquierda" - } + "ru" : "Выравнивание по левому краю" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ] }, "workspace.options.text-options.align-middle" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Align middle", + "es" : "Alinear al centro", "fr" : "Aligner verticalement au milieu", - "ru" : "Выравнивание по центру", - "es" : "Alinear al centro" - } + "ru" : "Выравнивание по центру" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ] }, "workspace.options.text-options.align-right" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Align right", + "es" : "Alinear a la derecha", "fr" : "Aligner à droite", - "ru" : "Выравнивание по правому краю", - "es" : "Alinear a la derecha" - } + "ru" : "Выравнивание по правому краю" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ] }, "workspace.options.text-options.align-top" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Align top", + "es" : "Alinear arriba", "fr" : "Aligner en haut", - "ru" : "Выравнивание по верхнему краю", - "es" : "Alinear arriba" - } + "ru" : "Выравнивание по верхнему краю" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ] }, "workspace.options.text-options.decoration" : { "translations" : { "en" : "Decoration", + "es" : "Decoración", "fr" : "Décoration", - "ru" : "Оформление", - "es" : "Decoración" + "ru" : "Оформление" }, "unused" : true }, "workspace.options.text-options.grow-auto-height" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Auto height", - "fr" : "Hauteur automatique", - "es" : "Alto automático" - } + "es" : "Alto automático", + "fr" : "Hauteur automatique" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ] }, "workspace.options.text-options.grow-auto-width" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Auto width", - "fr" : "Largeur automatique", - "es" : "Ancho automático" - } + "es" : "Ancho automático", + "fr" : "Largeur automatique" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ] }, "workspace.options.text-options.grow-fixed" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Fixed", - "fr" : "Fixe", - "es" : "Fijo" - } + "es" : "Fijo", + "fr" : "Fixe" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ] }, "workspace.options.text-options.letter-spacing" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], "translations" : { "en" : "Letter Spacing", + "es" : "Espaciado entre letras", "fr" : "Interlettrage", - "ru" : "Межсимвольный интервал", - "es" : "Espaciado entre letras" - } + "ru" : "Межсимвольный интервал" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] }, "workspace.options.text-options.line-height" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], "translations" : { "en" : "Line height", + "es" : "Altura de línea", "fr" : "Interlignage", - "ru" : "Высота строки", - "es" : "Altura de línea" - } + "ru" : "Высота строки" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] }, "workspace.options.text-options.lowercase" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], "translations" : { "en" : "Lowercase", + "es" : "Minúsculas", "fr" : "Minuscule", - "ru" : "Нижний регистр", - "es" : "Minúsculas" - } + "ru" : "Нижний регистр" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] }, "workspace.options.text-options.none" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs", "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], "translations" : { "en" : "None", + "es" : "Nada", "fr" : "Aucune", - "ru" : "Не задано", - "es" : "Nada" - } + "ru" : "Не задано" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs", "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] }, "workspace.options.text-options.strikethrough" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Strikethrough", + "es" : "Tachado", "fr" : "Barré", - "ru" : "Перечеркнутый", - "es" : "Tachado" - } + "ru" : "Перечеркнутый" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ] }, "workspace.options.text-options.text-case" : { "translations" : { "en" : "Case", + "es" : "Mayús/minús", "fr" : "Casse", - "ru" : "Регистр", - "es" : "Mayús/minús" + "ru" : "Регистр" }, "unused" : true }, "workspace.options.text-options.title" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Text", + "es" : "Texto", "fr" : "Texte", - "ru" : "Текст", - "es" : "Texto" - } + "ru" : "Текст" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ] }, "workspace.options.text-options.title-group" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Group text", + "es" : "Texto de grupo", "fr" : "Texte de groupe", - "ru" : "Текст группы", - "es" : "Texto de grupo" - } + "ru" : "Текст группы" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ] }, "workspace.options.text-options.title-selection" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Selection text", + "es" : "Texto de selección", "fr" : "Texte de la sélection", - "ru" : "Выбранный текст", - "es" : "Texto de selección" - } + "ru" : "Выбранный текст" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ] }, "workspace.options.text-options.titlecase" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], "translations" : { "en" : "Title Case", + "es" : "Título", "fr" : "Premières Lettres en Capitales", - "ru" : "Каждое слово с заглавной буквы", - "es" : "Título" - } + "ru" : "Каждое слово с заглавной буквы" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] }, "workspace.options.text-options.underline" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ], "translations" : { "en" : "Underline", + "es" : "Subrayado", "fr" : "Soulignage", - "ru" : "Подчеркнутый", - "es" : "Subrayado" - } + "ru" : "Подчеркнутый" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ] }, "workspace.options.text-options.uppercase" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ], "translations" : { "en" : "Uppercase", + "es" : "Mayúsculas", "fr" : "Majuscule", - "ru" : "Верхний регистр", - "es" : "Mayúsculas" - } + "ru" : "Верхний регистр" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] }, "workspace.options.text-options.vertical-align" : { "translations" : { "en" : "Vertical align", + "es" : "Alineación vertical", "fr" : "Alignement vertical", - "ru" : "Вертикальное выравнивание", - "es" : "Alineación vertical" + "ru" : "Вертикальное выравнивание" }, "unused" : true }, "workspace.options.use-play-button" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs" ], "translations" : { "en" : "Use the play button at the header to run the prototype view.", + "es" : "Usa el botón de play de la cabecera para arrancar la vista de prototipo.", "fr" : "Utilisez le bouton de lecture dans l’en‑tête pour exécuter la vue du prototype.", - "ru" : "Используй кнопку запуск в заголовке чтобы перейти на экран прототипа.", - "es" : "Usa el botón de play de la cabecera para arrancar la vista de prototipo." - } + "ru" : "Используй кнопку запуск в заголовке чтобы перейти на экран прототипа." + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/interactions.cljs" ] }, "workspace.shape.menu.back" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Send to back", - "fr" : "Envoyer au fond", - "es" : "Enviar al fondo" - } + "es" : "Enviar al fondo", + "fr" : "Envoyer au fond" + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.backward" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Send backward", - "fr" : "Éloigner", - "es" : "Enviar atrás" - } + "es" : "Enviar atrás", + "fr" : "Éloigner" + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.copy" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Copy", - "fr" : "Copier", - "es" : "Copiar" - } + "es" : "Copiar", + "fr" : "Copier" + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.create-component" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Create component", - "fr" : "Créer un composant", - "es" : "Crear componente" - } + "es" : "Crear componente", + "fr" : "Créer un composant" + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.cut" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Cut", - "fr" : "Couper", - "es" : "Cortar" - } + "es" : "Cortar", + "fr" : "Couper" + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.delete" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Delete", - "fr" : "Supprimer", - "es" : "Eliminar" - } + "es" : "Eliminar", + "fr" : "Supprimer" + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.detach-instance" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Detach instance", - "fr" : "Détacher l’instance", - "es" : "Desacoplar instancia" - } + "es" : "Desacoplar instancia", + "fr" : "Détacher l’instance" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs", "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.duplicate" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Duplicate", - "fr" : "Dupliquer", - "es" : "Duplicar" - } + "es" : "Duplicar", + "fr" : "Dupliquer" + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.edit" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Edit", "es" : "Editar" - } + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.flip-horizontal" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Flip horizontal", "es" : "Voltear horizontal" - } + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.flip-vertical" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Flip vertical", "es" : "Voltear vertical" - } + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.forward" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Bring forward", - "fr" : "Avancer", - "es" : "Mover hacia delante" - } + "es" : "Mover hacia delante", + "fr" : "Avancer" + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.front" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Bring to front", - "fr" : "Amener au premier plan", - "es" : "Mover al frente" - } + "es" : "Mover al frente", + "fr" : "Amener au premier plan" + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.go-master" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Go to master component file", - "fr" : "Aller au fichier du composant principal", - "es" : "Ir al archivo del componente maestro" - } + "es" : "Ir al archivo del componente maestro", + "fr" : "Aller au fichier du composant principal" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.group" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Group", - "fr" : "Groupe", - "es" : "Grupo" - } + "es" : "Grupo", + "fr" : "Groupe" + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.hide" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Hide", - "fr" : "Masquer", - "es" : "Ocultar" - } + "es" : "Ocultar", + "fr" : "Masquer" + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.lock" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Lock", - "fr" : "Bloquer", - "es" : "Bloquear" - } + "es" : "Bloquear", + "fr" : "Bloquer" + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.mask" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Mask", - "fr" : "Masque", - "es" : "Máscara" - } + "es" : "Máscara", + "fr" : "Masque" + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs", "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.paste" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Paste", - "fr" : "Coller", - "es" : "Pegar" - } + "es" : "Pegar", + "fr" : "Coller" + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs", "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.reset-overrides" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Reset overrides", - "fr" : "Annuler les modifications", - "es" : "Deshacer modificaciones" - } + "es" : "Deshacer modificaciones", + "fr" : "Annuler les modifications" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs", "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.show" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Show", - "fr" : "Montrer", - "es" : "Mostrar" - } + "es" : "Mostrar", + "fr" : "Montrer" + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.show-master" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Show master component", - "fr" : "Afficher le composant principal", - "es" : "Ver componente maestro" - } + "es" : "Ver componente maestro", + "fr" : "Afficher le composant principal" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.ungroup" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Ungroup", - "fr" : "Dégrouper", - "es" : "Desagrupar" - } + "es" : "Desagrupar", + "fr" : "Dégrouper" + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.unlock" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Unlock", - "fr" : "Débloquer", - "es" : "Desbloquear" - } + "es" : "Desbloquear", + "fr" : "Débloquer" + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.unmask" : { - "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Unmask", - "fr" : "Supprimer le masque", - "es" : "Quitar máscara" - } + "es" : "Quitar máscara", + "fr" : "Supprimer le masque" + }, + "used-in" : [ "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.shape.menu.update-master" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs", "src/app/main/ui/workspace/context_menu.cljs" ], "translations" : { "en" : "Update master component", - "fr" : "Actualiser le composant principal", - "es" : "Actualizar componente maestro" - } + "es" : "Actualizar componente maestro", + "fr" : "Actualiser le composant principal" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs", "src/app/main/ui/workspace/context_menu.cljs" ] }, "workspace.sidebar.history" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "History (%s)", - "fr" : "Historique (%s)", - "es" : "Historial (%s)" - } + "es" : "Historial (%s)", + "fr" : "Historique (%s)" + }, + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ] }, "workspace.sidebar.layers" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Layers (%s)", - "fr" : "Calques (%s)", - "es" : "Capas (%s)" - } + "es" : "Capas (%s)", + "fr" : "Calques (%s)" + }, + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ] }, "workspace.sidebar.sitemap" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs" ], "translations" : { "en" : "Pages", + "es" : "Páginas", "fr" : "Pages", - "ru" : "Страницы", - "es" : "Páginas" - } + "ru" : "Страницы" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs" ] }, "workspace.sitemap" : { - "used-in" : [ "src/app/main/ui/workspace/header.cljs" ], "translations" : { "en" : "Sitemap", + "es" : "Mapa del sitio", "fr" : "Plan du site", - "ru" : "Карта сайта", - "es" : "Mapa del sitio" - } + "ru" : "Карта сайта" + }, + "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, "workspace.toolbar.assets" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Assets (%s)", + "es" : "Recursos (%s)", "fr" : "Ressources (%s)", - "ru" : "", - "es" : "Recursos (%s)" - } + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ] }, "workspace.toolbar.color-palette" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Color Palette (%s)", + "es" : "Paleta de colores (%s)", "fr" : "Palette de couleurs (%s)", - "ru" : "Палитра цветов (%s)", - "es" : "Paleta de colores (%s)" - } + "ru" : "Палитра цветов (%s)" + }, + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ] }, "workspace.toolbar.comments" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Comments (%s)", - "fr" : "Commentaires (%s)", - "es" : "Comentarios (%s)" - } + "es" : "Comentarios (%s)", + "fr" : "Commentaires (%s)" + }, + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ] }, "workspace.toolbar.curve" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Curve (%s)", + "es" : "Curva (%s)", "fr" : "Courbe (%s)", - "ru" : "Кривая (%s)", - "es" : "Curva (%s)" - } + "ru" : "Кривая (%s)" + }, + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ] }, "workspace.toolbar.ellipse" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Ellipse (E)", + "es" : "Elipse (E)", "fr" : "Ellipse (E)", - "ru" : "", - "es" : "Elipse (E)" - } + "ru" : "" + }, + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ] }, "workspace.toolbar.frame" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Artboard (A)", + "es" : "Tablero (A)", "fr" : "Plan de travail (A)", - "ru" : "Рабочая область (A)", - "es" : "Tablero (A)" - } + "ru" : "Рабочая область (A)" + }, + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ] }, "workspace.toolbar.image" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Image (K)", + "es" : "Imagen (K)", "fr" : "Image (K)", - "ru" : "Изображение (K)", - "es" : "Imagen (K)" - } + "ru" : "Изображение (K)" + }, + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ] }, "workspace.toolbar.move" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Move", + "es" : "Mover", "fr" : "Déplacer", - "ru" : "Вытеснить", - "es" : "Mover" - } + "ru" : "Вытеснить" + }, + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ] }, "workspace.toolbar.path" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Path (P)", + "es" : "Ruta (P)", "fr" : "Chemin (P)", - "ru" : "Линия (P)", - "es" : "Ruta (P)" - } + "ru" : "Линия (P)" + }, + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ] }, "workspace.toolbar.rect" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Rectangle (R)", + "es" : "Rectángulo (R)", "fr" : "Rectangle (R)", - "ru" : "Прямоугольник (R)", - "es" : "Rectángulo (R)" - } + "ru" : "Прямоугольник (R)" + }, + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ] }, "workspace.toolbar.text" : { - "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ], "translations" : { "en" : "Text (T)", + "es" : "Texto (T)", "fr" : "Texte (T)", - "ru" : "Текст (T)", - "es" : "Texto (T)" - } + "ru" : "Текст (T)" + }, + "used-in" : [ "src/app/main/ui/workspace/left_toolbar.cljs" ] }, "workspace.undo.empty" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ], "translations" : { "en" : "There are no history changes so far", - "fr" : "Il n’y a aucun changement dans l’historique pour l’instant", - "es" : "Todavía no hay cambios en el histórico" - } + "es" : "Todavía no hay cambios en el histórico", + "fr" : "Il n’y a aucun changement dans l’historique pour l’instant" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ] }, "workspace.undo.entry.delete" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ], "translations" : { "en" : "Deleted %s", - "fr" : "Supprimé %s", - "es" : "%s eliminado" - } + "es" : "%s eliminado", + "fr" : "Supprimé %s" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ] }, "workspace.undo.entry.modify" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ], "translations" : { "en" : "Modified %s", - "fr" : "Modifié %s", - "es" : "%s modificado" - } + "es" : "%s modificado", + "fr" : "Modifié %s" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ] }, "workspace.undo.entry.move" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ], "translations" : { "en" : "Moved objects", - "fr" : "Objets déplacés", - "es" : "Objetos movidos" - } + "es" : "Objetos movidos", + "fr" : "Objets déplacés" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ] }, "workspace.undo.entry.multiple.circle" : { "translations" : { "en" : "circles", - "fr" : "cercles", - "es" : "círculos" + "es" : "círculos", + "fr" : "cercles" }, "unused" : true }, "workspace.undo.entry.multiple.color" : { "translations" : { "en" : "color assets", - "fr" : "couleurs", - "es" : "colores" + "es" : "colores", + "fr" : "couleurs" }, "unused" : true }, "workspace.undo.entry.multiple.component" : { "translations" : { "en" : "components", - "fr" : "composants", - "es" : "componentes" + "es" : "componentes", + "fr" : "composants" }, "unused" : true }, "workspace.undo.entry.multiple.curve" : { "translations" : { "en" : "curves", - "fr" : "courbes", - "es" : "curvas" + "es" : "curvas", + "fr" : "courbes" }, "unused" : true }, "workspace.undo.entry.multiple.frame" : { "translations" : { "en" : "artboard", - "fr" : "plan de travail", - "es" : "mesa de trabajo" + "es" : "mesa de trabajo", + "fr" : "plan de travail" }, "unused" : true }, "workspace.undo.entry.multiple.group" : { "translations" : { "en" : "groups", - "fr" : "groupes", - "es" : "grupos" + "es" : "grupos", + "fr" : "groupes" }, "unused" : true }, "workspace.undo.entry.multiple.media" : { "translations" : { "en" : "graphic assets", - "fr" : "graphiques", - "es" : "gráficos" + "es" : "gráficos", + "fr" : "graphiques" }, "unused" : true }, "workspace.undo.entry.multiple.multiple" : { "translations" : { "en" : "objects", - "fr" : "objets", - "es" : "objetos" + "es" : "objetos", + "fr" : "objets" }, "unused" : true }, "workspace.undo.entry.multiple.page" : { "translations" : { "en" : "pages", - "fr" : "pages", - "es" : "páginas" + "es" : "páginas", + "fr" : "pages" }, "unused" : true }, "workspace.undo.entry.multiple.path" : { "translations" : { "en" : "paths", - "fr" : "chemins", - "es" : "trazos" + "es" : "trazos", + "fr" : "chemins" }, "unused" : true }, "workspace.undo.entry.multiple.rect" : { "translations" : { "en" : "rectangles", - "fr" : "rectangles", - "es" : "rectángulos" + "es" : "rectángulos", + "fr" : "rectangles" }, "unused" : true }, "workspace.undo.entry.multiple.shape" : { "translations" : { "en" : "shapes", - "fr" : "formes", - "es" : "formas" + "es" : "formas", + "fr" : "formes" }, "unused" : true }, "workspace.undo.entry.multiple.text" : { "translations" : { "en" : "texts", - "fr" : "textes", - "es" : "textos" + "es" : "textos", + "fr" : "textes" }, "unused" : true }, "workspace.undo.entry.multiple.typography" : { "translations" : { "en" : "typography assets", - "fr" : "typographie", - "es" : "tipografías" + "es" : "tipografías", + "fr" : "typographie" }, "unused" : true }, "workspace.undo.entry.new" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ], "translations" : { "en" : "New %s", - "fr" : "Nouveau %s", - "es" : "Nuevo %s" - } + "es" : "Nuevo %s", + "fr" : "Nouveau %s" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ] }, "workspace.undo.entry.single.circle" : { "translations" : { "en" : "circle", - "fr" : "cercle", - "es" : "círculo" + "es" : "círculo", + "fr" : "cercle" }, "unused" : true }, "workspace.undo.entry.single.color" : { "translations" : { "en" : "color asset", - "fr" : "couleur", - "es" : "color" + "es" : "color", + "fr" : "couleur" }, "unused" : true }, "workspace.undo.entry.single.component" : { "translations" : { "en" : "component", - "fr" : "composant", - "es" : "componente" + "es" : "componente", + "fr" : "composant" }, "unused" : true }, "workspace.undo.entry.single.curve" : { "translations" : { "en" : "curve", - "fr" : "courbe", - "es" : "curva" + "es" : "curva", + "fr" : "courbe" }, "unused" : true }, "workspace.undo.entry.single.frame" : { "translations" : { "en" : "artboard", - "fr" : "plan de travail", - "es" : "mesa de trabajo" + "es" : "mesa de trabajo", + "fr" : "plan de travail" }, "unused" : true }, "workspace.undo.entry.single.group" : { "translations" : { "en" : "group", - "fr" : "groupe", - "es" : "grupo" + "es" : "grupo", + "fr" : "groupe" }, "unused" : true }, "workspace.undo.entry.single.image" : { "translations" : { "en" : "image", - "fr" : "image", - "es" : "imagen" + "es" : "imagen", + "fr" : "image" }, "unused" : true }, "workspace.undo.entry.single.media" : { "translations" : { "en" : "graphic asset", - "fr" : "graphique", - "es" : "gráfico" + "es" : "gráfico", + "fr" : "graphique" }, "unused" : true }, "workspace.undo.entry.single.multiple" : { "translations" : { "en" : "object", - "fr" : "objet", - "es" : "objeto" + "es" : "objeto", + "fr" : "objet" }, "unused" : true }, "workspace.undo.entry.single.page" : { "translations" : { "en" : "page", - "fr" : "page", - "es" : "página" + "es" : "página", + "fr" : "page" }, "unused" : true }, "workspace.undo.entry.single.path" : { "translations" : { "en" : "path", - "fr" : "chemin", - "es" : "trazo" + "es" : "trazo", + "fr" : "chemin" }, "unused" : true }, "workspace.undo.entry.single.rect" : { "translations" : { "en" : "rectangle", - "fr" : "rectangle", - "es" : "rectángulo" + "es" : "rectángulo", + "fr" : "rectangle" }, "unused" : true }, "workspace.undo.entry.single.shape" : { "translations" : { "en" : "shape", - "fr" : "forme", - "es" : "forma" + "es" : "forma", + "fr" : "forme" }, "unused" : true }, "workspace.undo.entry.single.text" : { "translations" : { "en" : "text", - "fr" : "texte", - "es" : "texto" + "es" : "texto", + "fr" : "texte" }, "unused" : true }, "workspace.undo.entry.single.typography" : { "translations" : { "en" : "typography asset", - "fr" : "typographie", - "es" : "tipografía" + "es" : "tipografía", + "fr" : "typographie" }, "unused" : true }, "workspace.undo.entry.unknown" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ], "translations" : { "en" : "Operation over %s", - "fr" : "Opération sur %s", - "es" : "Operación sobre %s" - } + "es" : "Operación sobre %s", + "fr" : "Opération sur %s" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ] }, "workspace.undo.title" : { - "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ], "translations" : { "en" : "History", - "fr" : "Historique", - "es" : "Histórico" - } + "es" : "Histórico", + "fr" : "Historique" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/history.cljs" ] }, "workspace.updates.dismiss" : { - "used-in" : [ "src/app/main/data/workspace/libraries.cljs" ], "translations" : { "en" : "Dismiss", + "es" : "Ignorar", "fr" : "Ignorer", - "ru" : "", - "es" : "Ignorar" - } + "ru" : "" + }, + "used-in" : [ "src/app/main/data/workspace/libraries.cljs" ] }, "workspace.updates.there-are-updates" : { - "used-in" : [ "src/app/main/data/workspace/libraries.cljs" ], "translations" : { "en" : "There are updates in shared libraries", + "es" : "Hay actualizaciones en librerías compartidas", "fr" : "Il y a des mises à jour dans les Bibliothèques Partagées", - "ru" : "", - "es" : "Hay actualizaciones en librerías compartidas" - } + "ru" : "" + }, + "used-in" : [ "src/app/main/data/workspace/libraries.cljs" ] }, "workspace.updates.update" : { - "used-in" : [ "src/app/main/data/workspace/libraries.cljs" ], "translations" : { "en" : "Update", + "es" : "Actualizar", "fr" : "Actualiser", - "ru" : "", - "es" : "Actualizar" - } + "ru" : "" + }, + "used-in" : [ "src/app/main/data/workspace/libraries.cljs" ] }, "workspace.viewport.click-to-close-path" : { "translations" : { "en" : "Click to close the path", + "es" : "Pulsar para cerrar la ruta", "fr" : "Cliquez pour fermer le chemin", - "ru" : "Кликни чтобы закончить фигуру", - "es" : "Pulsar para cerrar la ruta" + "ru" : "Кликни чтобы закончить фигуру" }, "unused" : true } From a63f28a2e50af78314359f6c1d48b715eb11b0f7 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 22 Feb 2021 12:39:55 +0100 Subject: [PATCH 39/90] :sparkles: Normalize logging messages on backend. --- backend/src/app/cli/fixtures.clj | 2 +- backend/src/app/http/awsns.clj | 10 +++++----- backend/src/app/http/errors.clj | 4 ++-- backend/src/app/loggers/loki.clj | 8 ++++---- backend/src/app/loggers/mattermost.clj | 10 +++++----- backend/src/app/loggers/zmq.clj | 2 +- backend/src/app/main.clj | 2 +- backend/src/app/notifications.clj | 2 +- backend/src/app/rpc.clj | 4 ++-- backend/src/app/rpc/mutations/ldap.clj | 2 +- backend/src/app/rpc/mutations/profile.clj | 1 - backend/src/app/tasks/delete_object.clj | 2 +- backend/src/app/tasks/delete_profile.clj | 2 +- backend/src/app/tasks/file_media_gc.clj | 2 +- backend/src/app/telemetry.clj | 4 ++-- backend/src/app/worker.clj | 22 +++++++++++----------- 16 files changed, 39 insertions(+), 40 deletions(-) diff --git a/backend/src/app/cli/fixtures.clj b/backend/src/app/cli/fixtures.clj index 4400654c6..ed986d36d 100644 --- a/backend/src/app/cli/fixtures.clj +++ b/backend/src/app/cli/fixtures.clj @@ -237,6 +237,6 @@ (try (run-in-system system preset) (catch Exception e - (log/errorf e "Unhandled exception.")) + (log/errorf e "unhandled exception")) (finally (ig/halt! system))))) diff --git a/backend/src/app/http/awsns.clj b/backend/src/app/http/awsns.clj index 9443b90eb..8a776477d 100644 --- a/backend/src/app/http/awsns.clj +++ b/backend/src/app/http/awsns.clj @@ -42,7 +42,7 @@ (= mtype "SubscriptionConfirmation") (let [surl (get body "SubscribeURL") stopic (get body "TopicArn")] - (log/infof "Subscription received (topic=%s, url=%s)" stopic surl) + (log/infof "subscription received (topic=%s, url=%s)" stopic surl) (http/send! {:uri surl :method :post :timeout 10000})) (= mtype "Notification") @@ -52,7 +52,7 @@ (process-report cfg notification))) :else - (log/warn (str "Unexpected data received.\n" + (log/warn (str "unexpected data received\n" (pprint-report body)))) {:status 200 :body ""}))) @@ -184,14 +184,14 @@ (defn- process-report [cfg {:keys [type profile-id] :as report}] - (log/debug (str "Procesing report:\n" (pprint-report report))) + (log/debug (str "procesing report:\n" (pprint-report report))) (cond ;; In this case we receive a bounce/complaint notification without ;; confirmed identity, we just emit a warning but do nothing about ;; it because this is not a normal case. All notifications should ;; come with profile identity. (nil? profile-id) - (log/warn (str "A notification without identity recevied from AWS\n" + (log/warn (str "a notification without identity recevied from AWS\n" (pprint-report report))) (= "bounce" type) @@ -201,7 +201,7 @@ (register-complaint-for-profile cfg report) :else - (log/warn (str "Unrecognized report received from AWS\n" + (log/warn (str "unrecognized report received from AWS\n" (pprint-report report))))) diff --git a/backend/src/app/http/errors.clj b/backend/src/app/http/errors.clj index 020ebc921..72fa34a65 100644 --- a/backend/src/app/http/errors.clj +++ b/backend/src/app/http/errors.clj @@ -73,7 +73,7 @@ (let [edata (ex-data error) cdata (get-error-context request error)] (update-thread-context! cdata) - (log/errorf error "Internal error: assertion (id: %s)" (str (:id cdata))) + (log/errorf error "internal error: assertion (id: %s)" (str (:id cdata))) {:status 500 :body {:type :server-error :data (-> edata @@ -88,7 +88,7 @@ [error request] (let [cdata (get-error-context request error)] (update-thread-context! cdata) - (log/errorf error "Internal error: %s (id: %s)" + (log/errorf error "internal error: %s (id: %s)" (ex-message error) (str (:id cdata))) {:status 500 diff --git a/backend/src/app/loggers/loki.clj b/backend/src/app/loggers/loki.clj index 32813e5ec..2514d5725 100644 --- a/backend/src/app/loggers/loki.clj +++ b/backend/src/app/loggers/loki.clj @@ -33,13 +33,13 @@ (defmethod ig/init-key ::reporter [_ {:keys [receiver uri] :as cfg}] (when uri - (log/info "Intializing loki reporter.") + (log/info "intializing loki reporter") (let [output (a/chan (a/sliding-buffer 1024))] (receiver :sub output) (a/go-loop [] (let [msg (a/ system-config (ig/prep) (ig/init)))) - (log/infof "Welcome to penpot! Version: '%s'." + (log/infof "welcome to penpot (version: '%s')" (:full cfg/version)))) (defn stop diff --git a/backend/src/app/notifications.clj b/backend/src/app/notifications.clj index 4ff66aac8..4b9a72ce1 100644 --- a/backend/src/app/notifications.clj +++ b/backend/src/app/notifications.clj @@ -188,7 +188,7 @@ (aa/> (db/query conn :file-media-object {:file-id id}) (remove #(contains? used (:id %))))] - (log/infof "processing file: id='%s' age='%s' to-delete=%s" id age (count unused)) + (log/debugf "processing file: id='%s' age='%s' to-delete=%s" id age (count unused)) ;; Mark file as trimmed (db/update! conn :file diff --git a/backend/src/app/telemetry.clj b/backend/src/app/telemetry.clj index a8e5edae7..a5268ef23 100644 --- a/backend/src/app/telemetry.clj +++ b/backend/src/app/telemetry.clj @@ -88,7 +88,7 @@ (catch Exception e ;; We don't want notify user of a error, just log it for posible ;; future investigation. - (log/warn e (str "Unexpected error on telemetry:\n" + (log/warn e (str "unexpected error on telemetry:\n" (when-let [edata (ex-data e)] (str "ex-data: \n" (with-out-str (pprint edata)))) @@ -118,4 +118,4 @@ data data]))) (catch Exception e - (log/errorf e "Error on procesing request.")))) + (log/errorf e "error on procesing request")))) diff --git a/backend/src/app/worker.clj b/backend/src/app/worker.clj index 306604b81..9b7cdc478 100644 --- a/backend/src/app/worker.clj +++ b/backend/src/app/worker.clj @@ -94,7 +94,7 @@ (defmethod ig/init-key ::worker [_ {:keys [pool poll-interval name queue] :as cfg}] - (log/infof "Starting worker '%s' on queue '%s'." name queue) + (log/infof "starting worker '%s' on queue '%s'" name queue) (let [cch (a/chan 1) poll-ms (inst-ms poll-interval)] (a/go-loop [] @@ -103,30 +103,30 @@ ;; Terminate the loop if close channel is closed or ;; event-loop-fn returns nil. (or (= port cch) (nil? val)) - (log/infof "Stop condition found. Shutdown worker: '%s'" name) + (log/infof "stop condition found; shutdown worker: '%s'" name) (db/pool-closed? pool) (do - (log/info "Worker eventloop is aborted because pool is closed.") + (log/info "worker eventloop is aborted because pool is closed") (a/close! cch)) (and (instance? java.sql.SQLException val) (contains? #{"08003" "08006" "08001" "08004"} (.getSQLState ^java.sql.SQLException val))) (do - (log/error "Connection error, trying resume in some instants.") + (log/error "connection error, trying resume in some instants") (a/= (:retry-num item) (:max-retries item)) {:status :failed :task item :error error} {:status :retry :task item :error error}))))) @@ -235,12 +235,12 @@ (defn- run-task [{:keys [tasks]} item] (try - (log/debugf "Started task '%s/%s/%s'." (:name item) (:id item) (:retry-num item)) + (log/debugf "started task '%s/%s/%s'" (:name item) (:id item) (:retry-num item)) (handle-task tasks item) (catch Exception e (handle-exception e item)) (finally - (log/debugf "Finished task '%s/%s/%s'." (:name item) (:id item) (:retry-num item))))) + (log/debugf "finished task '%s/%s/%s'" (:name item) (:id item) (:retry-num item))))) (def sql:select-next-tasks "select * from task as t @@ -330,7 +330,7 @@ (defn- synchronize-schedule-item [conn {:keys [id cron]}] (let [cron (str cron)] - (log/debugf "initialize scheduled task '%s' (cron: '%s')." id cron) + (log/infof "initialize scheduled task '%s' (cron: '%s')" id cron) (db/exec-one! conn [sql:upsert-scheduled-task id cron cron]))) (defn- synchronize-schedule From fbe2e2a285c030621eda659e4ddee8c8f218f5dd Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 22 Feb 2021 12:46:15 +0100 Subject: [PATCH 40/90] :sparkles: Improve tasks metrics. --- backend/src/app/db.clj | 21 +++- backend/src/app/main.clj | 34 ++++--- backend/src/app/metrics.clj | 120 +++++++++++++---------- backend/src/app/tasks.clj | 75 ++++++++++++-- backend/src/app/tasks/delete_object.clj | 22 ++--- backend/src/app/tasks/delete_profile.clj | 34 +++---- backend/src/app/tasks/file_media_gc.clj | 40 +++----- backend/src/app/tasks/file_xlog_gc.clj | 31 +++--- backend/src/app/tasks/sendmail.clj | 23 ++--- backend/src/app/tasks/tasks_gc.clj | 32 +++--- backend/src/app/worker.clj | 47 ++++----- common/app/common/exceptions.cljc | 4 + 12 files changed, 264 insertions(+), 219 deletions(-) diff --git a/backend/src/app/db.clj b/backend/src/app/db.clj index d85ece5bc..de31d7a93 100644 --- a/backend/src/app/db.clj +++ b/backend/src/app/db.clj @@ -13,6 +13,7 @@ [app.common.geom.point :as gpt] [app.common.spec :as us] [app.db.sql :as sql] + [app.metrics :as mtx] [app.util.json :as json] [app.util.migrations :as mg] [app.util.time :as dt] @@ -45,19 +46,21 @@ ;; Initialization ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(declare instrument-jdbc!) + (s/def ::uri ::us/not-empty-string) (s/def ::name ::us/not-empty-string) (s/def ::min-pool-size ::us/integer) (s/def ::max-pool-size ::us/integer) (s/def ::migrations map?) -(s/def ::metrics map?) (defmethod ig/pre-init-spec ::pool [_] - (s/keys :req-un [::uri ::name ::min-pool-size ::max-pool-size ::migrations])) + (s/keys :req-un [::uri ::name ::min-pool-size ::max-pool-size ::migrations ::mtx/metrics])) (defmethod ig/init-key ::pool - [_ {:keys [migrations] :as cfg}] - (log/debugf "initialize connection pool %s with uri %s" (:name cfg) (:uri cfg)) + [_ {:keys [migrations metrics] :as cfg}] + (log/infof "initialize connection pool '%s' with uri '%s'" (:name cfg) (:uri cfg)) + (instrument-jdbc! (:registry metrics)) (let [pool (create-pool cfg)] (when (seq migrations) (with-open [conn ^AutoCloseable (open pool)] @@ -70,6 +73,16 @@ [_ pool] (.close ^HikariDataSource pool)) +(defn- instrument-jdbc! + [registry] + (mtx/instrument-vars! + [#'next.jdbc/execute-one! + #'next.jdbc/execute!] + {:registry registry + :type :counter + :name "database_query_count" + :help "An absolute counter of database queries."})) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; API & Impl ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/backend/src/app/main.clj b/backend/src/app/main.clj index 9ed384a8d..03483c38e 100644 --- a/backend/src/app/main.clj +++ b/backend/src/app/main.clj @@ -174,46 +174,56 @@ :app.worker/worker {:executor (ig/ref :app.worker/executor) :pool (ig/ref :app.db/pool) - :tasks (ig/ref :app.tasks/all)} + :tasks (ig/ref :app.tasks/registry)} :app.worker/scheduler {:executor (ig/ref :app.worker/executor) :pool (ig/ref :app.db/pool) + :tasks (ig/ref :app.tasks/registry) :schedule [{:id "file-media-gc" :cron #app/cron "0 0 0 */1 * ? *" ;; daily - :fn (ig/ref :app.tasks.file-media-gc/handler)} + :task :file-media-gc} {:id "file-xlog-gc" :cron #app/cron "0 0 */1 * * ?" ;; hourly - :fn (ig/ref :app.tasks.file-xlog-gc/handler)} + :task :file-xlog-gc} {:id "storage-deleted-gc" :cron #app/cron "0 0 1 */1 * ?" ;; daily (1 hour shift) - :fn (ig/ref :app.storage/gc-deleted-task)} + :task :storage-deleted-gc} {:id "storage-touched-gc" :cron #app/cron "0 0 2 */1 * ?" ;; daily (2 hour shift) - :fn (ig/ref :app.storage/gc-touched-task)} + :task :storage-touched-gc} {:id "storage-recheck" :cron #app/cron "0 0 */1 * * ?" ;; hourly - :fn (ig/ref :app.storage/recheck-task)} + :task :storage-recheck} {:id "tasks-gc" :cron #app/cron "0 0 0 */1 * ?" ;; daily - :fn (ig/ref :app.tasks.tasks-gc/handler)} + :task :tasks-gc} (when (:telemetry-enabled config) {:id "telemetry" :cron #app/cron "0 0 */6 * * ?" ;; every 6h :uri (:telemetry-uri config) - :fn (ig/ref :app.tasks.telemetry/handler)})]} + :task :telemetry})]} - :app.tasks/all - {"sendmail" (ig/ref :app.tasks.sendmail/handler) - "delete-object" (ig/ref :app.tasks.delete-object/handler) - "delete-profile" (ig/ref :app.tasks.delete-profile/handler)} + :app.tasks/registry + {:metrics (ig/ref :app.metrics/metrics) + :tasks + {:sendmail (ig/ref :app.tasks.sendmail/handler) + :delete-object (ig/ref :app.tasks.delete-object/handler) + :delete-profile (ig/ref :app.tasks.delete-profile/handler) + :file-media-gc (ig/ref :app.tasks.file-media-gc/handler) + :file-xlog-gc (ig/ref :app.tasks.file-xlog-gc/handler) + :storage-deleted-gc (ig/ref :app.storage/gc-deleted-task) + :storage-touched-gc (ig/ref :app.storage/gc-touched-task) + :storage-recheck (ig/ref :app.storage/recheck-task) + :tasks-gc (ig/ref :app.tasks.tasks-gc/handler) + :telemetry (ig/ref :app.tasks.telemetry/handler)}} :app.tasks.sendmail/handler {:host (:smtp-host config) diff --git a/backend/src/app/metrics.clj b/backend/src/app/metrics.clj index a7e866068..e71283ca2 100644 --- a/backend/src/app/metrics.clj +++ b/backend/src/app/metrics.clj @@ -10,17 +10,15 @@ (ns app.metrics (:require [app.common.exceptions :as ex] - [app.util.time :as dt] - [app.worker] [clojure.spec.alpha :as s] [clojure.tools.logging :as log] - [integrant.core :as ig] - [next.jdbc :as jdbc]) + [integrant.core :as ig]) (:import io.prometheus.client.CollectorRegistry io.prometheus.client.Counter io.prometheus.client.Gauge io.prometheus.client.Summary + io.prometheus.client.Histogram io.prometheus.client.exporter.common.TextFormat io.prometheus.client.hotspot.DefaultExports io.prometheus.client.jetty.JettyStatisticsCollector @@ -30,41 +28,12 @@ (declare instrument-vars!) (declare instrument) (declare create-registry) - +(declare create) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Entry Point ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -(defn- instrument-jdbc! - [registry] - (instrument-vars! - [#'next.jdbc/execute-one! - #'next.jdbc/execute!] - {:registry registry - :type :counter - :name "database_query_counter" - :help "An absolute counter of database queries."})) - -(defn- instrument-workers! - [registry] - (instrument-vars! - [#'app.worker/run-task] - {:registry registry - :type :summary - :name "worker_task_checkout_millis" - :help "Latency measured between scheduld_at and execution time." - :wrap (fn [rootf mobj] - (let [mdata (meta rootf) - origf (::original mdata rootf)] - (with-meta - (fn [tasks item] - (let [now (inst-ms (dt/now)) - sat (inst-ms (:scheduled-at item))] - (mobj :observe (- now sat)) - (origf tasks item))) - {::original origf})))})) - (defn- handler [registry _request] (let [samples (.metricFamilySamples ^CollectorRegistry registry) @@ -73,13 +42,24 @@ {:headers {"content-type" TextFormat/CONTENT_TYPE_004} :body (.toString writer)})) +(s/def ::definitions + (s/map-of keyword? map?)) + +(defmethod ig/pre-init-spec ::metrics [_] + (s/keys :opt-un [::definitions])) + (defmethod ig/init-key ::metrics - [_ _cfg] + [_ {:keys [definitions] :as cfg}] (log/infof "Initializing prometheus registry and instrumentation.") - (let [registry (create-registry)] - (instrument-workers! registry) - (instrument-jdbc! registry) + (let [registry (create-registry) + definitions (reduce-kv (fn [res k v] + (->> (assoc v :registry registry) + (create) + (assoc res k))) + {} + definitions)] {:handler (partial handler registry) + :definitions definitions :registry registry})) (s/def ::handler fn?) @@ -87,7 +67,6 @@ (s/def ::metrics (s/keys :req-un [::registry ::handler])) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Implementation ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -126,7 +105,7 @@ (invoke [_ cmd labels] (.. ^Counter instance - (labels labels) + (labels (into-array String labels)) (inc)))))) (defn make-gauge @@ -150,19 +129,27 @@ :dec (.dec ^Gauge instance))) (invoke [_ cmd labels] - (case cmd - :inc (.. ^Gauge instance (labels labels) (inc)) - :dec (.. ^Gauge instance (labels labels) (dec))))))) + (let [labels (into-array String [labels])] + (case cmd + :inc (.. ^Gauge instance (labels labels) (inc)) + :dec (.. ^Gauge instance (labels labels) (dec)))))))) + +(def default-quantiles + [[0.75 0.02] + [0.99 0.001]]) (defn make-summary - [{:keys [name help registry reg labels max-age] :or {max-age 3600} :as props}] + [{:keys [name help registry reg labels max-age quantiles buckets] + :or {max-age 3600 buckets 6 quantiles default-quantiles} :as props}] (let [registry (or registry reg) instance (doto (Summary/build) (.name name) - (.help help) - (.maxAgeSeconds max-age) - (.quantile 0.75 0.02) - (.quantile 0.99 0.001)) + (.help help)) + _ (when (seq quantiles) + (.maxAgeSeconds ^Summary instance max-age) + (.ageBuckets ^Summary instance buckets)) + _ (doseq [[q e] quantiles] + (.quantile ^Summary instance q e)) _ (when (seq labels) (.labelNames instance (into-array String labels))) instance (.register instance registry)] @@ -176,7 +163,34 @@ (invoke [_ cmd val labels] (.. ^Summary instance - (labels labels) + (labels (into-array String labels)) + (observe val)))))) + +(def default-histogram-buckets + [1 5 10 25 50 75 100 250 500 750 1000 2500 5000 7500]) + +(defn make-histogram + [{:keys [name help registry reg labels buckets] + :or {buckets default-histogram-buckets}}] + (let [registry (or registry reg) + instance (doto (Histogram/build) + (.name name) + (.help help) + (.buckets (into-array Double/TYPE buckets))) + _ (when (seq labels) + (.labelNames instance (into-array String labels))) + instance (.register instance registry)] + (reify + clojure.lang.IDeref + (deref [_] instance) + + clojure.lang.IFn + (invoke [_ cmd val] + (.observe ^Histogram instance val)) + + (invoke [_ cmd val labels] + (.. ^Histogram instance + (labels (into-array String labels)) (observe val)))))) (defn create @@ -184,7 +198,8 @@ (case type :counter (make-counter props) :gauge (make-gauge props) - :summary (make-summary props))) + :summary (make-summary props) + :histogram (make-histogram props))) (defn wrap-counter ([rootf mobj] @@ -204,7 +219,6 @@ (assoc mdata ::original origf)))) ([rootf mobj labels] (let [mdata (meta rootf) - labels (into-array String labels) origf (::original mdata rootf)] (with-meta (fn @@ -241,7 +255,6 @@ ([rootf mobj labels] (let [mdata (meta rootf) - labels (into-array String labels) origf (::original mdata rootf)] (with-meta (fn @@ -284,6 +297,9 @@ (instance? Summary @obj) ((or wrap wrap-summary) f obj) + (instance? Histogram @obj) + ((or wrap wrap-summary) f obj) + :else (ex/raise :type :not-implemented)))) diff --git a/backend/src/app/tasks.clj b/backend/src/app/tasks.clj index 2a3eca68d..9ac9a3a8b 100644 --- a/backend/src/app/tasks.clj +++ b/backend/src/app/tasks.clj @@ -5,17 +5,19 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020-2021 UXBOX Labs SL (ns app.tasks (:require [app.common.spec :as us] [app.common.uuid :as uuid] [app.db :as db] - ;; [app.metrics :as mtx] + [app.metrics :as mtx] [app.util.time :as dt] + [app.worker] [clojure.spec.alpha :as s] - [clojure.tools.logging :as log])) + [clojure.tools.logging :as log] + [integrant.core :as ig])) (s/def ::name ::us/string) (s/def ::delay @@ -41,11 +43,68 @@ interval (db/interval duration) props (db/tjson props) id (uuid/next)] - (log/infof "Submit task '%s' to be executed in '%s'." name (str duration)) + (log/debugf "submit task '%s' to be executed in '%s'" name (str duration)) (db/exec-one! conn [sql:insert-new-task id name props queue priority max-retries interval]) id)) -;; (mtx/instrument-with-counter! -;; {:var #'submit! -;; :id "tasks__submit_counter" -;; :help "Absolute task submit counter."}) +(defn- instrument! + [registry] + (mtx/instrument-vars! + [#'submit!] + {:registry registry + :type :counter + :labels ["name"] + :name "tasks_submit_counter" + :help "An absolute counter of task submissions." + :wrap (fn [rootf mobj] + (let [mdata (meta rootf) + origf (::original mdata rootf)] + (with-meta + (fn [conn params] + (let [tname (:name params)] + (mobj :inc [tname]) + (origf conn params))) + {::original origf})))}) + + (mtx/instrument-vars! + [#'app.worker/run-task] + {:registry registry + :type :summary + :quantiles [] + :name "tasks_checkout_timing" + :help "Latency measured between scheduld_at and execution time." + :wrap (fn [rootf mobj] + (let [mdata (meta rootf) + origf (::original mdata rootf)] + (with-meta + (fn [tasks item] + (let [now (inst-ms (dt/now)) + sat (inst-ms (:scheduled-at item))] + (mobj :observe (- now sat)) + (origf tasks item))) + {::original origf})))})) + +;; --- STATE INIT: REGISTRY + +(s/def ::tasks + (s/map-of keyword? fn?)) + +(defmethod ig/pre-init-spec ::registry [_] + (s/keys :req-un [::mtx/metrics ::tasks])) + +(defmethod ig/init-key ::registry + [_ {:keys [metrics tasks]}] + (instrument! (:registry metrics)) + (let [mobj (mtx/create + {:registry (:registry metrics) + :type :summary + :labels ["name"] + :quantiles [] + :name "tasks_timing" + :help "Background task execution timing."})] + (reduce-kv (fn [res k v] + (let [tname (name k)] + (log/debugf "registring task '%s'" tname) + (assoc res tname (mtx/wrap-summary v mobj [tname])))) + {} + tasks))) diff --git a/backend/src/app/tasks/delete_object.clj b/backend/src/app/tasks/delete_object.clj index 602c7182c..78fd47007 100644 --- a/backend/src/app/tasks/delete_object.clj +++ b/backend/src/app/tasks/delete_object.clj @@ -12,36 +12,26 @@ (:require [app.common.spec :as us] [app.db :as db] - [app.metrics :as mtx] [clojure.spec.alpha :as s] [clojure.tools.logging :as log] [integrant.core :as ig])) -(declare handler) (declare handle-deletion) (defmethod ig/pre-init-spec ::handler [_] - (s/keys :req-un [::db/pool ::mtx/metrics])) + (s/keys :req-un [::db/pool])) (defmethod ig/init-key ::handler - [_ {:keys [metrics] :as cfg}] - (let [handler #(handler cfg %)] - (->> {:registry (:registry metrics) - :type :summary - :name "task_delete_object_timing" - :help "delete object task timing"} - (mtx/instrument handler)))) + [_ {:keys [pool] :as cfg}] + (fn [{:keys [props] :as task}] + (us/verify ::props props) + (db/with-atomic [conn pool] + (handle-deletion conn props)))) (s/def ::type ::us/keyword) (s/def ::id ::us/uuid) (s/def ::props (s/keys :req-un [::id ::type])) -(defn- handler - [{:keys [pool]} {:keys [props] :as task}] - (us/verify ::props props) - (db/with-atomic [conn pool] - (handle-deletion conn props))) - (defmulti handle-deletion (fn [_ props] (:type props))) diff --git a/backend/src/app/tasks/delete_profile.clj b/backend/src/app/tasks/delete_profile.clj index f2b2030a6..923ccf814 100644 --- a/backend/src/app/tasks/delete_profile.clj +++ b/backend/src/app/tasks/delete_profile.clj @@ -13,27 +13,16 @@ [app.common.spec :as us] [app.db :as db] [app.db.sql :as sql] - [app.metrics :as mtx] [clojure.spec.alpha :as s] [clojure.tools.logging :as log] [integrant.core :as ig])) (declare delete-profile-data) -(declare handler) ;; --- INIT (defmethod ig/pre-init-spec ::handler [_] - (s/keys :req-un [::db/pool ::mtx/metrics])) - -(defmethod ig/init-key ::handler - [_ {:keys [metrics] :as cfg}] - (let [handler #(handler cfg %)] - (->> {:registry (:registry metrics) - :type :summary - :name "task_delete_profile_timing" - :help "delete profile task timing"} - (mtx/instrument handler)))) + (s/keys :req-un [::db/pool])) ;; This task is responsible to permanently delete a profile with all ;; the dependent data. As step (1) we delete all owned teams of the @@ -48,16 +37,17 @@ (s/def ::profile-id ::us/uuid) (s/def ::props (s/keys :req-un [::profile-id])) -(defn handler - [{:keys [pool]} {:keys [props] :as task}] - (us/verify ::props props) - (db/with-atomic [conn pool] - (let [id (:profile-id props) - profile (db/exec-one! conn (sql/select :profile {:id id} {:for-update true}))] - (if (or (:is-demo profile) - (:deleted-at profile)) - (delete-profile-data conn id) - (log/warnf "Profile %s does not match constraints for deletion" id))))) +(defmethod ig/init-key ::handler + [_ {:keys [pool] :as cfg}] + (fn [{:keys [props] :as task}] + (us/verify ::props props) + (db/with-atomic [conn pool] + (let [id (:profile-id props) + profile (db/exec-one! conn (sql/select :profile {:id id} {:for-update true}))] + (if (or (:is-demo profile) + (:deleted-at profile)) + (delete-profile-data conn id) + (log/warnf "profile '%s' does not match constraints for deletion" id)))))) ;; --- IMPL diff --git a/backend/src/app/tasks/file_media_gc.clj b/backend/src/app/tasks/file_media_gc.clj index f13f244c0..eebd434b5 100644 --- a/backend/src/app/tasks/file_media_gc.clj +++ b/backend/src/app/tasks/file_media_gc.clj @@ -5,7 +5,7 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020-2021 UXBOX Labs SL (ns app.tasks.file-media-gc "A maintenance task that is responsible to purge the unused media @@ -14,44 +14,34 @@ (:require [app.common.pages.migrations :as pmg] [app.db :as db] - [app.metrics :as mtx] [app.util.blob :as blob] [app.util.time :as dt] [clojure.spec.alpha :as s] [clojure.tools.logging :as log] [integrant.core :as ig])) -(declare handler) (declare process-file) (declare retrieve-candidates) (s/def ::max-age ::dt/duration) (defmethod ig/pre-init-spec ::handler [_] - (s/keys :req-un [::db/pool ::mtx/metrics ::max-age])) + (s/keys :req-un [::db/pool ::max-age])) (defmethod ig/init-key ::handler - [_ {:keys [metrics] :as cfg}] - (let [handler #(handler cfg %)] - (->> {:registry (:registry metrics) - :type :summary - :name "task_file_media_gc_timing" - :help "file media garbage collection task timing"} - (mtx/instrument handler)))) - -(defn- handler - [{:keys [pool] :as cfg} _] - (db/with-atomic [conn pool] - (let [cfg (assoc cfg :conn conn)] - (loop [n 0] - (let [files (retrieve-candidates cfg)] - (if (seq files) - (do - (run! (partial process-file cfg) files) - (recur (+ n (count files)))) - (do - (log/infof "finalized with total of %s processed files" n) - {:processed n}))))))) + [_ {:keys [pool] :as cfg}] + (fn [_] + (db/with-atomic [conn pool] + (let [cfg (assoc cfg :conn conn)] + (loop [n 0] + (let [files (retrieve-candidates cfg)] + (if (seq files) + (do + (run! (partial process-file cfg) files) + (recur (+ n (count files)))) + (do + (log/debugf "finalized with total of %s processed files" n) + {:processed n})))))))) (def ^:private sql:retrieve-candidates-chunk diff --git a/backend/src/app/tasks/file_xlog_gc.clj b/backend/src/app/tasks/file_xlog_gc.clj index 4b90200c3..d333f2ac5 100644 --- a/backend/src/app/tasks/file_xlog_gc.clj +++ b/backend/src/app/tasks/file_xlog_gc.clj @@ -5,45 +5,36 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020-2021 UXBOX Labs SL (ns app.tasks.file-xlog-gc "A maintenance task that performs a garbage collection of the file change (transaction) log." (:require [app.db :as db] - [app.metrics :as mtx] [app.util.time :as dt] [clojure.spec.alpha :as s] [clojure.tools.logging :as log] [integrant.core :as ig])) -(declare handler) +(declare sql:delete-files-xlog) (s/def ::max-age ::dt/duration) (defmethod ig/pre-init-spec ::handler [_] - (s/keys :req-un [::db/pool ::mtx/metrics ::max-age])) + (s/keys :req-un [::db/pool ::max-age])) (defmethod ig/init-key ::handler - [_ {:keys [metrics] :as cfg}] - (let [handler #(handler cfg %)] - (->> {:registry (:registry metrics) - :type :summary - :name "task_file_xlog_gc_timing" - :help "file changes garbage collection task timing"} - (mtx/instrument handler)))) + [_ {:keys [pool max-age] :as cfg}] + (fn [_] + (db/with-atomic [conn pool] + (let [interval (db/interval max-age) + result (db/exec-one! conn [sql:delete-files-xlog interval]) + result (:next.jdbc/update-count result)] + (log/debugf "removed %s rows from file-change table" result) + result)))) (def ^:private sql:delete-files-xlog "delete from file_change where created_at < now() - ?::interval") - -(defn- handler - [{:keys [pool max-age]} _] - (db/with-atomic [conn pool] - (let [interval (db/interval max-age) - result (db/exec-one! conn [sql:delete-files-xlog interval]) - result (:next.jdbc/update-count result)] - (log/infof "removed %s rows from file_change table" result) - nil))) diff --git a/backend/src/app/tasks/sendmail.clj b/backend/src/app/tasks/sendmail.clj index 78315a2b7..0619b75a2 100644 --- a/backend/src/app/tasks/sendmail.clj +++ b/backend/src/app/tasks/sendmail.clj @@ -10,13 +10,12 @@ (ns app.tasks.sendmail (:require [app.config :as cfg] - [app.metrics :as mtx] [app.util.emails :as emails] [clojure.spec.alpha :as s] [clojure.tools.logging :as log] [integrant.core :as ig])) -(declare handler) +(declare send-console!) (s/def ::username ::cfg/smtp-username) (s/def ::password ::cfg/smtp-password) @@ -29,7 +28,7 @@ (s/def ::enabled ::cfg/smtp-enabled) (defmethod ig/pre-init-spec ::handler [_] - (s/keys :req-un [::enabled ::mtx/metrics] + (s/keys :req-un [::enabled] :opt-un [::username ::password ::tls @@ -40,13 +39,11 @@ ::default-reply-to])) (defmethod ig/init-key ::handler - [_ {:keys [metrics] :as cfg}] - (let [handler #(handler cfg %)] - (->> {:registry (:registry metrics) - :type :summary - :name "task_sendmail_timing" - :help "sendmail task timing"} - (mtx/instrument handler)))) + [_ cfg] + (fn [{:keys [props] :as task}] + (if (:enabled cfg) + (emails/send! cfg props) + (send-console! cfg props)))) (defn- send-console! [cfg email] @@ -59,9 +56,3 @@ (println (.toString baos)) (println "******** end email "(:id email) "**********"))] (log/info out)))) - -(defn handler - [cfg {:keys [props] :as task}] - (if (:enabled cfg) - (emails/send! cfg props) - (send-console! cfg props))) diff --git a/backend/src/app/tasks/tasks_gc.clj b/backend/src/app/tasks/tasks_gc.clj index 975bfea8c..3ff4e8db0 100644 --- a/backend/src/app/tasks/tasks_gc.clj +++ b/backend/src/app/tasks/tasks_gc.clj @@ -5,46 +5,36 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020-2021 UXBOX Labs SL (ns app.tasks.tasks-gc "A maintenance task that performs a cleanup of already executed tasks from the database table." (:require [app.db :as db] - [app.metrics :as mtx] [app.util.time :as dt] [clojure.spec.alpha :as s] [clojure.tools.logging :as log] [integrant.core :as ig])) -(declare handler) +(declare sql:delete-completed-tasks) (s/def ::max-age ::dt/duration) (defmethod ig/pre-init-spec ::handler [_] - (s/keys :req-un [::db/pool ::mtx/metrics ::max-age])) + (s/keys :req-un [::db/pool ::max-age])) (defmethod ig/init-key ::handler - [_ {:keys [metrics] :as cfg}] - (let [handler #(handler cfg %)] - (->> {:registry (:registry metrics) - :type :summary - :name "task_tasks_gc_timing" - :help "tasks garbage collection task timing"} - (mtx/instrument handler)))) + [_ {:keys [pool max-age] :as cfg}] + (fn [_] + (db/with-atomic [conn pool] + (let [interval (db/interval max-age) + result (db/exec-one! conn [sql:delete-completed-tasks interval]) + result (:next.jdbc/update-count result)] + (log/debugf "removed %s rows from tasks-completed table" result) + result)))) (def ^:private sql:delete-completed-tasks "delete from task_completed where scheduled_at < now() - ?::interval") - -(defn- handler - [{:keys [pool max-age]} _] - (db/with-atomic [conn pool] - (let [interval (db/interval max-age) - result (db/exec-one! conn [sql:delete-completed-tasks interval]) - result (:next.jdbc/update-count result)] - (log/infof "removed %s rows from tasks_completed table" result) - nil))) - diff --git a/backend/src/app/worker.clj b/backend/src/app/worker.clj index 9b7cdc478..fe078ba02 100644 --- a/backend/src/app/worker.clj +++ b/backend/src/app/worker.clj @@ -10,6 +10,7 @@ (ns app.worker "Async tasks abstraction (impl)." (:require + [app.common.exceptions :as ex] [app.common.spec :as us] [app.common.uuid :as uuid] [app.db :as db] @@ -19,6 +20,7 @@ [clojure.core.async :as a] [clojure.spec.alpha :as s] [clojure.tools.logging :as log] + [cuerdas.core :as str] [integrant.core :as ig] [promesa.exec :as px]) (:import @@ -72,7 +74,7 @@ (s/def ::queue ::us/string) (s/def ::parallelism ::us/integer) (s/def ::batch-size ::us/integer) -(s/def ::tasks (s/map-of string? ::us/fn)) +(s/def ::tasks (s/map-of string? fn?)) (s/def ::poll-interval ::dt/duration) (defmethod ig/pre-init-spec ::worker [_] @@ -289,21 +291,31 @@ (s/def ::id ::us/string) (s/def ::cron dt/cron?) (s/def ::props (s/nilable map?)) +(s/def ::task keyword?) (s/def ::scheduled-task-spec - (s/keys :req-un [::id ::cron ::fn] + (s/keys :req-un [::id ::cron ::task] :opt-un [::props])) -(s/def ::schedule - (s/coll-of (s/nilable ::scheduled-task-spec))) +(s/def ::schedule (s/coll-of (s/nilable ::scheduled-task-spec))) (defmethod ig/pre-init-spec ::scheduler [_] - (s/keys :req-un [::executor ::db/pool ::schedule])) + (s/keys :req-un [::executor ::db/pool ::schedule ::tasks])) (defmethod ig/init-key ::scheduler - [_ {:keys [schedule] :as cfg}] + [_ {:keys [schedule tasks] :as cfg}] (let [scheduler (Executors/newScheduledThreadPool (int 1)) - schedule (filter some? schedule) + schedule (->> schedule + (filter some?) + (map (fn [{:keys [task] :as item}] + (let [f (get tasks (name task))] + (when-not f + (ex/raise :type :internal + :code :task-not-found + :hint (str/fmt "task %s not configured" task))) + (-> item + (dissoc :task) + (assoc :fn f)))))) cfg (assoc cfg :scheduler scheduler :schedule schedule)] @@ -351,27 +363,16 @@ (letfn [(run-task [conn] (try (when (db/exec-one! conn [sql:lock-scheduled-task id]) - (log/info "Executing scheduled task" id) + (log/debugf "executing scheduled task '%s'" id) ((:fn task) task)) - (catch Exception e + (catch Throwable e e))) - (handle-task* [conn] - (let [result (run-task conn)] - (if (instance? Throwable result) - (do - (log/warnf result "unhandled exception on scheduled task '%s'" id) - (db/insert! conn :scheduled-task-history - {:id (uuid/next) - :task-id id - :is-error true - :reason (exception->string result)})) - (db/insert! conn :scheduled-task-history - {:id (uuid/next) - :task-id id})))) (handle-task [] (db/with-atomic [conn pool] - (handle-task* conn)))] + (let [result (run-task conn)] + (when (ex/exception? result) + (log/errorf result "unhandled exception on scheduled task '%s'" id)))))] (try (px/run! executor handle-task) diff --git a/common/app/common/exceptions.cljc b/common/app/common/exceptions.cljc index 389178255..96782de95 100644 --- a/common/app/common/exceptions.cljc +++ b/common/app/common/exceptions.cljc @@ -52,3 +52,7 @@ (defn ex-info? [v] (instance? #?(:clj clojure.lang.ExceptionInfo :cljs cljs.core.ExceptionInfo) v)) + +(defn exception? + [v] + (instance? #?(:clj java.lang.Throwable :cljs js/Error) v)) From c79036aa65ee9be49f24b40f3a1f0f9c94858184 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 22 Feb 2021 12:47:08 +0100 Subject: [PATCH 41/90] :sparkles: Improve metrics on websocket notification module. Add session timing. --- backend/src/app/notifications.clj | 50 ++++++++++++++++++------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/backend/src/app/notifications.clj b/backend/src/app/notifications.clj index 4b9a72ce1..61f198814 100644 --- a/backend/src/app/notifications.clj +++ b/backend/src/app/notifications.clj @@ -14,6 +14,7 @@ [app.db :as db] [app.metrics :as mtx] [app.util.async :as aa] + [app.util.time :as dt] [app.util.transit :as t] [clojure.core.async :as a] [clojure.spec.alpha :as s] @@ -46,29 +47,32 @@ mtx-active-connections (mtx/create - {:name "websocket_notifications_active_connections" + {:name "websocket_active_connections" :registry (:registry metrics) :type :gauge - :help "Active websocket connections on notifications service."}) + :help "Active websocket connections."}) - mtx-message-recv + mtx-messages (mtx/create - {:name "websocket_notifications_message_recv_timing" + {:name "websocket_message_count" :registry (:registry metrics) - :type :summary - :help "Message receive summary timing (ms)."}) + :labels ["op"] + :type :counter + :help "Counter of processed messages."}) - mtx-message-send + mtx-sessions (mtx/create - {:name "websocket_notifications_message_send_timing" + {:name "websocket_session_timing" :registry (:registry metrics) - :type :summary - :help "Message receive summary timing (ms)."}) + :quantiles [] + :help "Websocket session timing (seconds)." + :type :summary}) cfg (assoc cfg :mtx-active-connections mtx-active-connections - :mtx-message-recv mtx-message-recv - :mtx-message-send mtx-message-send)] + :mtx-messages mtx-messages + :mtx-sessions mtx-sessions + )] (-> #(handler cfg %) (wrap-session) (wrap-keyword-params) @@ -130,16 +134,17 @@ (defn websocket [{:keys [file-id team-id msgbus] :as cfg}] - (let [in (a/chan 32) - out (a/chan 32) - mtx-active-connections (:mtx-active-connections cfg) - mtx-message-send (:mtx-message-send cfg) - mtx-message-recv (:mtx-message-recv cfg) + (let [in (a/chan 32) + out (a/chan 32) + mtx-aconn (:mtx-active-connections cfg) + mtx-messages (:mtx-messages cfg) + mtx-sessions (:mtx-sessions cfg) + created-at (dt/now) - ws-send (mtx/wrap-summary ws-send mtx-message-send)] + ws-send (mtx/wrap-counter ws-send mtx-messages ["send"])] (letfn [(on-connect [conn] - (mtx-active-connections :inc) + (mtx-aconn :inc) (let [sub (a/chan) ws (WebSocket. conn in out sub nil cfg)] @@ -159,11 +164,14 @@ (a/close! sub)))) (on-error [_conn _e] + (mtx-aconn :dec) + (mtx-sessions :observe (/ (inst-ms (dt/duration-between created-at (dt/now))) 1000.0)) (a/close! out) (a/close! in)) (on-close [_conn _status _reason] - (mtx-active-connections :dec) + (mtx-aconn :dec) + (mtx-sessions :observe (/ (inst-ms (dt/duration-between created-at (dt/now))) 1000.0)) (a/close! out) (a/close! in)) @@ -174,7 +182,7 @@ {:on-connect on-connect :on-error on-error :on-close on-close - :on-text (mtx/wrap-summary on-message mtx-message-recv) + :on-text (mtx/wrap-counter on-message mtx-messages ["recv"]) :on-bytes (constantly nil)}))) (declare handle-message) From 995017df5acd783f2d5300037938f8aecf0cbc86 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 22 Feb 2021 12:48:21 +0100 Subject: [PATCH 42/90] :tada: Add the ability to execute code on the end of http request. Mainly for register metrics once the main transaction is commited. --- backend/src/app/rpc.clj | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/backend/src/app/rpc.clj b/backend/src/app/rpc.clj index e768315f2..7f7237dad 100644 --- a/backend/src/app/rpc.clj +++ b/backend/src/app/rpc.clj @@ -25,6 +25,11 @@ [_] (ex/raise :type :not-found)) +(defn- run-hook + [hook-fn response] + (ex/ignoring (hook-fn)) + response) + (defn- rpc-query-handler [methods {:keys [profile-id] :as request}] (let [type (keyword (get-in request [:path-params :type])) @@ -50,7 +55,11 @@ result ((get methods type default-handler) data) mdata (meta result)] (cond->> {:status 200 :body result} - (fn? (:transform-response mdata)) ((:transform-response mdata) request)))) + (fn? (:transform-response mdata)) + ((:transform-response mdata) request) + + (fn? (:before-complete mdata)) + (run-hook (:before-complete mdata))))) (defn- wrap-with-metrics [cfg f mdata] From fb5158074069d2e657ecb2dd7f1f0f39c2c1d0f5 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 22 Feb 2021 12:51:19 +0100 Subject: [PATCH 43/90] :tada: Add proper lifecycle handling for http sessions. --- backend/src/app/config.clj | 141 ++++++++--------- backend/src/app/http/session.clj | 143 +++++++++++++++++- backend/src/app/main.clj | 21 ++- backend/src/app/migrations.clj | 2 + .../sql/0049-mod-http-session-table.sql | 6 + 5 files changed, 227 insertions(+), 86 deletions(-) create mode 100644 backend/src/app/migrations/sql/0049-mod-http-session-table.sql diff --git a/backend/src/app/config.clj b/backend/src/app/config.clj index ac76d9de3..742b20727 100644 --- a/backend/src/app/config.clj +++ b/backend/src/app/config.clj @@ -5,7 +5,7 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020-2021 UXBOX Labs SL (ns app.config "A configuration management." @@ -80,92 +80,78 @@ ;; :initial-data-project-name "Penpot Oboarding" }) -(s/def ::http-server-port ::us/integer) - -(s/def ::host ::us/string) -(s/def ::tenant ::us/string) - -(s/def ::database-username (s/nilable ::us/string)) +(s/def ::allow-demo-users ::us/boolean) +(s/def ::asserts-enabled ::us/boolean) +(s/def ::assets-path ::us/string) (s/def ::database-password (s/nilable ::us/string)) (s/def ::database-uri ::us/string) -(s/def ::redis-uri ::us/string) - -(s/def ::loggers-loki-uri ::us/string) -(s/def ::loggers-zmq-uri ::us/string) - -(s/def ::storage-backend ::us/keyword) -(s/def ::storage-fs-directory ::us/string) -(s/def ::assets-path ::us/string) -(s/def ::storage-s3-region ::us/keyword) -(s/def ::storage-s3-bucket ::us/string) - -(s/def ::media-uri ::us/string) -(s/def ::media-directory ::us/string) -(s/def ::asserts-enabled ::us/boolean) - -(s/def ::feedback-enabled ::us/boolean) -(s/def ::feedback-destination ::us/string) - -(s/def ::profile-complaint-max-age ::dt/duration) -(s/def ::profile-complaint-threshold ::us/integer) -(s/def ::profile-bounce-max-age ::dt/duration) -(s/def ::profile-bounce-threshold ::us/integer) - +(s/def ::database-username (s/nilable ::us/string)) +(s/def ::default-blob-version ::us/integer) (s/def ::error-report-webhook ::us/string) - -(s/def ::smtp-enabled ::us/boolean) -(s/def ::smtp-default-reply-to ::us/string) -(s/def ::smtp-default-from ::us/string) -(s/def ::smtp-host ::us/string) -(s/def ::smtp-port ::us/integer) -(s/def ::smtp-username (s/nilable ::us/string)) -(s/def ::smtp-password (s/nilable ::us/string)) -(s/def ::smtp-tls ::us/boolean) -(s/def ::smtp-ssl ::us/boolean) -(s/def ::allow-demo-users ::us/boolean) -(s/def ::registration-enabled ::us/boolean) -(s/def ::registration-domain-whitelist ::us/string) -(s/def ::public-uri ::us/string) - -(s/def ::srepl-host ::us/string) -(s/def ::srepl-port ::us/integer) - -(s/def ::rlimits-password ::us/integer) -(s/def ::rlimits-image ::us/integer) - -(s/def ::google-client-id ::us/string) -(s/def ::google-client-secret ::us/string) - -(s/def ::gitlab-client-id ::us/string) -(s/def ::gitlab-client-secret ::us/string) -(s/def ::gitlab-base-uri ::us/string) - +(s/def ::feedback-destination ::us/string) +(s/def ::feedback-enabled ::us/boolean) (s/def ::github-client-id ::us/string) (s/def ::github-client-secret ::us/string) - -(s/def ::ldap-host ::us/string) -(s/def ::ldap-port ::us/integer) -(s/def ::ldap-bind-dn ::us/string) -(s/def ::ldap-bind-password ::us/string) -(s/def ::ldap-ssl ::us/boolean) -(s/def ::ldap-starttls ::us/boolean) -(s/def ::ldap-base-dn ::us/string) -(s/def ::ldap-user-query ::us/string) -(s/def ::ldap-attrs-username ::us/string) +(s/def ::gitlab-base-uri ::us/string) +(s/def ::gitlab-client-id ::us/string) +(s/def ::gitlab-client-secret ::us/string) +(s/def ::google-client-id ::us/string) +(s/def ::google-client-secret ::us/string) +(s/def ::host ::us/string) +(s/def ::http-server-port ::us/integer) +(s/def ::http-session-cookie-name ::us/string) +(s/def ::http-session-idle-max-age ::dt/duration) +(s/def ::http-session-updater-batch-max-age ::dt/duration) +(s/def ::http-session-updater-batch-max-size ::us/integer) +(s/def ::initial-data-file ::us/string) +(s/def ::initial-data-project-name ::us/string) (s/def ::ldap-attrs-email ::us/string) (s/def ::ldap-attrs-fullname ::us/string) (s/def ::ldap-attrs-photo ::us/string) - +(s/def ::ldap-attrs-username ::us/string) +(s/def ::ldap-base-dn ::us/string) +(s/def ::ldap-bind-dn ::us/string) +(s/def ::ldap-bind-password ::us/string) +(s/def ::ldap-host ::us/string) +(s/def ::ldap-port ::us/integer) +(s/def ::ldap-ssl ::us/boolean) +(s/def ::ldap-starttls ::us/boolean) +(s/def ::ldap-user-query ::us/string) +(s/def ::loggers-loki-uri ::us/string) +(s/def ::loggers-zmq-uri ::us/string) +(s/def ::media-directory ::us/string) +(s/def ::media-uri ::us/string) +(s/def ::profile-bounce-max-age ::dt/duration) +(s/def ::profile-bounce-threshold ::us/integer) +(s/def ::profile-complaint-max-age ::dt/duration) +(s/def ::profile-complaint-threshold ::us/integer) +(s/def ::public-uri ::us/string) +(s/def ::redis-uri ::us/string) +(s/def ::registration-domain-whitelist ::us/string) +(s/def ::registration-enabled ::us/boolean) +(s/def ::rlimits-image ::us/integer) +(s/def ::rlimits-password ::us/integer) +(s/def ::smtp-default-from ::us/string) +(s/def ::smtp-default-reply-to ::us/string) +(s/def ::smtp-enabled ::us/boolean) +(s/def ::smtp-host ::us/string) +(s/def ::smtp-password (s/nilable ::us/string)) +(s/def ::smtp-port ::us/integer) +(s/def ::smtp-ssl ::us/boolean) +(s/def ::smtp-tls ::us/boolean) +(s/def ::smtp-username (s/nilable ::us/string)) +(s/def ::srepl-host ::us/string) +(s/def ::srepl-port ::us/integer) +(s/def ::storage-backend ::us/keyword) +(s/def ::storage-fs-directory ::us/string) +(s/def ::storage-s3-bucket ::us/string) +(s/def ::storage-s3-region ::us/keyword) (s/def ::telemetry-enabled ::us/boolean) -(s/def ::telemetry-with-taiga ::us/boolean) -(s/def ::telemetry-uri ::us/string) (s/def ::telemetry-server-enabled ::us/boolean) (s/def ::telemetry-server-port ::us/integer) - -(s/def ::initial-data-file ::us/string) -(s/def ::initial-data-project-name ::us/string) - -(s/def ::default-blob-version ::us/integer) +(s/def ::telemetry-uri ::us/string) +(s/def ::telemetry-with-taiga ::us/boolean) +(s/def ::tenant ::us/string) (s/def ::config (s/keys :opt-un [::allow-demo-users @@ -185,6 +171,9 @@ ::google-client-id ::google-client-secret ::http-server-port + ::http-session-updater-batch-max-age + ::http-session-updater-batch-max-size + ::http-session-idle-max-age ::host ::ldap-attrs-username ::ldap-attrs-email diff --git a/backend/src/app/http/session.clj b/backend/src/app/http/session.clj index 45e25699f..bb5afecc5 100644 --- a/backend/src/app/http/session.clj +++ b/backend/src/app/http/session.clj @@ -9,11 +9,20 @@ (ns app.http.session (:require + [app.common.data :as d] + [app.common.exceptions :as ex] + [app.config :as cfg] [app.db :as db] + [app.metrics :as mtx] + [app.util.async :as aa] [app.util.log4j :refer [update-thread-context!]] + [app.util.time :as dt] + [app.worker :as wrk] [buddy.core.codecs :as bc] [buddy.core.nonce :as bn] + [clojure.core.async :as a] [clojure.spec.alpha :as s] + [clojure.tools.logging :as log] [integrant.core :as ig])) ;; --- IMPL @@ -42,8 +51,7 @@ (defn- retrieve [{:keys [conn] :as cfg} token] (when token - (-> (db/exec-one! conn ["select profile_id from http_session where id = ?" token]) - (:profile-id)))) + (db/exec-one! conn ["select id, profile_id from http_session where id = ?" token]))) (defn- retrieve-from-request [{:keys [cookie-name] :as cfg} {:keys [cookies] :as request}] @@ -57,24 +65,33 @@ (defn- middleware [cfg handler] (fn [request] - (if-let [profile-id (retrieve-from-request cfg request)] - (do + (if-let [{:keys [id profile-id] :as session} (retrieve-from-request cfg request)] + (let [ech (::events-ch cfg)] + (a/>!! ech id) (update-thread-context! {:profile-id profile-id}) (handler (assoc request :profile-id profile-id))) (handler request)))) -;; --- STATE INIT +;; --- STATE INIT: SESSION + +(s/def ::cookie-name ::cfg/http-session-cookie-name) (defmethod ig/pre-init-spec ::session [_] - (s/keys :req-un [::db/pool])) + (s/keys :req-un [::db/pool] + :opt-un [::cookie-name])) (defmethod ig/prep-key ::session [_ cfg] - (merge {:cookie-name "auth-token"} cfg)) + (merge {:cookie-name "auth-token" + :buffer-size 64} + (d/without-nils cfg))) (defmethod ig/init-key ::session [_ {:keys [pool] :as cfg}] - (let [cfg (assoc cfg :conn pool)] + (let [events (a/chan (a/dropping-buffer (:buffer-size cfg))) + cfg (assoc cfg + :conn pool + ::events-ch events)] (-> cfg (assoc :middleware #(middleware cfg %)) (assoc :create (fn [profile-id] @@ -89,3 +106,113 @@ :body "" :cookies (cookies cfg {:value "" :max-age -1}))))))) +(defmethod ig/halt-key! ::session + [_ data] + (a/close! (::events-ch data))) + +;; --- STATE INIT: SESSION UPDATER + +(declare batch-events) +(declare update-sessions) + +(s/def ::session map?) +(s/def ::max-batch-age ::cfg/http-session-updater-batch-max-age) +(s/def ::max-batch-size ::cfg/http-session-updater-batch-max-size) + +(defmethod ig/pre-init-spec ::updater [_] + (s/keys :req-un [::db/pool ::wrk/executor ::mtx/metrics ::session] + :opt-un [::max-batch-age + ::max-batch-size])) + +(defmethod ig/prep-key ::updater + [_ cfg] + (merge {:max-batch-age (dt/duration {:minutes 5}) + :max-batch-size 200} + (d/without-nils cfg))) + +(defmethod ig/init-key ::updater + [_ {:keys [session metrics] :as cfg}] + (log/infof "initialize session updater (max-batch-age=%s, max-batch-size=%s)" + (str (:max-batch-age cfg)) + (str (:max-batch-size cfg))) + (let [input (batch-events cfg (::events-ch session)) + mcnt (mtx/create + {:name "http_session_updater_count" + :help "A counter of session update batch events." + :registry (:registry metrics) + :type :counter})] + (a/go-loop [] + (when-let [[reason batch] (a/! out [:timeout buf]) + (recur (timeout-chan cfg) #{}))) + + (nil? val) + (a/close! out) + + (identical? port in) + (let [buf (conj buf val)] + (if (>= (count buf) (:max-batch-size cfg)) + (do + (a/>! out [:size buf]) + (recur (timeout-chan cfg) #{})) + (recur tch buf)))))) + out)) + +(defn- update-sessions + [{:keys [pool executor]} ids] + (aa/with-thread executor + (db/exec-one! pool ["update http_session set updated_at=now() where id = ANY(?)" + (into-array String ids)]) + (count ids))) + +;; --- STATE INIT: SESSION GC + +(declare sql:delete-expired) + +(s/def ::max-age ::dt/duration) + +(defmethod ig/pre-init-spec ::gc-task [_] + (s/keys :req-un [::db/pool] + :opt-un [::max-age])) + +(defmethod ig/prep-key ::gc-task + [_ cfg] + (merge {:max-age (dt/duration {:days 2})} + (d/without-nils cfg))) + +(defmethod ig/init-key ::gc-task + [_ {:keys [pool max-age] :as cfg}] + (fn [_] + (db/with-atomic [conn pool] + (let [interval (db/interval max-age) + result (db/exec-one! conn [sql:delete-expired interval]) + result (:next.jdbc/update-count result)] + (log/debugf "gc-task: removed %s rows from http-session table" result) + result)))) + +(def ^:private + sql:delete-expired + "delete from http_session + where updated_at < now() - ?::interval") diff --git a/backend/src/app/main.clj b/backend/src/app/main.clj index 03483c38e..81765c89a 100644 --- a/backend/src/app/main.clj +++ b/backend/src/app/main.clj @@ -69,7 +69,19 @@ :app.http.session/session {:pool (ig/ref :app.db/pool) - :cookie-name "auth-token"} + :cookie-name (:http-session-cookie-name config)} + + :app.http.session/gc-task + {:pool (ig/ref :app.db/pool) + :max-age (:http-session-idle-max-age config)} + + :app.http.session/updater + {:pool (ig/ref :app.db/pool) + :metrics (ig/ref :app.metrics/metrics) + :executor (ig/ref :app.worker/executor) + :session (ig/ref :app.http.session/session) + :max-batch-age (:http-session-updater-batch-max-age config) + :max-batch-size (:http-session-updater-batch-max-size config)} :app.http.awsns/handler {:tokens (ig/ref :app.tokens/tokens) @@ -197,6 +209,10 @@ :cron #app/cron "0 0 2 */1 * ?" ;; daily (2 hour shift) :task :storage-touched-gc} + {:id "session-gc" + :cron #app/cron "0 0 3 */1 * ?" ;; daily (3 hour shift) + :task :session-gc} + {:id "storage-recheck" :cron #app/cron "0 0 */1 * * ?" ;; hourly :task :storage-recheck} @@ -223,7 +239,8 @@ :storage-touched-gc (ig/ref :app.storage/gc-touched-task) :storage-recheck (ig/ref :app.storage/recheck-task) :tasks-gc (ig/ref :app.tasks.tasks-gc/handler) - :telemetry (ig/ref :app.tasks.telemetry/handler)}} + :telemetry (ig/ref :app.tasks.telemetry/handler) + :session-gc (ig/ref :app.http.session/gc-task)}} :app.tasks.sendmail/handler {:host (:smtp-host config) diff --git a/backend/src/app/migrations.clj b/backend/src/app/migrations.clj index f124bebb9..9afa129bf 100644 --- a/backend/src/app/migrations.clj +++ b/backend/src/app/migrations.clj @@ -158,6 +158,8 @@ {:name "0048-mod-storage-tables" :fn (mg/resource "app/migrations/sql/0048-mod-storage-tables.sql")} + {:name "0049-mod-http-session-table" + :fn (mg/resource "app/migrations/sql/0049-mod-http-session-table.sql")} ]) diff --git a/backend/src/app/migrations/sql/0049-mod-http-session-table.sql b/backend/src/app/migrations/sql/0049-mod-http-session-table.sql new file mode 100644 index 000000000..4ee4657ab --- /dev/null +++ b/backend/src/app/migrations/sql/0049-mod-http-session-table.sql @@ -0,0 +1,6 @@ +ALTER TABLE http_session + ADD COLUMN updated_at timestamptz NULL; + +CREATE INDEX http_session__updated_at__idx + ON http_session (updated_at) + WHERE updated_at IS NOT NULL; From 5ce450f5783a00daa96e9c856f90af4423065b49 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 22 Feb 2021 12:51:53 +0100 Subject: [PATCH 44/90] :sparkles: Increase default database statement timeout. --- backend/src/app/db.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/app/db.clj b/backend/src/app/db.clj index de31d7a93..6b25433af 100644 --- a/backend/src/app/db.clj +++ b/backend/src/app/db.clj @@ -88,7 +88,7 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (def initsql - (str "SET statement_timeout = 60000;\n" + (str "SET statement_timeout = 120000;\n" "SET idle_in_transaction_session_timeout = 120000;")) (defn- create-datasource-config From 19f098359bbb4963d04fd8d52962f2968129fafa Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 22 Feb 2021 12:52:27 +0100 Subject: [PATCH 45/90] :tada: Add specific profile registration and activation metrics. --- backend/src/app/main.clj | 14 ++- backend/src/app/rpc/mutations/profile.clj | 107 +++++++++++------- .../src/app/rpc/mutations/verify_token.clj | 12 +- 3 files changed, 84 insertions(+), 49 deletions(-) diff --git a/backend/src/app/main.clj b/backend/src/app/main.clj index 81765c89a..83207bc93 100644 --- a/backend/src/app/main.clj +++ b/backend/src/app/main.clj @@ -37,11 +37,19 @@ :max-pool-size 20} :app.metrics/metrics - {} + {:definitions + {:profile-register + {:name "actions_profile_register_count" + :help "A global counter of user registrations." + :type :counter} + :profile-activation + {:name "actions_profile_activation_count" + :help "A global counter of profile activations" + :type :counter}}} :app.migrations/all - {:main (ig/ref :app.migrations/migrations) - :telemetry (ig/ref :app.telemetry/migrations)} + {:main (ig/ref :app.migrations/migrations) + :telemetry (ig/ref :app.telemetry/migrations)} :app.migrations/migrations {} diff --git a/backend/src/app/rpc/mutations/profile.clj b/backend/src/app/rpc/mutations/profile.clj index 2c63e6ef6..88c9611b7 100644 --- a/backend/src/app/rpc/mutations/profile.clj +++ b/backend/src/app/rpc/mutations/profile.clj @@ -26,7 +26,6 @@ [app.util.time :as dt] [buddy.hashers :as hashers] [clojure.spec.alpha :as s] - [clojure.tools.logging :as log] [cuerdas.core :as str])) ;; --- Helpers & Specs @@ -42,10 +41,12 @@ ;; --- Mutation: Register Profile +(declare annotate-profile-register) (declare check-profile-existence!) (declare create-profile) (declare create-profile-relations) (declare email-domain-in-whitelist?) +(declare register-profile) (s/def ::invitation-token ::us/not-empty-string) (s/def ::register-profile @@ -63,48 +64,64 @@ :code :email-domain-is-not-allowed)) (db/with-atomic [conn pool] - (check-profile-existence! conn params) - (let [profile (->> (create-profile conn params) - (create-profile-relations conn))] - (create-profile-initial-data conn profile) + (let [cfg (assoc cfg :conn conn)] + (register-profile cfg params)))) - (if-let [token (:invitation-token params)] - ;; If invitation token comes in params, this is because the - ;; user comes from team-invitation process; in this case, - ;; regenerate token and send back to the user a new invitation - ;; token (and mark current session as logged). - (let [claims (tokens :verify {:token token :iss :team-invitation}) - claims (assoc claims - :member-id (:id profile) - :member-email (:email profile)) - token (tokens :generate claims)] - (with-meta - {:invitation-token token} - {:transform-response ((:create session) (:id profile))})) +(defn- annotate-profile-register + "A helper for properly increase the profile-register metric once the + transaction is completed." + [metrics profile] + (fn [] + (when (::created profile) + ((get-in metrics [:definitions :profile-register]) :inc)))) - ;; If no token is provided, send a verification email - (let [vtoken (tokens :generate - {:iss :verify-email - :exp (dt/in-future "48h") - :profile-id (:id profile) - :email (:email profile)}) - ptoken (tokens :generate-predefined - {:iss :profile-identity - :profile-id (:id profile)})] +(defn- register-profile + [{:keys [conn tokens session metrics] :as cfg} params] + (check-profile-existence! conn params) + (let [profile (->> (create-profile conn params) + (create-profile-relations conn)) + profile (assoc profile ::created true)] + (create-profile-initial-data conn profile) - ;; Don't allow proceed in register page if the email is - ;; already reported as permanent bounced - (when (emails/has-bounce-reports? conn (:email profile)) - (ex/raise :type :validation - :code :email-has-permanent-bounces - :hint "looks like the email has one or many bounces reported")) + (if-let [token (:invitation-token params)] + ;; If invitation token comes in params, this is because the + ;; user comes from team-invitation process; in this case, + ;; regenerate token and send back to the user a new invitation + ;; token (and mark current session as logged). + (let [claims (tokens :verify {:token token :iss :team-invitation}) + claims (assoc claims + :member-id (:id profile) + :member-email (:email profile)) + token (tokens :generate claims) + resp {:invitation-token token}] + (with-meta resp + {:transform-response ((:create session) (:id profile)) + :before-complete (annotate-profile-register metrics profile)})) - (emails/send! conn emails/register - {:to (:email profile) - :name (:fullname profile) - :token vtoken - :extra-data ptoken}) - profile))))) + ;; If no token is provided, send a verification email + (let [vtoken (tokens :generate + {:iss :verify-email + :exp (dt/in-future "48h") + :profile-id (:id profile) + :email (:email profile)}) + ptoken (tokens :generate-predefined + {:iss :profile-identity + :profile-id (:id profile)})] + + ;; Don't allow proceed in register page if the email is + ;; already reported as permanent bounced + (when (emails/has-bounce-reports? conn (:email profile)) + (ex/raise :type :validation + :code :email-has-permanent-bounces + :hint "looks like the email has one or many bounces reported")) + + (emails/send! conn emails/register + {:to (:email profile) + :name (:fullname profile) + :token vtoken + :extra-data ptoken}) + (with-meta profile + {:before-complete (annotate-profile-register metrics profile)}))))) (defn email-domain-in-whitelist? "Returns true if email's domain is in the given whitelist or if given @@ -142,7 +159,7 @@ [attempt password] (try (hashers/verify attempt password) - (catch Exception e + (catch Exception _e {:update false :valid false}))) @@ -268,10 +285,12 @@ (s/keys :req-un [::email ::fullname ::backend])) (sv/defmethod ::login-or-register {:auth false} - [{:keys [pool] :as cfg} params] + [{:keys [pool metrics] :as cfg} params] (db/with-atomic [conn pool] - (-> (assoc cfg :conn conn) - (login-or-register params)))) + (let [profile (-> (assoc cfg :conn conn) + (login-or-register params))] + (with-meta profile + {:before-complete (annotate-profile-register metrics profile)})))) (defn login-or-register [{:keys [conn] :as cfg} {:keys [email backend] :as params}] @@ -293,7 +312,7 @@ (let [profile (->> (create-profile conn params) (create-profile-relations conn))] (create-profile-initial-data conn profile) - profile))] + (assoc profile ::created true)))] (let [profile (profile/retrieve-profile-data-by-email conn email) profile (if profile diff --git a/backend/src/app/rpc/mutations/verify_token.clj b/backend/src/app/rpc/mutations/verify_token.clj index 6a32bb7d4..4c7938e85 100644 --- a/backend/src/app/rpc/mutations/verify_token.clj +++ b/backend/src/app/rpc/mutations/verify_token.clj @@ -40,8 +40,15 @@ {:id profile-id}) claims) +(defn- annotate-profile-activation + "A helper for properly increase the profile-activation metric once the + transaction is completed." + [metrics] + (fn [] + ((get-in metrics [:definitions :profile-activation]) :inc))) + (defmethod process-token :verify-email - [{:keys [conn session] :as cfg} _params {:keys [profile-id] :as claims}] + [{:keys [conn session metrics] :as cfg} _ {:keys [profile-id] :as claims}] (let [profile (profile/retrieve-profile conn profile-id) claims (assoc claims :profile profile)] @@ -56,7 +63,8 @@ {:id (:id profile)})) (with-meta claims - {:transform-response ((:create session) profile-id)}))) + {:transform-response ((:create session) profile-id) + :before-complete (annotate-profile-activation metrics)}))) (defmethod process-token :auth [{:keys [conn] :as cfg} _params {:keys [profile-id] :as claims}] From 29addbe987c1133579cc0aaecb6c65f479325fce Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 22 Feb 2021 12:52:53 +0100 Subject: [PATCH 46/90] :sparkles: Change the metric type of rpc methods from summary to histogram. --- backend/src/app/rpc.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/app/rpc.clj b/backend/src/app/rpc.clj index 7f7237dad..af91b913e 100644 --- a/backend/src/app/rpc.clj +++ b/backend/src/app/rpc.clj @@ -105,7 +105,7 @@ {:name "rpc_query_timing" :labels ["name"] :registry (get-in cfg [:metrics :registry]) - :type :summary + :type :histogram :help "Timing of query services."}) cfg (assoc cfg ::mobj mobj)] (->> (sv/scan-ns 'app.rpc.queries.projects @@ -124,7 +124,7 @@ {:name "rpc_mutation_timing" :labels ["name"] :registry (get-in cfg [:metrics :registry]) - :type :summary + :type :histogram :help "Timing of mutation services."}) cfg (assoc cfg ::mobj mobj)] (->> (sv/scan-ns 'app.rpc.mutations.demo From 6e840a439ea84a21278233c091521b1e99fdd9b0 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 22 Feb 2021 12:53:25 +0100 Subject: [PATCH 47/90] :bug: Fix unexpected recursion error on logout. --- frontend/src/app/main/data/auth.cljs | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/app/main/data/auth.cljs b/frontend/src/app/main/data/auth.cljs index 483f00c30..b040a8d2c 100644 --- a/frontend/src/app/main/data/auth.cljs +++ b/frontend/src/app/main/data/auth.cljs @@ -90,6 +90,7 @@ ptk/WatchEvent (watch [_ state s] (->> (rp/mutation :logout) + (rx/catch (constantly (rx/empty))) (rx/ignore))) ptk/EffectEvent From e1161037a5c78a63fd642ede581668363df4c989 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 22 Feb 2021 14:13:27 +0100 Subject: [PATCH 48/90] :paperclip: Update changelog. --- CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 79dd23be6..d0fc67314 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,6 +7,7 @@ - Add major refactor of internal pubsub/redis code; improves scalability and performance [#640](https://github.com/penpot/penpot/pull/640) - Add optional loki integration [#645](https://github.com/penpot/penpot/pull/645) - Add emailcatcher and ldap test containers to devenv. [#506](https://github.com/penpot/penpot/pull/506) +- Add proper http session lifecycle handling. - Add more presets for artboard [#654](https://github.com/penpot/penpot/pull/654) - Bounce & Complaint handling [#635](https://github.com/penpot/penpot/pull/635) - Disable groups interactions when holding "Ctrl" key (deep selection) @@ -21,6 +22,7 @@ - Fix corner cases on invitation/signup flows. - Fix problem width handoff code generation [Taiga #1204](https://tree.taiga.io/project/penpot/issue/1204) - Fix problem with indices refreshing on page changes [#646](https://github.com/penpot/penpot/issues/646) +- Fix infinite recursion on logout. - Have language change notification written in the new language [Taiga #1205](https://tree.taiga.io/project/penpot/issue/1205) - Properly handle errors on github, gitlab and ldap auth backends. - Properly mark profile auth backend (on first register/ auth with 3rd party auth provider). From 002a6f1e52eed49a951d1e86a208fdcf75aa266d Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 22 Feb 2021 16:05:21 +0100 Subject: [PATCH 49/90] :paperclip: Fix missing log entries formating. --- backend/src/app/http.clj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/app/http.clj b/backend/src/app/http.clj index d6323b370..2e2a40dfe 100644 --- a/backend/src/app/http.clj +++ b/backend/src/app/http.clj @@ -42,7 +42,7 @@ (defmethod ig/init-key ::server [_ {:keys [handler ws port name metrics] :as opts}] - (log/infof "Starting %s server on port %s." name port) + (log/infof "starting '%s' server on port %s." name port) (let [pre-start (fn [^Server server] (let [handler (doto (ErrorHandler.) (.setShowStacks true) @@ -68,7 +68,7 @@ (defmethod ig/halt-key! ::server [_ {:keys [server name port] :as opts}] - (log/infof "Stoping %s server on port %s." name port) + (log/infof "stoping '%s' server on port %s." name port) (jetty/stop-server server)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -102,11 +102,11 @@ (try (let [cdata (errors/get-error-context request e)] (update-thread-context! cdata) - (log/errorf e "Unhandled exception: %s (id: %s)" (ex-message e) (str (:id cdata))) + (log/errorf e "unhandled exception: %s (id: %s)" (ex-message e) (str (:id cdata))) {:status 500 :body "internal server error"}) (catch Throwable e - (log/errorf e "Unhandled exception: %s" (ex-message e)) + (log/errorf e "unhandled exception: %s" (ex-message e)) {:status 500 :body "internal server error"}))))))) From 688d649c4aa615f6484fbd864e926731294c760e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Moya?= Date: Mon, 22 Feb 2021 17:11:51 +0100 Subject: [PATCH 50/90] :bug: Hide registration screen when registration is disabled --- CHANGES.md | 1 + docker/images/files/config.js | 1 + docker/images/files/nginx-entrypoint.sh | 11 +++++++++ frontend/resources/locales.json | 2 +- frontend/src/app/config.cljs | 31 ++++++++++++------------ frontend/src/app/main/ui.cljs | 6 +++-- frontend/src/app/main/ui/auth/login.cljs | 11 +++++---- 7 files changed, 40 insertions(+), 23 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index d0fc67314..67da4a1b4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -27,6 +27,7 @@ - Properly handle errors on github, gitlab and ldap auth backends. - Properly mark profile auth backend (on first register/ auth with 3rd party auth provider). - Refactor LDAP auth backend. +- Hide register screen when registration is disabled [#598](https://github.com/penpot/penpot/issues/598) ### :heart: Community contributions by (Thank you!) diff --git a/docker/images/files/config.js b/docker/images/files/config.js index 621108073..0ac491bbb 100644 --- a/docker/images/files/config.js +++ b/docker/images/files/config.js @@ -7,3 +7,4 @@ //var penpotGitlabClientID = ""; //var penpotGithubClientID = ""; //var penpotLoginWithLDAP = ; +//var penpotRegistrationEnabled = ; diff --git a/docker/images/files/nginx-entrypoint.sh b/docker/images/files/nginx-entrypoint.sh index 6c0a428f5..e99e69787 100644 --- a/docker/images/files/nginx-entrypoint.sh +++ b/docker/images/files/nginx-entrypoint.sh @@ -79,6 +79,16 @@ update_login_with_ldap() { fi } + +update_registration_enabled() { + if [ -n "$PENPOT_REGISTRATION_ENABLED" ]; then + log "Updating Registration Enabled: $PENPOT_REGISTRATION_ENABLED" + sed -i \ + -e "s|^//var penpotRegistrationEnabled = .*;|var penpotRegistrationEnabled = $PENPOT_REGISTRATION_ENABLED;|g" \ + "$1" + fi +} + update_public_uri /var/www/app/js/config.js update_demo_warning /var/www/app/js/config.js update_allow_demo_users /var/www/app/js/config.js @@ -86,5 +96,6 @@ update_google_client_id /var/www/app/js/config.js update_gitlab_client_id /var/www/app/js/config.js update_github_client_id /var/www/app/js/config.js update_login_with_ldap /var/www/app/js/config.js +update_registration_enabled /var/www/app/js/config.js exec "$@"; diff --git a/frontend/resources/locales.json b/frontend/resources/locales.json index 31d53c4c3..2ac41bc0c 100644 --- a/frontend/resources/locales.json +++ b/frontend/resources/locales.json @@ -34,7 +34,7 @@ "translations" : { "ca" : "Crea un compte de proba", "en" : "Create demo account", - "es" : "Crear cuanta de prueba", + "es" : "Crear cuenta de prueba", "fr" : "Créer un compte de démonstration", "ru" : "Хотите попробовать?", "zh_cn" : "创建演示账号" diff --git a/frontend/src/app/config.cljs b/frontend/src/app/config.cljs index 70e808686..be85ce6d2 100644 --- a/frontend/src/app/config.cljs +++ b/frontend/src/app/config.cljs @@ -66,23 +66,24 @@ (def default-theme "default") (def default-language "en") -(def demo-warning (obj/get global "penpotDemoWarning" false)) -(def feedback-enabled (obj/get global "penpotFeedbackEnabled" false)) -(def allow-demo-users (obj/get global "penpotAllowDemoUsers" true)) -(def google-client-id (obj/get global "penpotGoogleClientID" nil)) -(def gitlab-client-id (obj/get global "penpotGitlabClientID" nil)) -(def github-client-id (obj/get global "penpotGithubClientID" nil)) -(def login-with-ldap (obj/get global "penpotLoginWithLDAP" false)) -(def worker-uri (obj/get global "penpotWorkerURI" "/js/worker.js")) -(def translations (obj/get global "penpotTranslations")) -(def themes (obj/get global "penpotThemes")) +(def demo-warning (obj/get global "penpotDemoWarning" false)) +(def feedback-enabled (obj/get global "penpotFeedbackEnabled" false)) +(def allow-demo-users (obj/get global "penpotAllowDemoUsers" true)) +(def google-client-id (obj/get global "penpotGoogleClientID" nil)) +(def gitlab-client-id (obj/get global "penpotGitlabClientID" nil)) +(def github-client-id (obj/get global "penpotGithubClientID" nil)) +(def login-with-ldap (obj/get global "penpotLoginWithLDAP" false)) +(def registration-enabled (obj/get global "penpotRegistrationEnabled" true)) +(def worker-uri (obj/get global "penpotWorkerURI" "/js/worker.js")) +(def translations (obj/get global "penpotTranslations")) +(def themes (obj/get global "penpotThemes")) -(def public-uri (or (obj/get global "penpotPublicURI") (.-origin ^js location))) +(def public-uri (or (obj/get global "penpotPublicURI") (.-origin ^js location))) -(def version (delay (parse-version global))) -(def target (delay (parse-target global))) -(def browser (delay (parse-browser))) -(def platform (delay (parse-platform))) +(def version (delay (parse-version global))) +(def target (delay (parse-target global))) +(def browser (delay (parse-browser))) +(def platform (delay (parse-platform))) (when (= :browser @target) (js/console.log diff --git a/frontend/src/app/main/ui.cljs b/frontend/src/app/main/ui.cljs index 81ac15d54..fb5861ec0 100644 --- a/frontend/src/app/main/ui.cljs +++ b/frontend/src/app/main/ui.cljs @@ -60,8 +60,10 @@ (def routes [["/auth" ["/login" :auth-login] - ["/register" :auth-register] - ["/register/success" :auth-register-success] + (when cfg/registration-enabled + ["/register" :auth-register]) + (when cfg/registration-enabled + ["/register/success" :auth-register-success]) ["/recovery/request" :auth-recovery-request] ["/recovery" :auth-recovery] ["/verify-token" :auth-verify-token]] diff --git a/frontend/src/app/main/ui/auth/login.cljs b/frontend/src/app/main/ui/auth/login.cljs index 15b663531..db3b56cf7 100644 --- a/frontend/src/app/main/ui/auth/login.cljs +++ b/frontend/src/app/main/ui/auth/login.cljs @@ -145,11 +145,12 @@ :tab-index "5"} (tr "auth.forgot-password")]] - [:div.link-entry - [:span (tr "auth.register") " "] - [:a {:on-click #(st/emit! (rt/nav :auth-register {} params)) - :tab-index "6"} - (tr "auth.register-submit")]]] + (when cfg/registration-enabled + [:div.link-entry + [:span (tr "auth.register") " "] + [:a {:on-click #(st/emit! (rt/nav :auth-register {} params)) + :tab-index "6"} + (tr "auth.register-submit")]])] (when cfg/google-client-id [:a.btn-ocean.btn-large.btn-google-auth From d89bf772a638c22339bdf523e9b5cf63c2eb2e07 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 22 Feb 2021 19:10:05 +0100 Subject: [PATCH 51/90] :sparkles: Add debug messages on notifications module. --- backend/src/app/msgbus.clj | 2 ++ backend/src/app/notifications.clj | 3 +++ 2 files changed, 5 insertions(+) diff --git a/backend/src/app/msgbus.clj b/backend/src/app/msgbus.clj index ba38f76a3..791604ce3 100644 --- a/backend/src/app/msgbus.clj +++ b/backend/src/app/msgbus.clj @@ -64,6 +64,8 @@ sub-buff (a/chan 1) cch (a/chan 1)] + (log/debugf "initializing msgbus (uri: '%s')" (str uri)) + ;; Start the sending (publishing) loop (impl-publish-loop snd-conn snd-buff cch) diff --git a/backend/src/app/notifications.clj b/backend/src/app/notifications.clj index 61f198814..265b36e40 100644 --- a/backend/src/app/notifications.clj +++ b/backend/src/app/notifications.clj @@ -144,6 +144,7 @@ ws-send (mtx/wrap-counter ws-send mtx-messages ["send"])] (letfn [(on-connect [conn] + (log/debugf "on-connect %s" (:session-id cfg)) (mtx-aconn :inc) (let [sub (a/chan) ws (WebSocket. conn in out sub nil cfg)] @@ -164,12 +165,14 @@ (a/close! sub)))) (on-error [_conn _e] + (log/debugf "on-error %s" (:session-id cfg)) (mtx-aconn :dec) (mtx-sessions :observe (/ (inst-ms (dt/duration-between created-at (dt/now))) 1000.0)) (a/close! out) (a/close! in)) (on-close [_conn _status _reason] + (log/debugf "on-close %s" (:session-id cfg)) (mtx-aconn :dec) (mtx-sessions :observe (/ (inst-ms (dt/duration-between created-at (dt/now))) 1000.0)) (a/close! out) From b14c98b76e71e41705792e474b4b64587772f13f Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 22 Feb 2021 22:11:24 +0100 Subject: [PATCH 52/90] :arrow_down: Downgrade redis client version. --- backend/deps.edn | 2 +- backend/src/app/notifications.clj | 1 - docker/devenv/docker-compose.yaml | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/deps.edn b/backend/deps.edn index 7220b11b3..9704c2240 100644 --- a/backend/deps.edn +++ b/backend/deps.edn @@ -34,7 +34,7 @@ expound/expound {:mvn/version "0.8.7"} com.cognitect/transit-clj {:mvn/version "1.0.324"} - io.lettuce/lettuce-core {:mvn/version "6.1.0.M1"} + io.lettuce/lettuce-core {:mvn/version "6.0.2.RELEASE"} java-http-clj/java-http-clj {:mvn/version "0.4.1"} info.sunng/ring-jetty9-adapter {:mvn/version "0.14.2"} diff --git a/backend/src/app/notifications.clj b/backend/src/app/notifications.clj index 265b36e40..6dae8dab7 100644 --- a/backend/src/app/notifications.clj +++ b/backend/src/app/notifications.clj @@ -114,7 +114,6 @@ [conn id] (db/exec-one! conn [sql:retrieve-file id])) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; WebSocket Http Handler ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/docker/devenv/docker-compose.yaml b/docker/devenv/docker-compose.yaml index 789ee0cc2..bc384ebf9 100644 --- a/docker/devenv/docker-compose.yaml +++ b/docker/devenv/docker-compose.yaml @@ -84,7 +84,7 @@ services: - postgres_data:/var/lib/postgresql/data redis: - image: redis:6 + image: redis:5.0.7 hostname: "penpot-devenv-redis" container_name: "penpot-devenv-redis" restart: always From ca1a97a52e527421d40a3ebe563415ac245d7a6b Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 22 Feb 2021 23:14:53 +0100 Subject: [PATCH 53/90] :sparkles: Improve backpressure handling on websocket connection. --- backend/src/app/main.clj | 9 +++--- backend/src/app/msgbus.clj | 49 ++++++++++++++++--------------- backend/src/app/notifications.clj | 29 ++++++++++-------- 3 files changed, 47 insertions(+), 40 deletions(-) diff --git a/backend/src/app/main.clj b/backend/src/app/main.clj index 83207bc93..f93d787f4 100644 --- a/backend/src/app/main.clj +++ b/backend/src/app/main.clj @@ -183,10 +183,11 @@ :svgc (ig/ref :app.svgparse/svgc)} :app.notifications/handler - {:msgbus (ig/ref :app.msgbus/msgbus) - :pool (ig/ref :app.db/pool) - :session (ig/ref :app.http.session/session) - :metrics (ig/ref :app.metrics/metrics)} + {:msgbus (ig/ref :app.msgbus/msgbus) + :pool (ig/ref :app.db/pool) + :session (ig/ref :app.http.session/session) + :metrics (ig/ref :app.metrics/metrics) + :executor (ig/ref :app.worker/executor)} :app.worker/executor {:name "worker"} diff --git a/backend/src/app/msgbus.clj b/backend/src/app/msgbus.clj index 791604ce3..9aca801a3 100644 --- a/backend/src/app/msgbus.clj +++ b/backend/src/app/msgbus.clj @@ -12,12 +12,14 @@ (:require [app.common.spec :as us] [app.util.blob :as blob] + [app.util.time :as dt] [clojure.core.async :as a] [clojure.spec.alpha :as s] [clojure.tools.logging :as log] [integrant.core :as ig] [promesa.core :as p]) (:import + java.time.Duration io.lettuce.core.RedisClient io.lettuce.core.RedisURI io.lettuce.core.api.StatefulRedisConnection @@ -59,15 +61,18 @@ snd-conn (.connect ^RedisClient rclient ^RedisCodec codec) rcv-conn (.connectPubSub ^RedisClient rclient ^RedisCodec codec) - snd-buff (a/chan (a/sliding-buffer buffer-size)) + pub-buff (a/chan (a/sliding-buffer buffer-size)) rcv-buff (a/chan (a/sliding-buffer buffer-size)) sub-buff (a/chan 1) cch (a/chan 1)] + (.setTimeout ^StatefulRedisConnection snd-conn ^Duration (dt/duration {:seconds 10})) + (.setTimeout ^StatefulRedisPubSubConnection rcv-conn ^Duration (dt/duration {:seconds 10})) + (log/debugf "initializing msgbus (uri: '%s')" (str uri)) ;; Start the sending (publishing) loop - (impl-publish-loop snd-conn snd-buff cch) + (impl-publish-loop snd-conn pub-buff cch) ;; Start the receiving (subscribing) loop (impl-subscribe-loop rcv-conn rcv-buff sub-buff cch) @@ -78,13 +83,13 @@ ([command params] (a/go (case command - :pub (a/>! snd-buff params) + :pub (a/>! pub-buff params) :sub (a/>! sub-buff params))))) {::snd-conn snd-conn ::rcv-conn rcv-conn ::cch cch - ::snd-buff snd-buff + ::pub-buff pub-buff ::rcv-buff rcv-buff}))) (defmethod ig/halt-key! ::msgbus @@ -93,25 +98,14 @@ (.close ^StatefulRedisConnection (::snd-conn mdata)) (.close ^StatefulRedisPubSubConnection (::rcv-conn mdata)) (a/close! (::cch mdata)) - (a/close! (::snd-buff mdata)) + (a/close! (::pub-buff mdata)) (a/close! (::rcv-buff mdata)))) -(defn- impl-redis-pub - [rac {:keys [topic message]}] - (let [topic (str topic) - message (blob/encode message) - res (a/chan 1)] - (-> (.publish ^RedisAsyncCommands rac ^String topic ^bytes message) - (p/finally (fn [_ e] - (when e (a/>!! res e)) - (a/close! res)))) - res)) - (defn- impl-publish-loop - [conn in-buff cch] + [conn rcv-buff cch] (let [rac (.async ^StatefulRedisConnection conn)] (a/go-loop [] - (let [[val _] (a/alts! [in-buff cch])] + (let [[val _] (a/alts! [rcv-buff cch])] (when (some? val) (let [result (a/!! rcv-buff {:topic topic :message (blob/decode message)})) (psubscribed [it pattern count]) (punsubscribed [it pattern count]) (subscribed [it topic count]) (unsubscribed [it topic count]))) (a/go-loop [chans {}] - (let [[val port] (a/alts! [sub-buff cch in-buff] :priority true)] + (let [[val port] (a/alts! [sub-buff cch rcv-buff] :priority true)] (cond ;; Stop condition; just do nothing (= port cch) @@ -150,7 +144,7 @@ ;; This means we receive data from redis and we need to ;; forward it to the underlying subscriptions. - (= port in-buff) + (= port rcv-buff) (let [topic (:topic val) pending (loop [chans (seq (get chans topic)) pending #{}] @@ -164,6 +158,16 @@ (a/ (.publish ^RedisAsyncCommands rac ^String topic ^bytes message) + (p/finally (fn [_ e] + (when e (a/>!! res e)) + (a/close! res)))) + res)) (defn impl-redis-sub [conn topic] @@ -175,7 +179,6 @@ (a/close! res)))) res)) - (defn impl-redis-unsub [conn topic] (let [^RedisPubSubAsyncCommands cmd (.async ^StatefulRedisPubSubConnection conn) diff --git a/backend/src/app/notifications.clj b/backend/src/app/notifications.clj index 6dae8dab7..36daf02e6 100644 --- a/backend/src/app/notifications.clj +++ b/backend/src/app/notifications.clj @@ -16,6 +16,7 @@ [app.util.async :as aa] [app.util.time :as dt] [app.util.transit :as t] + [app.worker :as wrk] [clojure.core.async :as a] [clojure.spec.alpha :as s] [clojure.tools.logging :as log] @@ -39,7 +40,7 @@ (s/def ::msgbus fn?) (defmethod ig/pre-init-spec ::handler [_] - (s/keys :req-un [::msgbus ::db/pool ::session ::mtx/metrics])) + (s/keys :req-un [::msgbus ::db/pool ::session ::mtx/metrics ::wrk/executor])) (defmethod ig/init-key ::handler [_ {:keys [session metrics] :as cfg}] @@ -132,20 +133,22 @@ false))) (defn websocket - [{:keys [file-id team-id msgbus] :as cfg}] - (let [in (a/chan 32) - out (a/chan 32) + [{:keys [file-id team-id msgbus executor] :as cfg}] + (let [in (a/chan (a/dropping-buffer 64)) + out (a/chan (a/dropping-buffer 64)) mtx-aconn (:mtx-active-connections cfg) mtx-messages (:mtx-messages cfg) mtx-sessions (:mtx-sessions cfg) created-at (dt/now) - ws-send (mtx/wrap-counter ws-send mtx-messages ["send"])] (letfn [(on-connect [conn] (log/debugf "on-connect %s" (:session-id cfg)) (mtx-aconn :inc) - (let [sub (a/chan) + ;; A subscription channel should use a lossy buffer + ;; because we can't penalize normal clients when one + ;; slow client is connected to the room. + (let [sub (a/chan (a/dropping-buffer 64)) ws (WebSocket. conn in out sub nil cfg)] ;; Subscribe to corresponding topics @@ -155,8 +158,8 @@ ;; message forwarding loop (a/go-loop [] (let [val (a/ Date: Mon, 22 Feb 2021 23:40:42 +0100 Subject: [PATCH 54/90] :sparkles: Add more logging to msgbus module. --- backend/src/app/msgbus.clj | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/backend/src/app/msgbus.clj b/backend/src/app/msgbus.clj index 9aca801a3..22d36d834 100644 --- a/backend/src/app/msgbus.clj +++ b/backend/src/app/msgbus.clj @@ -10,6 +10,7 @@ (ns app.msgbus "The msgbus abstraction implemented using redis as underlying backend." (:require + [app.common.exceptions :as ex] [app.common.spec :as us] [app.util.blob :as blob] [app.util.time :as dt] @@ -61,8 +62,8 @@ snd-conn (.connect ^RedisClient rclient ^RedisCodec codec) rcv-conn (.connectPubSub ^RedisClient rclient ^RedisCodec codec) - pub-buff (a/chan (a/sliding-buffer buffer-size)) - rcv-buff (a/chan (a/sliding-buffer buffer-size)) + pub-buff (a/chan (a/dropping-buffer buffer-size)) + rcv-buff (a/chan (a/dropping-buffer buffer-size)) sub-buff (a/chan 1) cch (a/chan 1)] @@ -102,15 +103,15 @@ (a/close! (::rcv-buff mdata)))) (defn- impl-publish-loop - [conn rcv-buff cch] + [conn pub-buff cch] (let [rac (.async ^StatefulRedisConnection conn)] (a/go-loop [] - (let [[val _] (a/alts! [rcv-buff cch])] + (let [[val _] (a/alts! [cch pub-buff] :priority true)] (when (some? val) (let [result (a/ Date: Mon, 22 Feb 2021 23:55:06 +0100 Subject: [PATCH 55/90] :books: Minor update on issue template. --- .github/ISSUE_TEMPLATE/bug_report.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 1254a84a6..d0d0ea12b 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -38,13 +38,13 @@ If applicable, add screenshots to help explain your problem. - Version (e.g. 22) **Environment (please complete the following information):** -Specify if using demo instance or self-hosted instance. +Specify if using SAAS (https://design.penpot.app) or self-hosted instance. If self-hosted instance, add OS and runtime information to help explain your problem. - OS Version: (e.g. Ubuntu 16.04) -Also provide Docker commands or docker-compose file if possible. +Also provide Docker commands or docker-compose file if possible and if proceed.x - Docker / Docker-compose Version: (e.g. Docker version 18.03.0-ce, build 0520e24) - Image (e.g. alpine) From 8fd37dbad5f7503eba1aeb7adaa23628dd843aa8 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Tue, 23 Feb 2021 10:12:36 +0100 Subject: [PATCH 56/90] :bug: Fixes shortcut typo --- frontend/src/app/main/data/workspace/shortcuts.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/main/data/workspace/shortcuts.cljs b/frontend/src/app/main/data/workspace/shortcuts.cljs index 33100459d..cefc68be7 100644 --- a/frontend/src/app/main/data/workspace/shortcuts.cljs +++ b/frontend/src/app/main/data/workspace/shortcuts.cljs @@ -112,7 +112,7 @@ :command "shift+v" :fn #(st/emit! (dw/flip-vertical-selected))} - :flip-horizontal {:tooltip (ds/shift "V") + :flip-horizontal {:tooltip (ds/shift "H") :command "shift+h" :fn #(st/emit! (dw/flip-horizontal-selected))} From 7e1ee087d3a5df4a224ab5133772f4a6f21120e6 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 23 Feb 2021 13:17:01 +0100 Subject: [PATCH 57/90] :sparkles: Improve msgbus subscription handling. --- backend/resources/log4j2.xml | 6 +- backend/src/app/msgbus.clj | 151 +++++++++++++++++++--------- backend/src/app/notifications.clj | 158 +++++++++++++++++------------- backend/src/app/util/async.clj | 3 +- 4 files changed, 194 insertions(+), 124 deletions(-) diff --git a/backend/resources/log4j2.xml b/backend/resources/log4j2.xml index a490272d0..5b2a91a2a 100644 --- a/backend/resources/log4j2.xml +++ b/backend/resources/log4j2.xml @@ -32,9 +32,9 @@ - - - + + + diff --git a/backend/src/app/msgbus.clj b/backend/src/app/msgbus.clj index 22d36d834..b1e13d164 100644 --- a/backend/src/app/msgbus.clj +++ b/backend/src/app/msgbus.clj @@ -62,9 +62,14 @@ snd-conn (.connect ^RedisClient rclient ^RedisCodec codec) rcv-conn (.connectPubSub ^RedisClient rclient ^RedisCodec codec) - pub-buff (a/chan (a/dropping-buffer buffer-size)) - rcv-buff (a/chan (a/dropping-buffer buffer-size)) - sub-buff (a/chan 1) + ;; Channel used for receive publications from the application. + pub-chan (a/chan (a/dropping-buffer buffer-size)) + + ;; Channel used for receive data from redis + rcv-chan (a/chan (a/dropping-buffer buffer-size)) + + ;; Channel used for receive subscription requests. + sub-chan (a/chan) cch (a/chan 1)] (.setTimeout ^StatefulRedisConnection snd-conn ^Duration (dt/duration {:seconds 10})) @@ -73,10 +78,10 @@ (log/debugf "initializing msgbus (uri: '%s')" (str uri)) ;; Start the sending (publishing) loop - (impl-publish-loop snd-conn pub-buff cch) + (impl-publish-loop snd-conn pub-chan cch) ;; Start the receiving (subscribing) loop - (impl-subscribe-loop rcv-conn rcv-buff sub-buff cch) + (impl-subscribe-loop rcv-conn rcv-chan sub-chan cch) (with-meta (fn run @@ -84,14 +89,14 @@ ([command params] (a/go (case command - :pub (a/>! pub-buff params) - :sub (a/>! sub-buff params))))) + :pub (a/>! pub-chan params) + :sub (a/>! sub-chan params))))) {::snd-conn snd-conn ::rcv-conn rcv-conn ::cch cch - ::pub-buff pub-buff - ::rcv-buff rcv-buff}))) + ::pub-chan pub-chan + ::rcv-chan rcv-chan}))) (defmethod ig/halt-key! ::msgbus [_ f] @@ -99,14 +104,14 @@ (.close ^StatefulRedisConnection (::snd-conn mdata)) (.close ^StatefulRedisPubSubConnection (::rcv-conn mdata)) (a/close! (::cch mdata)) - (a/close! (::pub-buff mdata)) - (a/close! (::rcv-buff mdata)))) + (a/close! (::pub-chan mdata)) + (a/close! (::rcv-chan mdata)))) (defn- impl-publish-loop - [conn pub-buff cch] + [conn pub-chan cch] (let [rac (.async ^StatefulRedisConnection conn)] (a/go-loop [] - (let [[val _] (a/alts! [cch pub-buff] :priority true)] + (let [[val _] (a/alts! [cch pub-chan] :priority true)] (when (some? val) (let [result (a/!! rcv-buff {:topic topic :message (blob/decode message)})) + (let [val {:topic topic :message (blob/decode message)}] + (when-not (a/offer! rcv-chan val) + (log/warn "dropping message on subscription loop")))) (psubscribed [it pattern count]) (punsubscribed [it pattern count]) (subscribed [it topic count]) (unsubscribed [it topic count]))) - (a/go-loop [chans {}] - (let [[val port] (a/alts! [sub-buff cch rcv-buff] :priority true)] - (cond - ;; Stop condition; just do nothing - (= port cch) - nil + (let [chans (agent {} :error-handler #(log/error % "unexpected error on agent")) - ;; If we receive a message on sub-buff this means that a new - ;; subscription is requested by the notifications module. - (= port sub-buff) - (let [topic (:topic val) - output (:chan val) - chans (update chans topic (fnil conj #{}) output)] - (when (= 1 (count (get chans topic))) - (let [result (a/! ch (:message val)) - (recur (rest chans) pending) - (recur (rest chans) (conj pending ch))) - pending)) - chans (update chans topic #(reduce disj % pending))] - (when (empty? (get chans topic)) - (let [result (a/> (vals state) + (mapcat identity) + (filter some?) + (run! a/close!)))) + + ;; This means we receive data from redis and we need to + ;; forward it to the underlying subscriptions. + (= port rcv-chan) + (let [topic (:topic val) ; topic is already string + pending (loop [chans (seq (get-in @chans [:topics topic])) + pending #{}] + (if-let [ch (first chans)] + (if (a/>! ch (:message val)) + (recur (rest chans) pending) + (recur (rest chans) (conj pending ch))) + pending))] + ;; (log/tracef "received message => pending: %s" (pr-str pending)) + (some->> (seq pending) + (send-off chans unsubscribe-channels)) + + (recur))))))) (defn- impl-redis-pub [rac {:keys [topic message]}] diff --git a/backend/src/app/notifications.clj b/backend/src/app/notifications.clj index 36daf02e6..82ccd23d1 100644 --- a/backend/src/app/notifications.clj +++ b/backend/src/app/notifications.clj @@ -115,14 +115,11 @@ [conn id] (db/exec-one! conn [sql:retrieve-file id])) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; WebSocket Http Handler -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +;; --- WEBSOCKET INIT (declare handle-connect) -(defrecord WebSocket [conn in out sub]) - (defn- ws-send [conn data] (try @@ -134,8 +131,8 @@ (defn websocket [{:keys [file-id team-id msgbus executor] :as cfg}] - (let [in (a/chan (a/dropping-buffer 64)) - out (a/chan (a/dropping-buffer 64)) + (let [rcv-ch (a/chan 32) + out-ch (a/chan 32) mtx-aconn (:mtx-active-connections cfg) mtx-messages (:mtx-messages cfg) mtx-sessions (:mtx-sessions cfg) @@ -143,46 +140,51 @@ ws-send (mtx/wrap-counter ws-send mtx-messages ["send"])] (letfn [(on-connect [conn] - (log/debugf "on-connect %s" (:session-id cfg)) (mtx-aconn :inc) ;; A subscription channel should use a lossy buffer ;; because we can't penalize normal clients when one ;; slow client is connected to the room. - (let [sub (a/chan (a/dropping-buffer 64)) - ws (WebSocket. conn in out sub nil cfg)] + (let [sub-ch (a/chan (a/dropping-buffer 128)) + cfg (assoc cfg + :conn conn + :rcv-ch rcv-ch + :out-ch out-ch + :sub-ch sub-ch)] - ;; Subscribe to corresponding topics - (a/!! in message)))] + (when-not (a/offer! rcv-ch message) + (log/warn "droping ws input message, channe full"))))] {:on-connect on-connect :on-error on-error @@ -190,16 +192,18 @@ :on-text (mtx/wrap-counter on-message mtx-messages ["recv"]) :on-bytes (constantly nil)}))) +;; --- CONNECTION INIT + (declare handle-message) (declare start-loop!) (defn- handle-connect - [{:keys [conn] :as ws}] + [{:keys [conn] :as cfg}] (a/go (try - (aa/! out val)) + (a/>! out-ch val)) (recur)) - ;; Timeout channel signaling + ;; When timeout channel is signaled, we need to send a ping + ;; message to the output channel. TODO: we need to make this + ;; more smart. (= port timeout) (do - (a/>! out {:type :ping}) + (a/>! out-ch {:type :ping}) (recur)) :else nil))))) -;; Incoming Messages Handling +;; --- PRESENCE HANDLING API (def ^:private sql:retrieve-presence @@ -244,12 +251,6 @@ where file_id=? and (clock_timestamp() - updated_at) < '5 min'::interval") -(defn- retrieve-presence - [pool file-id] - (aa/thread-try - (let [rows (db/exec! pool [sql:retrieve-presence file-id])] - (mapv (juxt :session-id :profile-id) rows)))) - (def ^:private sql:update-presence "insert into presence (file_id, session_id, profile_id, updated_at) @@ -257,49 +258,66 @@ on conflict (file_id, session_id, profile_id) do update set updated_at=clock_timestamp()") +(defn- retrieve-presence + [{:keys [pool file-id] :as cfg}] + (let [rows (db/exec! pool [sql:retrieve-presence file-id])] + (mapv (juxt :session-id :profile-id) rows))) + +(defn- retrieve-presence* + [{:keys [executor] :as cfg}] + (aa/with-thread executor + (retrieve-presence cfg))) + (defn- update-presence - [conn file-id session-id profile-id] - (aa/thread-try - (let [sql [sql:update-presence file-id session-id profile-id]] - (db/exec-one! conn sql)))) + [{:keys [pool file-id session-id profile-id] :as cfg}] + (let [sql [sql:update-presence file-id session-id profile-id]] + (db/exec-one! pool sql))) + +(defn- update-presence* + [{:keys [executor] :as cfg}] + (aa/with-thread executor + (update-presence cfg))) (defn- delete-presence - [pool file-id session-id profile-id] - (aa/thread-try - (db/delete! pool :presence {:file-id file-id - :profile-id profile-id - :session-id session-id}))) + [{:keys [pool file-id session-id profile-id] :as cfg}] + (db/delete! pool :presence {:file-id file-id + :profile-id profile-id + :session-id session-id})) + +(defn- delete-presence* + [{:keys [executor] :as cfg}] + (aa/with-thread executor + (delete-presence cfg))) + +;; --- INCOMING MSG PROCESSING (defmulti handle-message (fn [_ message] (:type message))) -;; TODO: check permissions for join a file-id channel (probably using -;; single use token for avoid explicit database query). - (defmethod handle-message :connect - [{:keys [file-id profile-id session-id pool msgbus] :as ws} _message] + [{:keys [file-id msgbus] :as cfg} _message] ;; (log/debugf "profile '%s' is connected to file '%s'" profile-id file-id) (aa/go-try - (aa/!! c ret))) + (when (some? ret) (a/>!! c ret))) (finally (a/close! c))))) c From 2eea63dd1a73667363ed75cb19323f9a937b2f76 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 23 Feb 2021 14:34:12 +0100 Subject: [PATCH 58/90] :sparkles: Change validation order on password recovery request mutation. --- backend/src/app/rpc/mutations/profile.clj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/backend/src/app/rpc/mutations/profile.clj b/backend/src/app/rpc/mutations/profile.clj index 88c9611b7..b54933a42 100644 --- a/backend/src/app/rpc/mutations/profile.clj +++ b/backend/src/app/rpc/mutations/profile.clj @@ -466,16 +466,16 @@ (db/with-atomic [conn pool] (when-let [profile (profile/retrieve-profile-data-by-email conn email)] - (when-not (:is-active profile) - (ex/raise :type :validation - :code :profile-not-verified - :hint "the user need to validate profile before recover password")) - (when-not (emails/allow-send-emails? conn profile) (ex/raise :type :validation :code :profile-is-muted :hint "looks like the profile has reported repeatedly as spam or has permanent bounces.")) + (when-not (:is-active profile) + (ex/raise :type :validation + :code :profile-not-verified + :hint "the user need to validate profile before recover password")) + (when (emails/has-bounce-reports? conn (:email profile)) (ex/raise :type :validation :code :email-has-permanent-bounces From c7795640e129ffc3328ee2bb2a8201ec7f3218af Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 23 Feb 2021 14:56:24 +0100 Subject: [PATCH 59/90] :paperclip: Minor log level change on session updater task. --- backend/src/app/http/session.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/app/http/session.clj b/backend/src/app/http/session.clj index bb5afecc5..0c047b310 100644 --- a/backend/src/app/http/session.clj +++ b/backend/src/app/http/session.clj @@ -147,7 +147,7 @@ (mcnt :inc) (if (ex/exception? result) (log/error result "updater: unexpected error on update sessions") - (log/debugf "updater: updated %s sessions (reason: %s)." result (name reason))) + (log/tracef "updater: updated %s sessions (reason: %s)." result (name reason))) (recur)))))) (defn- timeout-chan From 65eb8e7c43d657fbf6855c9119fc973acecdee52 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 23 Feb 2021 15:10:23 +0100 Subject: [PATCH 60/90] :sparkles: Minor changes on logging config files. --- backend/resources/log4j2-bundle.xml | 13 ++++--------- backend/resources/log4j2.xml | 13 +++++++------ backend/src/app/http/awsns.clj | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/backend/resources/log4j2-bundle.xml b/backend/resources/log4j2-bundle.xml index 7f6a243ab..8ebe2de44 100644 --- a/backend/resources/log4j2-bundle.xml +++ b/backend/resources/log4j2-bundle.xml @@ -7,20 +7,15 @@ - - - - - - - + + - + - + diff --git a/backend/resources/log4j2.xml b/backend/resources/log4j2.xml index 5b2a91a2a..03371fc15 100644 --- a/backend/resources/log4j2.xml +++ b/backend/resources/log4j2.xml @@ -20,9 +20,10 @@ - - - + + + + @@ -34,11 +35,11 @@ - + - - + + diff --git a/backend/src/app/http/awsns.clj b/backend/src/app/http/awsns.clj index 8a776477d..ea47131ce 100644 --- a/backend/src/app/http/awsns.clj +++ b/backend/src/app/http/awsns.clj @@ -184,7 +184,7 @@ (defn- process-report [cfg {:keys [type profile-id] :as report}] - (log/debug (str "procesing report:\n" (pprint-report report))) + (log/trace (str "procesing report:\n" (pprint-report report))) (cond ;; In this case we receive a bounce/complaint notification without ;; confirmed identity, we just emit a warning but do nothing about From f9b24bd01c43261c02eda61312ef08954ed43f06 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 23 Feb 2021 15:13:54 +0100 Subject: [PATCH 61/90] :sparkles: More improvements to logging config. --- backend/resources/log4j2.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backend/resources/log4j2.xml b/backend/resources/log4j2.xml index 03371fc15..acfa8c7a9 100644 --- a/backend/resources/log4j2.xml +++ b/backend/resources/log4j2.xml @@ -20,7 +20,6 @@ - @@ -33,7 +32,7 @@ - + From 0ea2951515c8e007f49024e2dc5745d41ffc2a52 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 24 Feb 2021 10:36:25 +0100 Subject: [PATCH 62/90] :paperclip update changelog. --- CHANGES.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 67da4a1b4..390056fda 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,15 @@ ### :sparkles: New features +### :bug: Bugs fixed + +### :heart: Community contributions by (Thank you!) + + +## 1.3.0-alpha + +### :sparkles: New features + - Add major refactor of internal pubsub/redis code; improves scalability and performance [#640](https://github.com/penpot/penpot/pull/640) - Add optional loki integration [#645](https://github.com/penpot/penpot/pull/645) - Add emailcatcher and ldap test containers to devenv. [#506](https://github.com/penpot/penpot/pull/506) From 3171d9d64d9fc3440ab7a1af7d56db1c280b8386 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 24 Feb 2021 10:48:19 +0100 Subject: [PATCH 63/90] :paperclip: Add missing entries on changelog. --- CHANGES.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 390056fda..7d93daffb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,30 +13,31 @@ ### :sparkles: New features -- Add major refactor of internal pubsub/redis code; improves scalability and performance [#640](https://github.com/penpot/penpot/pull/640) -- Add optional loki integration [#645](https://github.com/penpot/penpot/pull/645) - Add emailcatcher and ldap test containers to devenv. [#506](https://github.com/penpot/penpot/pull/506) -- Add proper http session lifecycle handling. +- Add major refactor of internal pubsub/redis code; improves scalability and performance [#640](https://github.com/penpot/penpot/pull/640) - Add more presets for artboard [#654](https://github.com/penpot/penpot/pull/654) +- Add optional loki integration [#645](https://github.com/penpot/penpot/pull/645) +- Add proper http session lifecycle handling. +- Allow to set border radius of each rect corner individually - Bounce & Complaint handling [#635](https://github.com/penpot/penpot/pull/635) - Disable groups interactions when holding "Ctrl" key (deep selection) - New action in context menu to "edit" some shapes (binded to key "Enter") -- Allow to set border radius of each rect corner individually ### :bug: Bugs fixed - Add more improvements to french translation strings [#591](https://github.com/penpot/penpot/pull/591) - Add some missing database indexes (mainly improves performance on large databases on file-update rpc method, and some background tasks). +- Fix broken bounding box on editing paths [Taiga #1254](https://tree.taiga.io/project/penpot/issue/1254) - Fix corner cases on invitation/signup flows. +- Fix infinite recursion on logout. - Fix problem width handoff code generation [Taiga #1204](https://tree.taiga.io/project/penpot/issue/1204) - Fix problem with indices refreshing on page changes [#646](https://github.com/penpot/penpot/issues/646) -- Fix infinite recursion on logout. - Have language change notification written in the new language [Taiga #1205](https://tree.taiga.io/project/penpot/issue/1205) +- Hide register screen when registration is disabled [#598](https://github.com/penpot/penpot/issues/598) - Properly handle errors on github, gitlab and ldap auth backends. - Properly mark profile auth backend (on first register/ auth with 3rd party auth provider). - Refactor LDAP auth backend. -- Hide register screen when registration is disabled [#598](https://github.com/penpot/penpot/issues/598) ### :heart: Community contributions by (Thank you!) From d517daa0452db1fb1ce6f133e7bc59543cde7801 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Wed, 24 Feb 2021 12:29:38 +0100 Subject: [PATCH 64/90] :bug: Fixes problems with line paths --- common/app/common/pages/common.cljc | 2 +- common/app/common/pages/migrations.cljc | 29 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/common/app/common/pages/common.cljc b/common/app/common/pages/common.cljc index eb5a9572e..784896e3b 100644 --- a/common/app/common/pages/common.cljc +++ b/common/app/common/pages/common.cljc @@ -11,7 +11,7 @@ (:require [app.common.uuid :as uuid])) -(def file-version 5) +(def file-version 6) (def default-color "#b1b2b5") ;; $color-gray-20 (def root uuid/zero) diff --git a/common/app/common/pages/migrations.cljc b/common/app/common/pages/migrations.cljc index c2f170a01..28aa8682e 100644 --- a/common/app/common/pages/migrations.cljc +++ b/common/app/common/pages/migrations.cljc @@ -13,6 +13,7 @@ [app.common.geom.shapes :as gsh] [app.common.geom.shapes.path :as gsp] [app.common.geom.matrix :as gmt] + [app.common.math :as mth] [app.common.uuid :as uuid] [app.common.data :as d])) @@ -137,3 +138,31 @@ (update data :pages-index #(d/mapm update-page %)))) +(defn fix-line-paths + "Fixes issues with selrect/points for shapes with width/height = 0 (line-like paths)" + [_ shape] + (if (= (:type shape) :path) + (let [{:keys [width height]} (gsh/points->rect (:points shape))] + (if (or (mth/almost-zero? width) (mth/almost-zero? height)) + (let [selrect (gsh/content->selrect (:content shape)) + points (gsh/rect->points selrect) + transform (gmt/matrix) + transform-inv (gmt/matrix)] + (assoc shape + :selrect selrect + :points points + :transform transform + :transform-inverse transform-inv)) + shape)) + shape)) + + +(defmethod migrate 6 + [data] + (letfn [(update-container [_ container] + (-> container + (update :objects #(d/mapm fix-line-paths %))))] + + (-> data + (update :components #(d/mapm update-container %)) + (update :pages-index #(d/mapm update-container %))))) From 8f4e13072cbf7736a416595be764df48cdc47358 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Wed, 24 Feb 2021 13:17:16 +0100 Subject: [PATCH 65/90] :bug: Fixes issues with frame selection --- CHANGES.md | 2 ++ common/app/common/pages/helpers.cljc | 1 + frontend/src/app/main/data/workspace.cljs | 2 +- frontend/src/app/main/data/workspace/transforms.cljs | 1 - 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 7d93daffb..808b399f8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -30,7 +30,9 @@ - Add some missing database indexes (mainly improves performance on large databases on file-update rpc method, and some background tasks). - Fix broken bounding box on editing paths [Taiga #1254](https://tree.taiga.io/project/penpot/issue/1254) - Fix corner cases on invitation/signup flows. +- Fix errors on onboarding file [Taiga #1287](https://tree.taiga.io/project/penpot/issue/1287) - Fix infinite recursion on logout. +- Fix issues with frame selection [Taiga #1300](https://tree.taiga.io/project/penpot/issue/1300), [Taiga #1255](https://tree.taiga.io/project/penpot/issue/1255) - Fix problem width handoff code generation [Taiga #1204](https://tree.taiga.io/project/penpot/issue/1204) - Fix problem with indices refreshing on page changes [#646](https://github.com/penpot/penpot/issues/646) - Have language change notification written in the new language [Taiga #1205](https://tree.taiga.io/project/penpot/issue/1205) diff --git a/common/app/common/pages/helpers.cljc b/common/app/common/pages/helpers.cljc index ca025949f..e630801da 100644 --- a/common/app/common/pages/helpers.cljc +++ b/common/app/common/pages/helpers.cljc @@ -353,6 +353,7 @@ (let [frames (select-frames objects)] (or (->> frames + (reverse) (d/seek #(and position (gsh/has-point? % position))) :id) uuid/zero))) diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs index ab4cb2101..ed09670ac 100644 --- a/frontend/src/app/main/data/workspace.cljs +++ b/frontend/src/app/main/data/workspace.cljs @@ -1003,7 +1003,7 @@ result (let [group (get objects current-id)] - (if (and (not= uuid/zero current-id) + (if (and (not= :frame (:type group)) (not= current-id parent-id) (empty? (remove removed-id? (:shapes group)))) diff --git a/frontend/src/app/main/data/workspace/transforms.cljs b/frontend/src/app/main/data/workspace/transforms.cljs index b102be822..57be6ef0b 100644 --- a/frontend/src/app/main/data/workspace/transforms.cljs +++ b/frontend/src/app/main/data/workspace/transforms.cljs @@ -373,7 +373,6 @@ (rx/of (set-modifiers selected) (apply-modifiers selected) - (calculate-frame-for-move selected) (fn [state] (-> state (update :workspace-local dissoc :modifiers) (update :workspace-local dissoc :current-move-selected))) From b79c986fc939e9c2b2b26878d25450eced6036fb Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Wed, 24 Feb 2021 13:36:47 +0100 Subject: [PATCH 66/90] :bug: Drawing tool will have priority over resize/rotate handlers --- CHANGES.md | 1 + .../src/app/main/ui/workspace/selection.cljs | 20 ++++++++++++------- .../src/app/main/ui/workspace/viewport.cljs | 3 ++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 808b399f8..229819391 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -28,6 +28,7 @@ - Add more improvements to french translation strings [#591](https://github.com/penpot/penpot/pull/591) - Add some missing database indexes (mainly improves performance on large databases on file-update rpc method, and some background tasks). +- Drawing tool will have priority over resize/rotate handlers [Taiga #1225](https://tree.taiga.io/project/penpot/issue/1225) - Fix broken bounding box on editing paths [Taiga #1254](https://tree.taiga.io/project/penpot/issue/1254) - Fix corner cases on invitation/signup flows. - Fix errors on onboarding file [Taiga #1287](https://tree.taiga.io/project/penpot/issue/1287) diff --git a/frontend/src/app/main/ui/workspace/selection.cljs b/frontend/src/app/main/ui/workspace/selection.cljs index 6a395336d..7ee4ece58 100644 --- a/frontend/src/app/main/ui/workspace/selection.cljs +++ b/frontend/src/app/main/ui/workspace/selection.cljs @@ -241,6 +241,7 @@ color (obj/get props "color") on-resize (obj/get props "on-resize") on-rotate (obj/get props "on-rotate") + disable-handlers (obj/get props "disable-handlers") current-transform (mf/deref refs/current-transform) hide? (mf/use-state false) @@ -251,7 +252,8 @@ (hooks/use-stream ms/keyboard-ctrl #(when (= type :group) (reset! hide? %))) (when (not (#{:move :rotate} current-transform)) - [:g.controls {:style {:display (when @hide? "none")}} + [:g.controls {:style {:display (when @hide? "none")} + :pointer-events (when disable-handlers "none")} ;; Selection rect [:& selection-rect {:rect selrect @@ -294,7 +296,7 @@ :fill "transparent"}}]])) (mf/defc multiple-selection-handlers - [{:keys [shapes selected zoom color show-distances] :as props}] + [{:keys [shapes selected zoom color show-distances disable-handlers] :as props}] (let [shape (geom/setup {:type :rect} (geom/selection-rect (->> shapes (map geom/transform-shape)))) shape-center (geom/center-shape shape) @@ -315,6 +317,7 @@ [:& controls {:shape shape :zoom zoom :color color + :disable-handlers disable-handlers :on-resize on-resize :on-rotate on-rotate}] @@ -328,7 +331,7 @@ [:circle {:cx (:x shape-center) :cy (:y shape-center) :r 5 :fill "yellow"}])])) (mf/defc single-selection-handlers - [{:keys [shape zoom color show-distances] :as props}] + [{:keys [shape zoom color show-distances disable-handlers] :as props}] (let [shape-id (:id shape) shape (geom/transform-shape shape) @@ -353,7 +356,8 @@ :zoom zoom :color color :on-rotate on-rotate - :on-resize on-resize}] + :on-resize on-resize + :disable-handlers disable-handlers}] (when show-distances [:& msr/measurement {:bounds vbox @@ -364,7 +368,7 @@ (mf/defc selection-handlers {::mf/wrap [mf/memo]} - [{:keys [selected edition zoom show-distances] :as props}] + [{:keys [selected edition zoom show-distances disable-handlers] :as props}] (let [;; We need remove posible nil values because on shape ;; deletion many shape will reamin selected and deleted ;; in the same time for small instant of time @@ -385,7 +389,8 @@ :selected selected :zoom zoom :color color - :show-distances show-distances}] + :show-distances show-distances + :disable-handlers disable-handlers}] (and (= type :text) (= edition (:id shape))) @@ -402,4 +407,5 @@ [:& single-selection-handlers {:shape shape :zoom zoom :color color - :show-distances show-distances}]))) + :show-distances show-distances + :disable-handlers disable-handlers}]))) diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs index a92b2bcb4..a8c27ee33 100644 --- a/frontend/src/app/main/ui/workspace/viewport.cljs +++ b/frontend/src/app/main/ui/workspace/viewport.cljs @@ -794,7 +794,8 @@ [:& selection-handlers {:selected selected :zoom zoom :edition edition - :show-distances (and (not transform) @alt?)}]) + :show-distances (and (not transform) @alt?) + :disable-handlers (or drawing-tool edition)}]) (when (= (count selected) 1) [:& gradient-handlers {:id (first selected) From 82d7a0163d19c51f20acc907cefd33abc8005477 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 23 Feb 2021 17:10:57 +0100 Subject: [PATCH 67/90] :sparkles: Rename sprops to setup module. --- backend/src/app/cli/fixtures.clj | 2 +- backend/src/app/main.clj | 6 ++-- backend/src/app/rpc/mutations/demo.clj | 2 +- backend/src/app/rpc/mutations/profile.clj | 38 +++++++++++------------ backend/src/app/{sprops.clj => setup.clj} | 28 ++++++++--------- backend/tests/app/tests/helpers.clj | 4 +-- 6 files changed, 38 insertions(+), 42 deletions(-) rename backend/src/app/{sprops.clj => setup.clj} (83%) diff --git a/backend/src/app/cli/fixtures.clj b/backend/src/app/cli/fixtures.clj index ed986d36d..f863d970c 100644 --- a/backend/src/app/cli/fixtures.clj +++ b/backend/src/app/cli/fixtures.clj @@ -81,7 +81,7 @@ {:id id :fullname (str "Profile " index) :password "123123" - :demo? true + :is-demo true :email (str "profile" index "@example.com")}) team-id (:default-team-id prof) owner-id id] diff --git a/backend/src/app/main.clj b/backend/src/app/main.clj index f93d787f4..20d4177db 100644 --- a/backend/src/app/main.clj +++ b/backend/src/app/main.clj @@ -61,7 +61,7 @@ {:uri (:redis-uri config)} :app.tokens/tokens - {:sprops (ig/ref :app.sprops/props)} + {:sprops (ig/ref :app.setup/props)} :app.storage/gc-deleted-task {:pool (ig/ref :app.db/pool) @@ -295,13 +295,13 @@ {:pool (ig/ref :app.db/pool) :version (:full cfg/version) :uri (:telemetry-uri config) - :sprops (ig/ref :app.sprops/props)} + :sprops (ig/ref :app.setup/props)} :app.srepl/server {:port (:srepl-port config) :host (:srepl-host config)} - :app.sprops/props + :app.setup/props {:pool (ig/ref :app.db/pool)} :app.loggers.zmq/receiver diff --git a/backend/src/app/rpc/mutations/demo.clj b/backend/src/app/rpc/mutations/demo.clj index c5959f91d..b7ce34695 100644 --- a/backend/src/app/rpc/mutations/demo.clj +++ b/backend/src/app/rpc/mutations/demo.clj @@ -36,7 +36,7 @@ params {:id id :email email :fullname fullname - :demo? true + :is-demo true :password password :props {:onboarding-viewed true}}] diff --git a/backend/src/app/rpc/mutations/profile.clj b/backend/src/app/rpc/mutations/profile.clj index b54933a42..53660f315 100644 --- a/backend/src/app/rpc/mutations/profile.clj +++ b/backend/src/app/rpc/mutations/profile.clj @@ -163,28 +163,26 @@ {:update false :valid false}))) -(defn- create-profile +(defn create-profile "Create the profile entry on the database with limited input filling all the other fields with defaults." - [conn {:keys [id fullname email password demo? props is-active is-muted] - :or {is-active false is-muted false} - :as params}] - (let [id (or id (uuid/next)) - demo? (if (boolean? demo?) demo? false) - active? (if demo? true is-active) - props (db/tjson (or props {})) - password (derive-password password)] + [conn {:keys [id fullname email password props is-active is-muted is-demo opts] + :or {is-active false is-muted false is-demo false}}] + (let [id (or id (uuid/next)) + is-active (if is-demo true is-active) + props (db/tjson (or props {})) + password (derive-password password) + params {:id id + :fullname fullname + :email (str/lower email) + :auth-backend "penpot" + :password password + :props props + :is-active is-active + :is-muted is-muted + :is-demo is-demo}] (try - (-> (db/insert! conn :profile - {:id id - :fullname fullname - :email (str/lower email) - :auth-backend "penpot" - :password password - :props props - :is-active active? - :is-muted is-muted - :is-demo demo?}) + (-> (db/insert! conn :profile params opts) (update :props db/decode-transit-pgobject)) (catch org.postgresql.util.PSQLException e (let [state (.getSQLState e)] @@ -195,7 +193,7 @@ :cause e))))))) -(defn- create-profile-relations +(defn create-profile-relations [conn profile] (let [team (teams/create-team conn {:profile-id (:id profile) :name "Default" diff --git a/backend/src/app/sprops.clj b/backend/src/app/setup.clj similarity index 83% rename from backend/src/app/sprops.clj rename to backend/src/app/setup.clj index a46b7258e..3dbbab6d7 100644 --- a/backend/src/app/sprops.clj +++ b/backend/src/app/setup.clj @@ -7,8 +7,8 @@ ;; ;; Copyright (c) 2020-2021 UXBOX Labs SL -(ns app.sprops - "Server props module." +(ns app.setup + "Initial data setup of instance." (:require [app.common.uuid :as uuid] [app.db :as db] @@ -17,16 +17,22 @@ [clojure.spec.alpha :as s] [integrant.core :as ig])) -(declare initialize) +(declare initialize-instance-id!) +(declare initialize-secret-key!) +(declare retrieve-all) (defmethod ig/pre-init-spec ::props [_] (s/keys :req-un [::db/pool])) (defmethod ig/init-key ::props - [_ cfg] - (initialize cfg)) + [_ {:keys [pool] :as cfg}] + (db/with-atomic [conn pool] + (let [cfg (assoc cfg :conn conn)] + (initialize-secret-key! cfg) + (initialize-instance-id! cfg) + (retrieve-all cfg)))) -(defn- initialize-secret-key +(defn- initialize-secret-key! [{:keys [conn] :as cfg}] (let [key (-> (bn/random-bytes 64) (bc/bytes->b64u) @@ -35,7 +41,7 @@ values ('secret-key', ?) on conflict do nothing" (db/tjson key)]))) -(defn- initialize-instance-id +(defn- initialize-instance-id! [{:keys [conn] :as cfg}] (let [iid (uuid/random)] (db/exec-one! conn ["insert into server_prop (id, content) @@ -48,11 +54,3 @@ (assoc acc (keyword (:id row)) (db/decode-transit-pgobject (:content row)))) {} (db/exec! conn ["select * from server_prop;"]))) - -(defn- initialize - [{:keys [pool] :as cfg}] - (db/with-atomic [conn pool] - (let [cfg (assoc cfg :conn conn)] - (initialize-secret-key cfg) - (initialize-instance-id cfg) - (retrieve-all cfg)))) diff --git a/backend/tests/app/tests/helpers.clj b/backend/tests/app/tests/helpers.clj index 81c442e68..a11295263 100644 --- a/backend/tests/app/tests/helpers.clj +++ b/backend/tests/app/tests/helpers.clj @@ -115,7 +115,7 @@ :fullname (str "Profile " i) :email (str "profile" i ".test@nodomain.com") :password "123123" - :demo? true}] + :is-demo true}] (->> (#'profile/create-profile conn params) (#'profile/create-profile-relations conn)))) @@ -159,7 +159,7 @@ :fullname (str "Profile " i) :email (str "profile" i ".test@nodomain.com") :password "123123" - :demo? false} + :is-demo false} params)] (->> (#'profile/create-profile conn params) (#'profile/create-profile-relations conn))))) From 65a3126f1585819bcd191958261972a9f7560a03 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 24 Feb 2021 11:51:57 +0100 Subject: [PATCH 68/90] :tada: Add manage cli helper. --- backend/deps.edn | 1 + backend/scripts/build.sh | 30 ++- backend/src/app/cli/manage.clj | 172 ++++++++++++++++++ backend/src/app/rpc/mutations/profile.clj | 108 +++++++---- .../tests/app/tests/test_services_profile.clj | 39 +++- .../app/main/ui/settings/change_email.cljs | 11 +- 6 files changed, 306 insertions(+), 55 deletions(-) create mode 100644 backend/src/app/cli/manage.clj diff --git a/backend/deps.edn b/backend/deps.edn index 9704c2240..c4cd8b435 100644 --- a/backend/deps.edn +++ b/backend/deps.edn @@ -7,6 +7,7 @@ org.clojure/clojurescript {:mvn/version "1.10.773"} org.clojure/data.json {:mvn/version "1.0.0"} org.clojure/core.async {:mvn/version "1.3.610"} + org.clojure/tools.cli {:mvn/version "1.0.194"} ;; Logging org.clojure/tools.logging {:mvn/version "1.1.0"} diff --git a/backend/scripts/build.sh b/backend/scripts/build.sh index 39d089040..57b2e3057 100755 --- a/backend/scripts/build.sh +++ b/backend/scripts/build.sh @@ -25,12 +25,8 @@ echo $NEWCP > ./target/dist/classpath; tee -a ./target/dist/run.sh >> /dev/null <> /dev/null <&2 echo "Couldn't find 'java'. Please set JAVA_HOME." + exit 1 + fi +fi + +if [ -f ./environ ]; then + source ./environ +fi + +exec \$JAVA_CMD \$JVM_OPTS -classpath \$CP -Dlog4j.configurationFile=./log4j2.xml clojure.main -m app.cli.manage "\$@" +EOF + chmod +x ./target/dist/run.sh +chmod +x ./target/dist/manage.sh + diff --git a/backend/src/app/cli/manage.clj b/backend/src/app/cli/manage.clj new file mode 100644 index 000000000..a3c26d457 --- /dev/null +++ b/backend/src/app/cli/manage.clj @@ -0,0 +1,172 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2021 UXBOX Labs SL + +(ns app.cli.manage + "A manage cli api." + (:require + [app.config :as cfg] + [app.db :as db] + [app.main :as main] + [app.rpc.mutations.profile :as profile] + [app.rpc.queries.profile :refer [retrieve-profile-data-by-email]] + [clojure.string :as str] + [clojure.tools.cli :refer [parse-opts]] + [clojure.tools.logging :as log] + [integrant.core :as ig]) + (:import + java.io.Console)) + +;; --- IMPL + +(defn init-system + [] + (let [data (-> (main/build-system-config cfg/config) + (select-keys [:app.db/pool :app.metrics/metrics]) + (assoc :app.migrations/all {}))] + (-> data ig/prep ig/init))) + +(defn- read-from-console + [{:keys [label type] :or {type :text}}] + (let [^Console console (System/console)] + (when-not console + (log/error "no console found, can proceed") + (System/exit 1)) + + (binding [*out* (.writer console)] + (print label " ") + (.flush *out*)) + + (case type + :text (.readLine console) + :password (String. (.readPassword console))))) + +(defn create-profile + [options] + (let [system (init-system) + email (or (:email options) + (read-from-console {:label "Email:"})) + fullname (or (:fullname options) + (read-from-console {:label "Full Name:"})) + password (or (:password options) + (read-from-console {:label "Password:" + :type :password}))] + (try + (db/with-atomic [conn (:app.db/pool system)] + (->> (profile/create-profile conn + {:fullname fullname + :email email + :password password + :is-active true + :is-demo false}) + (profile/create-profile-relations conn))) + + (when (pos? (:verbosity options)) + (println "User created successfully.")) + (System/exit 0) + + (catch Exception _e + (when (pos? (:verbosity options)) + (println "Unable to create user, already exists.")) + (System/exit 1))))) + +(defn reset-password + [options] + (let [system (init-system)] + (try + (db/with-atomic [conn (:app.db/pool system)] + (let [email (or (:email options) + (read-from-console {:label "Email:"})) + profile (retrieve-profile-data-by-email conn email)] + (when-not profile + (when (pos? (:verbosity options)) + (println "Profile does not exists.")) + (System/exit 1)) + + (let [password (or (:password options) + (read-from-console {:label "Password:" + :type :password}))] + (profile/update-profile-password! conn (assoc profile :password password)) + (when (pos? (:verbosity options)) + (println "Password changed successfully."))))) + (System/exit 0) + (catch Exception e + (when (pos? (:verbosity options)) + (println "Unable to change password.")) + (when (= 2 (:verbosity options)) + (.printStackTrace e)) + (System/exit 1))))) + +;; --- CLI PARSE + +(def cli-options + ;; An option with a required argument + [["-u" "--email EMAIL" "Email Address"] + ["-p" "--password PASSWORD" "Password"] + ["-n" "--name FULLNAME" "Full Name"] + ["-v" nil "Verbosity level" + :id :verbosity + :default 1 + :update-fn inc] + ["-q" nil "Dont' print to console" + :id :verbosity + :update-fn (constantly 0)] + ["-h" "--help"]]) + +(defn usage + [options-summary] + (->> ["Penpot CLI management." + "" + "Usage: manage [options] action" + "" + "Options:" + options-summary + "" + "Actions:" + " create-profile Create new profile." + " reset-password Reset profile password." + ""] + (str/join \newline))) + +(defn error-msg [errors] + (str "The following errors occurred while parsing your command:\n\n" + (str/join \newline errors))) + +(defn validate-args + "Validate command line arguments. Either return a map indicating the program + should exit (with a error message, and optional ok status), or a map + indicating the action the program should take and the options provided." + [args] + (let [{:keys [options arguments errors summary] :as opts} (parse-opts args cli-options)] + ;; (pp/pprint opts) + (cond + (:help options) ; help => exit OK with usage summary + {:exit-message (usage summary) :ok? true} + + errors ; errors => exit with description of errors + {:exit-message (error-msg errors)} + + ;; custom validation on arguments + :else + (let [action (first arguments)] + (if (#{"create-profile" "reset-password"} action) + {:action (first arguments) :options options} + {:exit-message (usage summary)}))))) + +(defn exit [status msg] + (println msg) + (System/exit status)) + +(defn -main + [& args] + (let [{:keys [action options exit-message ok?]} (validate-args args)] + (if exit-message + (exit (if ok? 0 1) exit-message) + (case action + "create-profile" (create-profile options) + "reset-password" (reset-password options))))) diff --git a/backend/src/app/rpc/mutations/profile.clj b/backend/src/app/rpc/mutations/profile.clj index 53660f315..28f4823dc 100644 --- a/backend/src/app/rpc/mutations/profile.clj +++ b/backend/src/app/rpc/mutations/profile.clj @@ -341,12 +341,8 @@ ;; --- Mutation: Update Password -(defn- validate-password! - [conn {:keys [profile-id old-password] :as params}] - (let [profile (db/get-by-id conn :profile profile-id)] - (when-not (:valid (verify-password old-password (:password profile))) - (ex/raise :type :validation - :code :old-password-not-match)))) +(declare validate-password!) +(declare update-profile-password!) (s/def ::update-profile-password (s/keys :req-un [::profile-id ::password ::old-password])) @@ -354,12 +350,23 @@ (sv/defmethod ::update-profile-password {:rlimit :password} [{:keys [pool] :as cfg} {:keys [password profile-id] :as params}] (db/with-atomic [conn pool] - (validate-password! conn params) - (db/update! conn :profile - {:password (derive-password password)} - {:id profile-id}) - nil)) + (let [profile (validate-password! conn params)] + (update-profile-password! conn (assoc profile :password password)) + nil))) +(defn- validate-password! + [conn {:keys [profile-id old-password] :as params}] + (let [profile (db/get-by-id conn :profile profile-id)] + (when-not (:valid (verify-password old-password (:password profile))) + (ex/raise :type :validation + :code :old-password-not-match)) + profile)) + +(defn update-profile-password! + [conn {:keys [id password] :as profile}] + (db/update! conn :profile + {:password (derive-password password)} + {:id id})) ;; --- Mutation: Update Photo @@ -393,45 +400,68 @@ {:id profile-id}) nil) + ;; --- Mutation: Request Email Change +(declare request-email-change) +(declare change-email-inmediatelly) + (s/def ::request-email-change (s/keys :req-un [::email])) (sv/defmethod ::request-email-change - [{:keys [pool tokens] :as cfg} {:keys [profile-id email] :as params}] + [{:keys [pool] :as cfg} {:keys [profile-id email] :as params}] (db/with-atomic [conn pool] - (let [email (str/lower email) - profile (db/get-by-id conn :profile profile-id) - token (tokens :generate - {:iss :change-email - :exp (dt/in-future "15m") - :profile-id profile-id - :email email}) - ptoken (tokens :generate-predefined - {:iss :profile-identity - :profile-id (:id profile)})] + (let [profile (db/get-by-id conn :profile profile-id) + cfg (assoc cfg :conn conn) + params (assoc params + :profile profile + :email (str/lower email))] + (if (cfg/get :smtp-enabled) + (request-email-change cfg params) + (change-email-inmediatelly cfg params))))) - (when (not= email (:email profile)) - (check-profile-existence! conn params)) +(defn- change-email-inmediatelly + [{:keys [conn]} {:keys [profile email] :as params}] + (when (not= email (:email profile)) + (check-profile-existence! conn params)) + (db/update! conn :profile + {:email email} + {:id (:id profile)}) + {:changed true}) - (when-not (emails/allow-send-emails? conn profile) - (ex/raise :type :validation - :code :profile-is-muted - :hint "looks like the profile has reported repeatedly as spam or has permanent bounces.")) +(defn- request-email-change + [{:keys [conn tokens]} {:keys [profile email] :as params}] + (let [token (tokens :generate + {:iss :change-email + :exp (dt/in-future "15m") + :profile-id (:id profile) + :email email}) + ptoken (tokens :generate-predefined + {:iss :profile-identity + :profile-id (:id profile)})] - (when (emails/has-bounce-reports? conn email) - (ex/raise :type :validation - :code :email-has-permanent-bounces - :hint "looks like the email you invite has been repeatedly reported as spam or permanent bounce")) + (when (not= email (:email profile)) + (check-profile-existence! conn params)) + + (when-not (emails/allow-send-emails? conn profile) + (ex/raise :type :validation + :code :profile-is-muted + :hint "looks like the profile has reported repeatedly as spam or has permanent bounces.")) + + (when (emails/has-bounce-reports? conn email) + (ex/raise :type :validation + :code :email-has-permanent-bounces + :hint "looks like the email you invite has been repeatedly reported as spam or permanent bounce")) + + (emails/send! conn emails/change-email + {:to (:email profile) + :name (:fullname profile) + :pending-email email + :token token + :extra-data ptoken}) + nil)) - (emails/send! conn emails/change-email - {:to (:email profile) - :name (:fullname profile) - :pending-email email - :token token - :extra-data ptoken}) - nil))) (defn select-profile-for-update [conn id] diff --git a/backend/tests/app/tests/test_services_profile.clj b/backend/tests/app/tests/test_services_profile.clj index b355285e5..f48fc8801 100644 --- a/backend/tests/app/tests/test_services_profile.clj +++ b/backend/tests/app/tests/test_services_profile.clj @@ -281,18 +281,21 @@ (t/is (= (:email data) (:email result))))))) (t/deftest test-email-change-request - (with-mocks [mock {:target 'app.emails/send! :return nil}] + (with-mocks [email-send-mock {:target 'app.emails/send! :return nil} + cfg-get-mock {:target 'app.config/get + :return (th/mock-config-get-with + {:smtp-enabled true})}] (let [profile (th/create-profile* 1) - pool (:app.db/pool th/*system*) - data {::th/type :request-email-change - :profile-id (:id profile) - :email "user1@example.com"}] + pool (:app.db/pool th/*system*) + data {::th/type :request-email-change + :profile-id (:id profile) + :email "user1@example.com"}] ;; without complaints (let [out (th/mutation! data)] ;; (th/print-result! out) (t/is (nil? (:result out))) - (let [mock (deref mock)] + (let [mock (deref email-send-mock)] (t/is (= 1 (:call-count mock))) (t/is (true? (:called? mock))))) @@ -301,7 +304,7 @@ (let [out (th/mutation! data)] ;; (th/print-result! out) (t/is (nil? (:result out))) - (t/is (= 2 (:call-count (deref mock))))) + (t/is (= 2 (:call-count (deref email-send-mock))))) ;; with bounces (th/create-global-complaint-for pool {:type :bounce :email (:email data)}) @@ -311,7 +314,27 @@ (t/is (th/ex-info? error)) (t/is (th/ex-of-type? error :validation)) (t/is (th/ex-of-code? error :email-has-permanent-bounces)) - (t/is (= 2 (:call-count (deref mock)))))))) + (t/is (= 2 (:call-count (deref email-send-mock)))))))) + + +(t/deftest test-email-change-request-without-smtp + (with-mocks [email-send-mock {:target 'app.emails/send! :return nil} + cfg-get-mock {:target 'app.config/get + :return (th/mock-config-get-with + {:smtp-enabled false})}] + (let [profile (th/create-profile* 1) + pool (:app.db/pool th/*system*) + data {::th/type :request-email-change + :profile-id (:id profile) + :email "user1@example.com"}] + + ;; without complaints + (let [out (th/mutation! data) + res (:result out)] + (t/is (= {:changed true} res)) + (let [mock (deref email-send-mock)] + (t/is (false? (:called? mock)))))))) + (t/deftest test-request-profile-recovery (with-mocks [mock {:target 'app.emails/send! :return nil}] diff --git a/frontend/src/app/main/ui/settings/change_email.cljs b/frontend/src/app/main/ui/settings/change_email.cljs index b35bc8af3..63a1ea84a 100644 --- a/frontend/src/app/main/ui/settings/change_email.cljs +++ b/frontend/src/app/main/ui/settings/change_email.cljs @@ -58,10 +58,13 @@ (defn- on-success [form data] - (let [email (get-in @form [:clean-data :email-1]) - message (tr "notifications.validation-email-sent" email)] - (st/emit! (dm/info message) - (modal/hide)))) + (if (:changed data) + (st/emit! (du/fetch-profile) + (modal/hide)) + (let [email (get-in @form [:clean-data :email-1]) + message (tr "notifications.validation-email-sent" email)] + (st/emit! (dm/info message) + (modal/hide))))) (defn- on-submit [form event] From 04af15cba59ed551e808fd93caafbe773d7eab36 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 24 Feb 2021 13:08:44 +0100 Subject: [PATCH 69/90] :bug: Add prefix on topics (msgbus module). --- backend/src/app/msgbus.clj | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/backend/src/app/msgbus.clj b/backend/src/app/msgbus.clj index b1e13d164..143d5c08f 100644 --- a/backend/src/app/msgbus.clj +++ b/backend/src/app/msgbus.clj @@ -12,6 +12,7 @@ (:require [app.common.exceptions :as ex] [app.common.spec :as us] + [app.config :as cfg] [app.util.blob :as blob] [app.util.time :as dt] [clojure.core.async :as a] @@ -135,7 +136,8 @@ (subscribed [it topic count]) (unsubscribed [it topic count]))) - (let [chans (agent {} :error-handler #(log/error % "unexpected error on agent")) + (let [chans (agent {} :error-handler #(log/error % "unexpected error on agent")) + tprefix (str (cfg/get :tenant) ".") subscribe-to-single-topic (fn [nsubs topic chan] @@ -149,8 +151,7 @@ subscribe-to-topics (fn [state topics chan] - (let [topics (into #{} (map str) topics) - state (update state :chans assoc chan topics)] + (let [state (update state :chans assoc chan topics)] (reduce (fn [state topic] (update-in state [:topics topic] subscribe-to-single-topic topic chan)) state @@ -158,7 +159,6 @@ unsubscribe-from-single-topic (fn [nsubs topic chan] - ;; (log/tracef "unsubscribe-from-single-topic %s | %s | %s" nsubs topic chan) (let [nsubs (disj nsubs chan)] (when (empty? nsubs) (let [result (a/ Date: Tue, 23 Feb 2021 18:36:02 +0800 Subject: [PATCH 70/90] :tada: Add more chinese transtions. Updated more Chinese translations. --- CHANGES.md | 1 + frontend/resources/locales.json | 640 +++++++++++++++++++++----------- 2 files changed, 429 insertions(+), 212 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 229819391..072d37e4a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,6 +15,7 @@ - Add emailcatcher and ldap test containers to devenv. [#506](https://github.com/penpot/penpot/pull/506) - Add major refactor of internal pubsub/redis code; improves scalability and performance [#640](https://github.com/penpot/penpot/pull/640) +- Add more chinese transtions [#687](https://github.com/penpot/penpot/pull/687) - Add more presets for artboard [#654](https://github.com/penpot/penpot/pull/654) - Add optional loki integration [#645](https://github.com/penpot/penpot/pull/645) - Add proper http session lifecycle handling. diff --git a/frontend/resources/locales.json b/frontend/resources/locales.json index 2ac41bc0c..e70cca208 100644 --- a/frontend/resources/locales.json +++ b/frontend/resources/locales.json @@ -321,7 +321,7 @@ "es" : "¿No tienes una cuenta?", "fr" : "Pas encore de compte ?", "ru" : "Еще нет аккаунта?", - "zh_cn" : "现在还没有账户？" + "zh_cn" : "现在还没有账号？" }, "used-in" : [ "src/app/main/ui/auth/login.cljs" ] }, @@ -332,7 +332,7 @@ "es" : "Crear una cuenta", "fr" : "Créer un compte", "ru" : "Создать аккаунт", - "zh_cn" : "创建账户" + "zh_cn" : "创建账号" }, "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/login.cljs" ] }, @@ -342,7 +342,8 @@ "en" : "It's free, it's Open Source", "es" : "Es gratis, es Open Source", "fr" : "C’est gratuit, c’est Open Source", - "ru" : "Это бесплатно, это Open Source" + "ru" : "Это бесплатно, это Open Source", + "zh_cn" : "它免费，它开源" }, "used-in" : [ "src/app/main/ui/auth/register.cljs" ] }, @@ -352,7 +353,8 @@ "en" : "Create an account", "es" : "Crear una cuenta", "fr" : "Créer un compte", - "ru" : "Создать аккаунт" + "ru" : "Создать аккаунт", + "zh_cn" : "创建账号" }, "used-in" : [ "src/app/main/ui/auth/register.cljs" ] }, @@ -362,7 +364,8 @@ "en" : "The open-source solution for design and prototyping.", "es" : "La solución de código abierto para diseñar y prototipar", "fr" : "La solution Open Source pour la conception et le prototypage.", - "ru" : "Open Source решение для дизайна и прототипирования." + "ru" : "Open Source решение для дизайна и прототипирования.", + "zh_cn" : "设计与原型的开源解决方案" }, "used-in" : [ "src/app/main/ui/auth.cljs" ] }, @@ -370,7 +373,8 @@ "translations" : { "ca" : "Em enviat un correu de verificació a", "en" : "We've sent a verification email to", - "fr" : "Nous avons envoyé un e-mail de vérification à" + "fr" : "Nous avons envoyé un e-mail de vérification à", + "zh_cn" : "我们已经发送了一封验证邮件到" }, "used-in" : [ "src/app/main/ui/auth/register.cljs" ] }, @@ -380,7 +384,8 @@ "en" : "Add as Shared Library", "es" : "Añadir como Biblioteca Compartida", "fr" : "Ajouter une Bibliothèque Partagée", - "ru" : "" + "ru" : "", + "zh_cn" : "添加为共享库" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ] }, @@ -390,7 +395,8 @@ "en" : "Change email", "es" : "Cambiar correo", "fr" : "Changer adresse e‑mail", - "ru" : "Сменить email адрес" + "ru" : "Сменить email адрес", + "zh_cn" : "修改电子邮箱" }, "used-in" : [ "src/app/main/ui/settings/profile.cljs" ] }, @@ -399,7 +405,8 @@ "ca" : "+ Crear un nou equip", "en" : "+ Create new team", "es" : "+ Crear nuevo equipo", - "fr" : "+ Créer nouvelle équipe" + "fr" : "+ Créer nouvelle équipe", + "zh_cn" : "+ 创建新团队" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -408,7 +415,8 @@ "ca" : "El teu Penpot", "en" : "Your Penpot", "es" : "Tu Penpot", - "fr" : "Votre Penpot" + "fr" : "Votre Penpot", + "zh_cn" : "你的Penpot" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -417,7 +425,8 @@ "ca" : "Suprimir equip", "en" : "Delete team", "es" : "Eliminar equipo", - "fr" : "Supprimer l’équipe" + "fr" : "Supprimer l’équipe", + "zh_cn" : "删除团队" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -427,7 +436,8 @@ "en" : "Draft", "es" : "Borrador", "fr" : "Brouillon", - "ru" : "Черновик" + "ru" : "Черновик", + "zh_cn" : "草稿" }, "used-in" : [ "src/app/main/ui/dashboard/files.cljs" ] }, @@ -437,7 +447,8 @@ "en" : "You still have no files here", "es" : "Todavía no hay ningún archivo aquí", "fr" : "Vous n’avez encore aucun fichier ici", - "ru" : "Файлов пока нет" + "ru" : "Файлов пока нет", + "zh_cn" : "暂无文档" }, "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ] }, @@ -446,7 +457,8 @@ "ca" : "Convidar a l'equip", "en" : "Invite to team", "es" : "Invitar al equipo", - "fr" : "Inviter dans l’équipe" + "fr" : "Inviter dans l’équipe", + "zh_cn" : "邀请加入团队" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -455,7 +467,8 @@ "ca" : "Abandonar l'equip", "en" : "Leave team", "es" : "Abandonar equipo", - "fr" : "Quitter l’équipe" + "fr" : "Quitter l’équipe", + "zh_cn" : "退出团队" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -465,7 +478,8 @@ "en" : "Shared Libraries", "es" : "Bibliotecas Compartidas", "fr" : "Bibliothèques Partagées", - "ru" : "" + "ru" : "", + "zh_cn" : "共享库" }, "used-in" : [ "src/app/main/ui/dashboard/libraries.cljs" ] }, @@ -474,7 +488,8 @@ "ca" : "carregan els teus fitxers", "en" : "loading your files …", "es" : "cargando tus ficheros …", - "fr" : "chargement de vos fichiers…" + "fr" : "chargement de vos fichiers…", + "zh_cn" : "正在加载文档…" }, "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ] }, @@ -484,7 +499,8 @@ "en" : "+ New File", "es" : "+ Nuevo Archivo", "fr" : "+ Nouveau fichier", - "ru" : "+ Новый файл" + "ru" : "+ Новый файл", + "zh_cn" : "+ 新文档" }, "used-in" : [ "src/app/main/ui/dashboard/projects.cljs", "src/app/main/ui/dashboard/files.cljs" ] }, @@ -494,7 +510,8 @@ "en" : "+ New project", "es" : "+ Nuevo proyecto", "fr" : "+ Nouveau projet", - "ru" : "+ Новый проект" + "ru" : "+ Новый проект", + "zh_cn" : "+ 新项目" }, "used-in" : [ "src/app/main/ui/dashboard/projects.cljs" ] }, @@ -504,7 +521,8 @@ "en" : "No matches found for “%s“", "es" : "No se encuentra “%s“", "fr" : "Aucune correspondance pour « %s »", - "ru" : "Совпадений для “%s“ не найдено" + "ru" : "Совпадений для “%s“ не найдено", + "zh_cn" : "没有找到“%s”的匹配项" }, "used-in" : [ "src/app/main/ui/dashboard/search.cljs" ] }, @@ -513,7 +531,8 @@ "ca" : "Els projectes fixats apareixeran aquí", "en" : "Pinned projects will appear here", "es" : "Los proyectos fijados aparecerán aquí", - "fr" : "Les projets épinglés apparaîtront ici" + "fr" : "Les projets épinglés apparaîtront ici", + "zh_cn" : "被钉住的项目会显示在这儿" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -523,7 +542,8 @@ "en" : "Your email address has been updated successfully", "es" : "Tu dirección de correo ha sido actualizada", "fr" : "Votre adresse e‑mail a été mise à jour avec succès", - "ru" : "Ваш email адрес успешно обновлен" + "ru" : "Ваш email адрес успешно обновлен", + "zh_cn" : "已经成功更新你的电子邮件" }, "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ] }, @@ -533,7 +553,8 @@ "en" : "Your email address has been verified successfully", "es" : "Tu dirección de correo ha sido verificada", "fr" : "Votre adresse e‑mail a été vérifiée avec succès", - "ru" : "Ваш email адрес успешно подтвержден" + "ru" : "Ваш email адрес успешно подтвержден", + "zh_cn" : "已经成功验证你的电子邮件" }, "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ] }, @@ -543,7 +564,8 @@ "en" : "Password saved successfully!", "es" : "¡Contraseña guardada!", "fr" : "Mot de passe enregistré avec succès !", - "ru" : "Пароль успешно сохранен!" + "ru" : "Пароль успешно сохранен!", + "zh_cn" : "已经成功保存密码！" }, "used-in" : [ "src/app/main/ui/settings/password.cljs" ] }, @@ -552,7 +574,8 @@ "ca" : "%s membres", "en" : "%s members", "es" : "%s integrantes", - "fr" : "%s membres" + "fr" : "%s membres", + "zh_cn" : "成员%s人" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -562,7 +585,8 @@ "en" : "Change password", "es" : "Cambiar contraseña", "fr" : "Changer le mot de passe", - "ru" : "Изменить пароль" + "ru" : "Изменить пароль", + "zh_cn" : "修改密码" }, "used-in" : [ "src/app/main/ui/settings/password.cljs" ] }, @@ -572,7 +596,8 @@ "en" : "Projects", "es" : "Proyectos", "fr" : "Projets", - "ru" : "Проекты" + "ru" : "Проекты", + "zh_cn" : "项目" }, "used-in" : [ "src/app/main/ui/dashboard/projects.cljs" ] }, @@ -581,7 +606,8 @@ "ca" : "Promoure a propietari", "en" : "Promote to owner", "es" : "Promover a dueño", - "fr" : "Promouvoir propriétaire" + "fr" : "Promouvoir propriétaire", + "zh_cn" : "晋级为所有者" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -591,7 +617,8 @@ "en" : "Want to remove your account?", "es" : "¿Quieres borrar tu cuenta?", "fr" : "Vous souhaitez supprimer votre compte ?", - "ru" : "Хотите удалить свой аккаунт?" + "ru" : "Хотите удалить свой аккаунт?", + "zh_cn" : "希望注销您的账号？" }, "used-in" : [ "src/app/main/ui/settings/profile.cljs" ] }, @@ -601,7 +628,8 @@ "en" : "Remove as Shared Library", "es" : "Eliminar como Biblioteca Compartida", "fr" : "Retirer en tant que Bibliothèque Partagée", - "ru" : "" + "ru" : "", + "zh_cn" : "不再作为共享库" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ] }, @@ -611,7 +639,8 @@ "en" : "Search…", "es" : "Buscar…", "fr" : "Rechercher…", - "ru" : "Поиск …" + "ru" : "Поиск …", + "zh_cn" : "搜索…" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -621,7 +650,8 @@ "en" : "Searching for “%s“…", "es" : "Buscando “%s“…", "fr" : "Recherche de « %s »…", - "ru" : "Ищу “%s“…" + "ru" : "Ищу “%s“…", + "zh_cn" : "正在搜索“%s”" }, "used-in" : [ "src/app/main/ui/dashboard/search.cljs" ] }, @@ -631,7 +661,8 @@ "en" : "Select UI language", "es" : "Cambiar el idioma de la interfaz", "fr" : "Sélectionnez la langue de l’interface", - "ru" : "Выберите язык интерфейса" + "ru" : "Выберите язык интерфейса", + "zh_cn" : "选择界面语言" }, "used-in" : [ "src/app/main/ui/settings/options.cljs" ] }, @@ -641,7 +672,8 @@ "en" : "Select theme", "es" : "Selecciona un tema", "fr" : "Sélectionnez un thème", - "ru" : "Выберите тему" + "ru" : "Выберите тему", + "zh_cn" : "选择界面主题" }, "used-in" : [ "src/app/main/ui/settings/options.cljs" ] }, @@ -650,7 +682,8 @@ "ca" : "Veure tots els fitxers", "en" : "Show all files", "es" : "Ver todos los ficheros", - "fr" : "Voir tous les fichiers" + "fr" : "Voir tous les fichiers", + "zh_cn" : "显示全部文档" }, "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ] }, @@ -659,7 +692,8 @@ "ca" : "Cambiar d'equip", "en" : "Switch team", "es" : "Cambiar equipo", - "fr" : "Changer d’équipe" + "fr" : "Changer d’équipe", + "zh_cn" : "切换团队" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -668,7 +702,8 @@ "ca" : "Informació de l'equip", "en" : "Team info", "es" : "Información del equipo", - "fr" : "Information de l’équipe" + "fr" : "Information de l’équipe", + "zh_cn" : "团队信息" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -677,7 +712,8 @@ "ca" : "Membres de l'equip", "en" : "Team members", "es" : "Integrantes del equipo", - "fr" : "Membres de l’équipe" + "fr" : "Membres de l’équipe", + "zh_cn" : "团队成员" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -686,7 +722,8 @@ "ca" : "Projectes de l'equip", "en" : "Team projects", "es" : "Proyectos del equipo", - "fr" : "Projets de l’équipe" + "fr" : "Projets de l’équipe", + "zh_cn" : "团队项目" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -696,7 +733,8 @@ "en" : "UI theme", "es" : "Tema visual", "fr" : "Thème de l’interface", - "ru" : "Тема интерфейса пользователя" + "ru" : "Тема интерфейса пользователя", + "zh_cn" : "界面主题" }, "used-in" : [ "src/app/main/ui/settings/options.cljs" ] }, @@ -706,7 +744,8 @@ "en" : "Search results", "es" : "Resultados de búsqueda", "fr" : "Résultats de recherche", - "ru" : "Результаты поиска" + "ru" : "Результаты поиска", + "zh_cn" : "搜索结果" }, "used-in" : [ "src/app/main/ui/dashboard/search.cljs" ] }, @@ -716,7 +755,8 @@ "en" : "Type to search results", "es" : "Escribe algo para buscar", "fr" : "Écrivez pour rechercher", - "ru" : "Введите для поиска" + "ru" : "Введите для поиска", + "zh_cn" : "输入关键词进行搜索" }, "used-in" : [ "src/app/main/ui/dashboard/search.cljs" ] }, @@ -726,7 +766,8 @@ "en" : "Update settings", "es" : "Actualizar opciones", "fr" : "Mettre à jour les paramètres", - "ru" : "Обновить настройки" + "ru" : "Обновить настройки", + "zh_cn" : "保存设置" }, "used-in" : [ "src/app/main/ui/settings/profile.cljs", "src/app/main/ui/settings/password.cljs", "src/app/main/ui/settings/options.cljs" ] }, @@ -735,7 +776,8 @@ "ca" : "El teu compte", "en" : "Your account", "es" : "Tu cuenta", - "fr" : "Votre compte" + "fr" : "Votre compte", + "zh_cn" : "你的账号" }, "used-in" : [ "src/app/main/ui/settings.cljs" ] }, @@ -745,7 +787,8 @@ "en" : "Email", "es" : "Correo", "fr" : "E‑mail", - "ru" : "Email" + "ru" : "Email", + "zh_cn" : "电子邮件" }, "used-in" : [ "src/app/main/ui/settings/profile.cljs" ] }, @@ -755,7 +798,8 @@ "en" : "Your name", "es" : "Tu nombre", "fr" : "Votre nom complet", - "ru" : "Ваше имя" + "ru" : "Ваше имя", + "zh_cn" : "你的姓名" }, "used-in" : [ "src/app/main/ui/settings/profile.cljs" ] }, @@ -764,7 +808,8 @@ "ca" : "El teu Penpot", "en" : "Your Penpot", "es" : "Tu Penpot", - "fr" : "Votre Penpot" + "fr" : "Votre Penpot", + "zh_cn" : "你的Penpot" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -774,7 +819,8 @@ "en" : "Cancel", "es" : "Cancelar", "fr" : "Annuler", - "ru" : "Отмена" + "ru" : "Отмена", + "zh_cn" : "取消" }, "used-in" : [ "src/app/main/ui/confirm.cljs" ] }, @@ -784,7 +830,8 @@ "en" : "Ok", "es" : "Ok", "fr" : "Ok", - "ru" : "Ok" + "ru" : "Ok", + "zh_cn" : "OK" }, "used-in" : [ "src/app/main/ui/confirm.cljs" ] }, @@ -794,7 +841,8 @@ "en" : "Are you sure?", "es" : "¿Seguro?", "fr" : "Êtes‑vous sûr ?", - "ru" : "Вы уверены?" + "ru" : "Вы уверены?", + "zh_cn" : "你确定？" }, "used-in" : [ "src/app/main/ui/confirm.cljs", "src/app/main/ui/confirm.cljs" ] }, @@ -804,7 +852,8 @@ "en" : "Updated: %s", "es" : "Actualizado: %s", "fr" : "Mise à jour : %s", - "ru" : "Обновлено: %s" + "ru" : "Обновлено: %s", + "zh_cn" : "更新了：%s" }, "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ] }, @@ -814,7 +863,8 @@ "en" : "Your browser cannot do this operation", "es" : "Tu navegador no puede realizar esta operación", "fr" : "Votre navigateur ne peut pas effectuer cette opération", - "ru" : "" + "ru" : "", + "zh_cn" : "你的浏览器不支持该操作" }, "used-in" : [ "src/app/main/data/workspace.cljs" ] }, @@ -824,7 +874,8 @@ "en" : "Email already used", "es" : "Este correo ya está en uso", "fr" : "Adresse e‑mail déjà utilisée", - "ru" : "Такой email уже используется" + "ru" : "Такой email уже используется", + "zh_cn" : "电子邮件已被占用" }, "used-in" : [ "src/app/main/ui/auth/verify_token.cljs", "src/app/main/ui/settings/change_email.cljs" ] }, @@ -834,7 +885,8 @@ "en" : "Email already validated.", "es" : "Este correo ya está validado.", "fr" : "Adresse e‑mail déjà validée.", - "ru" : "Электронная почта уже подтверждена." + "ru" : "Электронная почта уже подтверждена.", + "zh_cn" : "电子邮件已经验证通过" }, "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ] }, @@ -842,7 +894,8 @@ "translations" : { "ca" : "El correu «%s» té molts informes de rebot permanents", "en" : "The email «%s» has many permanent bounce reports.", - "es" : "El email «%s» tiene varios reportes de rebote permanente." + "es" : "El email «%s» tiene varios reportes de rebote permanente.", + "zh_cn" : "电子邮件“%s”收到了非常多的永久退信报告" }, "used-in" : [ "src/app/main/ui/auth/register.cljs", "src/app/main/ui/auth/recovery_request.cljs", "src/app/main/ui/settings/change_email.cljs", "src/app/main/ui/dashboard/team.cljs" ] }, @@ -852,7 +905,8 @@ "en" : "Confirmation email must match", "es" : "El correo de confirmación debe coincidir", "fr" : "L’adresse e‑mail de confirmation doit correspondre", - "ru" : "Email для подтверждения должен совпадать" + "ru" : "Email для подтверждения должен совпадать", + "zh_cn" : "确认电子邮件必须保持一致" }, "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ] }, @@ -862,7 +916,8 @@ "en" : "Something wrong has happened.", "es" : "Ha ocurrido algún error.", "fr" : "Un problème s’est produit.", - "ru" : "Что-то пошло не так." + "ru" : "Что-то пошло не так.", + "zh_cn" : "发生了某种错误。" }, "used-in" : [ "src/app/main/ui/auth/verify_token.cljs", "src/app/main/ui/settings/profile.cljs", "src/app/main/ui/settings/feedback.cljs", "src/app/main/ui/settings/feedback.cljs", "src/app/main/ui/settings/options.cljs", "src/app/main/ui/dashboard/team.cljs" ] }, @@ -870,14 +925,16 @@ "translations" : { "ca" : "L'autenticació amb google ha estat desactivada a aquest servidor", "en" : "Authentication with google disabled on backend", - "es" : "Autenticación con google esta dehabilitada en el servidor" + "es" : "Autenticación con google esta dehabilitada en el servidor", + "zh_cn" : "后端禁用了Google授权" }, "used-in" : [ "src/app/main/ui/auth/login.cljs" ] }, "errors.ldap-disabled" : { "translations" : { "en" : "LDAP authentication is disabled.", - "es" : "La autheticacion via LDAP esta deshabilitada." + "es" : "La autheticacion via LDAP esta deshabilitada.", + "zh_cn" : "仅用了LDAP授权。" }, "used-in" : [ "src/app/main/ui/auth/login.cljs" ] }, @@ -887,7 +944,8 @@ "en" : "The image format is not supported (must be svg, jpg or png).", "es" : "No se reconoce el formato de imagen (debe ser svg, jpg o png).", "fr" : "Le format d’image n’est pas supporté (doit être svg, jpg ou png).", - "ru" : "Формат изображения не поддерживается (должен быть svg, jpg или png)." + "ru" : "Формат изображения не поддерживается (должен быть svg, jpg или png).", + "zh_cn" : "不支持该图片格式（只能是svg、jpg或png）。" }, "unused" : true }, @@ -897,7 +955,8 @@ "en" : "The image is too large to be inserted (must be under 5mb).", "es" : "La imagen es demasiado grande (debe tener menos de 5mb).", "fr" : "L’image est trop grande (doit être inférieure à 5 Mo).", - "ru" : "Изображение слишком большое для вставки (должно быть меньше 5mb)." + "ru" : "Изображение слишком большое для вставки (должно быть меньше 5mb).", + "zh_cn" : "图片尺寸过大，故无法插入（不能超过5MB）。" }, "used-in" : [ "src/app/main/data/workspace/persistence.cljs" ] }, @@ -907,7 +966,8 @@ "en" : "Seems that the contents of the image does not match the file extension.", "es" : "Parece que el contenido de la imagen no coincide con la etensión del archivo.", "fr" : "Il semble que le contenu de l’image ne correspond pas à l’extension de fichier.", - "ru" : "" + "ru" : "", + "zh_cn" : "图片内容好像与文件扩展名不匹配。" }, "used-in" : [ "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/media.cljs" ] }, @@ -917,7 +977,8 @@ "en" : "Seems that this is not a valid image.", "es" : "Parece que no es una imagen válida.", "fr" : "L’image ne semble pas être valide.", - "ru" : "" + "ru" : "", + "zh_cn" : "该图片好像不可用。" }, "used-in" : [ "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/media.cljs" ] }, @@ -925,7 +986,8 @@ "translations" : { "ca" : "El perfil que estàs invitant té els emails mutejats (per informes de spam o rebots alts", "en" : "The profile you inviting has emails muted (spam reports or high bounces).", - "es" : "El perfil que esta invitando tiene los emails silenciados (por reportes de spam o alto indice de rebote)." + "es" : "El perfil que esta invitando tiene los emails silenciados (por reportes de spam o alto indice de rebote).", + "zh_cn" : "你邀请的人设置了邮件免打扰（报告垃圾邮件或者多次退信）。" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -935,7 +997,8 @@ "en" : "Unable to connect to backend server.", "es" : "Ha sido imposible conectar con el servidor principal.", "fr" : "Impossible de se connecter au serveur principal.", - "ru" : "Невозможно подключиться к серверу." + "ru" : "Невозможно подключиться к серверу.", + "zh_cn" : "无法连接到后端服务器。" }, "unused" : true }, @@ -945,7 +1008,8 @@ "en" : "Confirmation password must match", "es" : "La contraseña de confirmación debe coincidir", "fr" : "Le mot de passe de confirmation doit correspondre", - "ru" : "Пароль для подтверждения должен совпадать" + "ru" : "Пароль для подтверждения должен совпадать", + "zh_cn" : "确认密码必须保持一致。" }, "used-in" : [ "src/app/main/ui/settings/password.cljs" ] }, @@ -955,7 +1019,8 @@ "en" : "Password should at least be 8 characters", "es" : "La contraseña debe tener 8 caracteres como mínimo", "fr" : "Le mot de passe doit contenir au moins 8 caractères", - "ru" : "Пароль должен быть минимум 8 символов" + "ru" : "Пароль должен быть минимум 8 символов", + "zh_cn" : "密码最少需要8位字符。" }, "used-in" : [ "src/app/main/ui/settings/password.cljs" ] }, @@ -963,7 +1028,8 @@ "translations" : { "ca" : "El teu perfil te els emails mutejats (per informes de spam o rebots alts).", "en" : "Your profile has emails muted (spam reports or high bounces).", - "es" : "Tu perfil tiene los emails silenciados (por reportes de spam o alto indice de rebote)." + "es" : "Tu perfil tiene los emails silenciados (por reportes de spam o alto indice de rebote).", + "zh_cn" : "你设置了邮件免打扰（报告垃圾邮件或者多次退信）。" }, "used-in" : [ "src/app/main/ui/auth/recovery_request.cljs", "src/app/main/ui/settings/change_email.cljs", "src/app/main/ui/dashboard/team.cljs" ] }, @@ -973,7 +1039,8 @@ "en" : "The registration is currently disabled.", "es" : "El registro está actualmente desactivado.", "fr" : "L’enregistrement est actuellement désactivé.", - "ru" : "Регистрация сейчас отключена." + "ru" : "Регистрация сейчас отключена.", + "zh_cn" : "当前禁止注册。" }, "used-in" : [ "src/app/main/ui/auth/register.cljs" ] }, @@ -983,7 +1050,8 @@ "en" : "An unexpected error occurred.", "es" : "Ha ocurrido un error inesperado.", "fr" : "Une erreur inattendue s’est produite", - "ru" : "Произошла ошибка." + "ru" : "Произошла ошибка.", + "zh_cn" : "发生了意料之外的错误。" }, "used-in" : [ "src/app/main/data/media.cljs", "src/app/main/ui/workspace/sidebar/options/exports.cljs", "src/app/main/ui/handoff/exports.cljs" ] }, @@ -991,7 +1059,8 @@ "translations" : { "ca" : "Token desconegut", "en" : "Unknown token", - "es" : "Token desconocido" + "es" : "Token desconocido", + "zh_cn" : "未知的TOKEN。" }, "used-in" : [ "src/app/main/ui/auth/verify_token.cljs" ] }, @@ -1001,7 +1070,8 @@ "en" : "Username or password seems to be wrong.", "es" : "El nombre o la contraseña parece incorrecto.", "fr" : "Le nom d’utilisateur ou le mot de passe semble être faux.", - "ru" : "Неверное имя пользователя или пароль." + "ru" : "Неверное имя пользователя или пароль.", + "zh_cn" : "用户名或密码错误。" }, "used-in" : [ "src/app/main/ui/auth/login.cljs" ] }, @@ -1011,7 +1081,8 @@ "en" : "Old password is incorrect", "es" : "La contraseña anterior no es correcta", "fr" : "L’ancien mot de passe est incorrect", - "ru" : "Старый пароль неверный" + "ru" : "Старый пароль неверный", + "zh_cn" : "旧密码不正确" }, "used-in" : [ "src/app/main/ui/settings/password.cljs" ] }, @@ -1019,7 +1090,8 @@ "translations" : { "ca" : "Uneix-te al xat.", "en" : "Join the chat", - "es" : "Unirse al chat" + "es" : "Unirse al chat", + "zh_cn" : "加入聊天" }, "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, @@ -1027,7 +1099,8 @@ "translations" : { "ca" : "Et ve de gust parlar? Xateja amb nosaltres a Gitter", "en" : "Feeling like talking? Chat with us at Gitter", - "es" : "¿Deseas conversar? Entra al nuestro chat de la comunidad en Gitter" + "es" : "¿Deseas conversar? Entra al nuestro chat de la comunidad en Gitter", + "zh_cn" : "想说两句？来Gitter和我们聊聊" }, "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, @@ -1035,7 +1108,8 @@ "translations" : { "ca" : "Descripció", "en" : "Description", - "es" : "Descripción" + "es" : "Descripción", + "zh_cn" : "描述" }, "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, @@ -1043,7 +1117,8 @@ "translations" : { "ca" : "", "en" : "Go to discussions", - "es" : "Ir a las discusiones" + "es" : "Ir a las discusiones", + "zh_cn" : "前往讨论" }, "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, @@ -1051,7 +1126,8 @@ "translations" : { "ca" : "Uneix-te al fòrum colaboratiu de Penpot.", "en" : "Join Penpot team collaborative communication forum.", - "es" : "Entra al foro colaborativo de Penpot" + "es" : "Entra al foro colaborativo de Penpot", + "zh_cn" : "加入Penpot团队协作交流论坛。" }, "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, @@ -1059,7 +1135,8 @@ "translations" : { "ca" : "Pots fer i respondre preguntes, tenir converses obertes i seguir les decisións que afecten al projecte", "en" : "You can ask and answer questions, have open-ended conversations, and follow along on decisions affecting the project.", - "es" : "" + "es" : "", + "zh_cn" : "你可以提问、回答问题，来一场开放的对话，并对影响项目的决策保持关注。" }, "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, @@ -1067,7 +1144,8 @@ "translations" : { "ca" : "", "en" : "Team discussions", - "es" : "" + "es" : "", + "zh_cn" : "团队讨论" }, "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, @@ -1075,7 +1153,8 @@ "translations" : { "ca" : "Tema", "en" : "Subject", - "es" : "Asunto" + "es" : "Asunto", + "zh_cn" : "话题" }, "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, @@ -1083,7 +1162,8 @@ "translations" : { "ca" : "Si us plau descriu la raó del teu correu, especificant si es una incidència, una idea o un dubte. Un membre del nostre equip respondrà tan aviat como pugui.", "en" : "Please describe the reason of your email, specifying if is an issue, an idea or a doubt. A member of our team will respond as soon as possible.", - "es" : "" + "es" : "", + "zh_cn" : "请描述你发来邮件的原因，详细说明这是一个问题反馈，一个点子或者一个疑问。 我们会尽快回复。" }, "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, @@ -1093,7 +1173,8 @@ "en" : "Email", "es" : "Correo electrónico", "fr" : "Adresse email", - "ru" : "Email" + "ru" : "Email", + "zh_cn" : "电子邮件" }, "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, @@ -1103,7 +1184,8 @@ "en" : "An error has occurred", "es" : "Ha ocurrido un error", "fr" : "Une erreur s’est produite", - "ru" : "Произошла ошибка" + "ru" : "Произошла ошибка", + "zh_cn" : "发生了一个错误" }, "used-in" : [ "src/app/main/ui/settings/password.cljs" ] }, @@ -1111,7 +1193,8 @@ "translations" : { "en" : "Blur", "es" : "Desenfocado", - "fr" : "Flou" + "fr" : "Flou", + "zh_cn" : "模糊" }, "used-in" : [ "src/app/main/ui/handoff/attributes/blur.cljs" ] }, @@ -1119,7 +1202,8 @@ "translations" : { "en" : "Value", "es" : "Valor", - "fr" : "Valeur" + "fr" : "Valeur", + "zh_cn" : "值" }, "used-in" : [ "src/app/main/ui/handoff/attributes/blur.cljs" ] }, @@ -1127,7 +1211,8 @@ "translations" : { "en" : "HEX", "es" : "HEX", - "fr" : "HEX" + "fr" : "HEX", + "zh_cn" : "HEX" }, "used-in" : [ "src/app/main/ui/handoff/attributes/common.cljs" ] }, @@ -1135,7 +1220,8 @@ "translations" : { "en" : "HSLA", "es" : "HSLA", - "fr" : "HSLA" + "fr" : "HSLA", + "zh_cn" : "HSLA" }, "used-in" : [ "src/app/main/ui/handoff/attributes/common.cljs" ] }, @@ -1143,7 +1229,8 @@ "translations" : { "en" : "RGBA", "es" : "RGBA", - "fr" : "RGBA" + "fr" : "RGBA", + "zh_cn" : "RGBA" }, "used-in" : [ "src/app/main/ui/handoff/attributes/common.cljs" ] }, @@ -1151,7 +1238,8 @@ "translations" : { "en" : "Fill", "es" : "Relleno", - "fr" : "Remplir" + "fr" : "Remplir", + "zh_cn" : "填充" }, "used-in" : [ "src/app/main/ui/handoff/attributes/fill.cljs" ] }, @@ -1159,7 +1247,8 @@ "translations" : { "en" : "Download source image", "es" : "Descargar imagen original", - "fr" : "Télécharger l’image source" + "fr" : "Télécharger l’image source", + "zh_cn" : "下载原图" }, "used-in" : [ "src/app/main/ui/handoff/attributes/image.cljs" ] }, @@ -1167,7 +1256,8 @@ "translations" : { "en" : "Height", "es" : "Altura", - "fr" : "Hauteur" + "fr" : "Hauteur", + "zh_cn" : "高" }, "used-in" : [ "src/app/main/ui/handoff/attributes/image.cljs" ] }, @@ -1175,7 +1265,8 @@ "translations" : { "en" : "Width", "es" : "Ancho", - "fr" : "Largeur" + "fr" : "Largeur", + "zh_cn" : "宽" }, "used-in" : [ "src/app/main/ui/handoff/attributes/image.cljs" ] }, @@ -1183,7 +1274,8 @@ "translations" : { "en" : "Layout", "es" : "Estructura", - "fr" : "Mise en page" + "fr" : "Mise en page", + "zh_cn" : "布局" }, "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ] }, @@ -1191,7 +1283,8 @@ "translations" : { "en" : "Height", "es" : "Altura", - "fr" : "Hauteur" + "fr" : "Hauteur", + "zh_cn" : "高" }, "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ] }, @@ -1199,7 +1292,8 @@ "translations" : { "en" : "Left", "es" : "Izquierda", - "fr" : "Gauche" + "fr" : "Gauche", + "zh_cn" : "左" }, "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ] }, @@ -1207,7 +1301,8 @@ "translations" : { "en" : "Radius", "es" : "Derecha", - "fr" : "Rayon" + "fr" : "Rayon", + "zh_cn" : "圆角半径" }, "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs", "src/app/main/ui/handoff/attributes/layout.cljs" ] }, @@ -1215,7 +1310,8 @@ "translations" : { "en" : "Rotation", "es" : "Rotación", - "fr" : "Rotation" + "fr" : "Rotation", + "zh_cn" : "旋转" }, "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ] }, @@ -1223,7 +1319,8 @@ "translations" : { "en" : "Top", "es" : "Arriba", - "fr" : "Haut" + "fr" : "Haut", + "zh_cn" : "顶" }, "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ] }, @@ -1231,7 +1328,8 @@ "translations" : { "en" : "Width", "es" : "Ancho", - "fr" : "Largeur" + "fr" : "Largeur", + "zh_cn" : "宽" }, "used-in" : [ "src/app/main/ui/handoff/attributes/layout.cljs" ] }, @@ -1239,7 +1337,8 @@ "translations" : { "en" : "Shadow", "es" : "Sombra", - "fr" : "Ombre" + "fr" : "Ombre", + "zh_cn" : "阴影" }, "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ] }, @@ -1247,7 +1346,8 @@ "translations" : { "en" : "B", "es" : "B", - "fr" : "B" + "fr" : "B", + "zh_cn" : "B" }, "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ] }, @@ -1255,7 +1355,8 @@ "translations" : { "en" : "X", "es" : "X", - "fr" : "X" + "fr" : "X", + "zh_cn" : "X" }, "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ] }, @@ -1263,7 +1364,8 @@ "translations" : { "en" : "Y", "es" : "Y", - "fr" : "Y" + "fr" : "Y", + "zh_cn" : "Y" }, "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ] }, @@ -1271,7 +1373,8 @@ "translations" : { "en" : "S", "es" : "S", - "fr" : "S" + "fr" : "S", + "zh_cn" : "S" }, "used-in" : [ "src/app/main/ui/handoff/attributes/shadow.cljs" ] }, @@ -1279,7 +1382,8 @@ "translations" : { "en" : "Stroke", "es" : "Borde", - "fr" : "Contour" + "fr" : "Contour", + "zh_cn" : "边框" }, "used-in" : [ "src/app/main/ui/handoff/attributes/stroke.cljs" ] }, @@ -1287,7 +1391,8 @@ "translations" : { "en" : "Dotted", "es" : "Punteado", - "fr" : "Pointillé" + "fr" : "Pointillé", + "zh_cn" : "虚线" }, "unused" : true }, @@ -1295,7 +1400,8 @@ "translations" : { "en" : "Mixed", "es" : "Mixto", - "fr" : "Mixte" + "fr" : "Mixte", + "zh_cn" : "混合" }, "unused" : true }, @@ -1303,7 +1409,8 @@ "translations" : { "en" : "None", "es" : "Ninguno", - "fr" : "Aucun" + "fr" : "Aucun", + "zh_cn" : "无" }, "unused" : true }, @@ -1311,7 +1418,8 @@ "translations" : { "en" : "Solid", "es" : "Sólido", - "fr" : "Solide" + "fr" : "Solide", + "zh_cn" : "实线" }, "unused" : true }, @@ -1319,7 +1427,8 @@ "translations" : { "en" : "Width", "es" : "Ancho", - "fr" : "Épaisseur" + "fr" : "Épaisseur", + "zh_cn" : "宽" }, "used-in" : [ "src/app/main/ui/handoff/attributes/stroke.cljs" ] }, @@ -1327,7 +1436,8 @@ "translations" : { "en" : "Typography", "es" : "Tipografía", - "fr" : "Typographie" + "fr" : "Typographie", + "zh_cn" : "文字排版" }, "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ] }, @@ -1335,7 +1445,8 @@ "translations" : { "en" : "Font Family", "es" : "Familia tipográfica", - "fr" : "Police de caractères" + "fr" : "Police de caractères", + "zh_cn" : "字体" }, "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ] }, @@ -1343,7 +1454,8 @@ "translations" : { "en" : "Font Size", "es" : "Tamaño de fuente", - "fr" : "Taille de police" + "fr" : "Taille de police", + "zh_cn" : "字号" }, "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ] }, @@ -1351,7 +1463,8 @@ "translations" : { "en" : "Font Style", "es" : "Estilo de fuente", - "fr" : "Style de police" + "fr" : "Style de police", + "zh_cn" : "文字风格" }, "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ] }, @@ -1359,7 +1472,8 @@ "translations" : { "en" : "Letter Spacing", "es" : "Espaciado de letras", - "fr" : "Interlettrage" + "fr" : "Interlettrage", + "zh_cn" : "字距" }, "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ] }, @@ -1367,7 +1481,8 @@ "translations" : { "en" : "Line Height", "es" : "Interlineado", - "fr" : "Interlignage" + "fr" : "Interlignage", + "zh_cn" : "行高" }, "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ] }, @@ -1375,7 +1490,8 @@ "translations" : { "en" : "Text Decoration", "es" : "Decoración de texto", - "fr" : "Décoration de texte" + "fr" : "Décoration de texte", + "zh_cn" : "文字装饰" }, "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ] }, @@ -1383,7 +1499,8 @@ "translations" : { "en" : "None", "es" : "Ninguna", - "fr" : "Aucune" + "fr" : "Aucune", + "zh_cn" : "无" }, "unused" : true }, @@ -1391,7 +1508,8 @@ "translations" : { "en" : "Strikethrough", "es" : "Tachar", - "fr" : "Barré" + "fr" : "Barré", + "zh_cn" : "删除线" }, "unused" : true }, @@ -1399,7 +1517,8 @@ "translations" : { "en" : "Underline", "es" : "Subrayar", - "fr" : "Soulignage" + "fr" : "Soulignage", + "zh_cn" : "下划线" }, "unused" : true }, @@ -1407,7 +1526,8 @@ "translations" : { "en" : "Text Transform", "es" : "Transformación de texto", - "fr" : "Transformation de texte" + "fr" : "Transformation de texte", + "zh_cn" : "文字变换" }, "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ] }, @@ -1415,7 +1535,8 @@ "translations" : { "en" : "Lower Case", "es" : "Minúsculas", - "fr" : "Minuscule" + "fr" : "Minuscule", + "zh_cn" : "小写" }, "unused" : true }, @@ -1423,7 +1544,8 @@ "translations" : { "en" : "None", "es" : "Ninguna", - "fr" : "Aucune" + "fr" : "Aucune", + "zh_cn" : "无" }, "unused" : true }, @@ -1431,7 +1553,8 @@ "translations" : { "en" : "Title Case", "es" : "Primera en mayúscula", - "fr" : "Premières Lettres en Capitales" + "fr" : "Premières Lettres en Capitales", + "zh_cn" : "首字母大写" }, "unused" : true }, @@ -1439,7 +1562,8 @@ "translations" : { "en" : "Upper Case", "es" : "Mayúsculas", - "fr" : "Capitales" + "fr" : "Capitales", + "zh_cn" : "大写" }, "unused" : true }, @@ -1447,7 +1571,8 @@ "translations" : { "en" : "Code", "es" : "Código", - "fr" : "Code" + "fr" : "Code", + "zh_cn" : "码" }, "used-in" : [ "src/app/main/ui/handoff/right_sidebar.cljs" ] }, @@ -1455,7 +1580,8 @@ "translations" : { "en" : "Circle", "es" : "Círculo", - "fr" : "Cercle" + "fr" : "Cercle", + "zh_cn" : "圆" }, "unused" : true }, @@ -1463,7 +1589,8 @@ "translations" : { "en" : "Curve", "es" : "Curva", - "fr" : "Courbe" + "fr" : "Courbe", + "zh_cn" : "曲线" }, "unused" : true }, @@ -1471,7 +1598,8 @@ "translations" : { "en" : "Artboard", "es" : "Mesa de trabajo", - "fr" : "Plan de travail" + "fr" : "Plan de travail", + "zh_cn" : "画板" }, "unused" : true }, @@ -1479,7 +1607,8 @@ "translations" : { "en" : "Group", "es" : "Grupo", - "fr" : "Groupe" + "fr" : "Groupe", + "zh_cn" : "编组" }, "unused" : true }, @@ -1487,7 +1616,8 @@ "translations" : { "en" : "Image", "es" : "Imagen", - "fr" : "Image" + "fr" : "Image", + "zh_cn" : "图片" }, "unused" : true }, @@ -1495,7 +1625,8 @@ "translations" : { "en" : "%s Selected", "es" : "%s Seleccionado", - "fr" : "%s Sélectionné" + "fr" : "%s Sélectionné", + "zh_cn" : "已选中%s项" }, "used-in" : [ "src/app/main/ui/handoff/right_sidebar.cljs" ] }, @@ -1503,7 +1634,8 @@ "translations" : { "en" : "Path", "es" : "Trazado", - "fr" : "Chemin" + "fr" : "Chemin", + "zh_cn" : "路径" }, "unused" : true }, @@ -1511,7 +1643,8 @@ "translations" : { "en" : "Rectangle", "es" : "Rectángulo", - "fr" : "Rectangle" + "fr" : "Rectangle", + "zh_cn" : "矩形" }, "unused" : true }, @@ -1519,7 +1652,8 @@ "translations" : { "en" : "SVG", "es" : "SVG", - "fr" : "SVG" + "fr" : "SVG", + "zh_cn" : "SVG" }, "unused" : true }, @@ -1527,7 +1661,8 @@ "translations" : { "en" : "Text", "es" : "Texto", - "fr" : "Texte" + "fr" : "Texte", + "zh_cn" : "文本" }, "unused" : true }, @@ -1535,7 +1670,8 @@ "translations" : { "en" : "Info", "es" : "Información", - "fr" : "Information" + "fr" : "Information", + "zh_cn" : "信息" }, "used-in" : [ "src/app/main/ui/handoff/right_sidebar.cljs" ] }, @@ -1544,7 +1680,8 @@ "en" : "You are seeing version %s", "es" : "Estás viendo la versión %s", "fr" : "Vous voyez la version %s", - "ru" : "Ваша версия %s" + "ru" : "Ваша версия %s", + "zh_cn" : "你正在查看%s版本" }, "unused" : true }, @@ -1554,7 +1691,8 @@ "en" : "Accept", "es" : "Aceptar", "fr" : "Accepter", - "ru" : "Принять" + "ru" : "Принять", + "zh_cn" : "接受" }, "unused" : true }, @@ -1562,7 +1700,8 @@ "translations" : { "en" : "Admin", "es" : "Administración", - "fr" : "Administration" + "fr" : "Administration", + "zh_cn" : "管理员" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs" ] }, @@ -1570,7 +1709,8 @@ "translations" : { "en" : "All", "es" : "Todo", - "fr" : "Tous" + "fr" : "Tous", + "zh_cn" : "全部" }, "used-in" : [ "src/app/main/ui/workspace/comments.cljs" ] }, @@ -1578,7 +1718,8 @@ "translations" : { "en" : "Looks like you need to wait a bit and retry; we are performing small maintenance of our servers.", "es" : "Parece que necesitas esperar un poco y volverlo a intentar; estamos realizando operaciones de mantenimiento en nuestros servidores.", - "fr" : "Il semble que vous deviez attendre un peu et réessayer ; nous effectuons une petite maintenance de nos serveurs." + "fr" : "Il semble que vous deviez attendre un peu et réessayer ; nous effectuons une petite maintenance de nos serveurs.", + "zh_cn" : "请过会儿再来试试，我们正在对服务器进行一些简单维护。" }, "used-in" : [ "src/app/main/ui/static.cljs" ] }, @@ -1586,7 +1727,8 @@ "translations" : { "en" : "Bad Gateway", "es" : "Bad Gateway", - "fr" : "Bad Gateway" + "fr" : "Bad Gateway", + "zh_cn" : "网关错误" }, "used-in" : [ "src/app/main/ui/static.cljs" ] }, @@ -1595,7 +1737,8 @@ "en" : "Cancel", "es" : "Cancelar", "fr" : "Annuler", - "ru" : "Отмена" + "ru" : "Отмена", + "zh_cn" : "取消" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -1603,7 +1746,8 @@ "translations" : { "en" : "Center", "es" : "Centrado", - "fr" : "Centré" + "fr" : "Centré", + "zh_cn" : "中心" }, "unused" : true }, @@ -1611,7 +1755,8 @@ "translations" : { "en" : "Comments", "es" : "Comentarios", - "fr" : "Commentaires" + "fr" : "Commentaires", + "zh_cn" : "评论" }, "used-in" : [ "src/app/main/ui/dashboard/comments.cljs" ] }, @@ -1620,7 +1765,8 @@ "en" : "Confirm password", "es" : "Confirmar contraseña", "fr" : "Confirmer le mot de passe", - "ru" : "Подтвердите пароль" + "ru" : "Подтвердите пароль", + "zh_cn" : "确认密码" }, "used-in" : [ "src/app/main/ui/settings/password.cljs" ] }, @@ -1628,14 +1774,16 @@ "translations" : { "en" : "Content", "es" : "Contenido", - "fr" : "Contenu" + "fr" : "Contenu", + "zh_cn" : "内容" }, "unused" : true }, "labels.create-team" : { "translations" : { "en" : "Create new team", - "es" : "Crea un nuevo equipo" + "es" : "Crea un nuevo equipo", + "zh_cn" : "创建新团队" }, "used-in" : [ "src/app/main/ui/dashboard/team_form.cljs", "src/app/main/ui/dashboard/team_form.cljs" ] }, @@ -1643,7 +1791,8 @@ "translations" : { "en" : "Dashboard", "es" : "Panel", - "fr" : "Tableau de bord" + "fr" : "Tableau de bord", + "zh_cn" : "面板" }, "used-in" : [ "src/app/main/ui/settings/sidebar.cljs" ] }, @@ -1652,7 +1801,8 @@ "en" : "Delete", "es" : "Borrar", "fr" : "Supprimer", - "ru" : "Удалить" + "ru" : "Удалить", + "zh_cn" : "删除" }, "used-in" : [ "src/app/main/ui/dashboard/grid.cljs", "src/app/main/ui/dashboard/files.cljs" ] }, @@ -1660,7 +1810,8 @@ "translations" : { "en" : "Delete comment", "es" : "Eliminar comentario", - "fr" : "Supprimer le commentaire" + "fr" : "Supprimer le commentaire", + "zh_cn" : "删除该评论" }, "used-in" : [ "src/app/main/ui/comments.cljs" ] }, @@ -1668,7 +1819,8 @@ "translations" : { "en" : "Delete thread", "es" : "Eliminar hilo", - "fr" : "Supprimer le fil" + "fr" : "Supprimer le fil", + "zh_cn" : "删除该讨论串" }, "used-in" : [ "src/app/main/ui/comments.cljs" ] }, @@ -1677,7 +1829,8 @@ "en" : "Drafts", "es" : "Borradores", "fr" : "Brouillons", - "ru" : "Черновики" + "ru" : "Черновики", + "zh_cn" : "草稿" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -1685,7 +1838,8 @@ "translations" : { "en" : "Edit", "es" : "Editar", - "fr" : "Modifier" + "fr" : "Modifier", + "zh_cn" : "编辑" }, "used-in" : [ "src/app/main/ui/comments.cljs" ] }, @@ -1693,7 +1847,8 @@ "translations" : { "en" : "Editor", "es" : "Editor", - "fr" : "Éditeur" + "fr" : "Éditeur", + "zh_cn" : "编辑者" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs" ] }, @@ -1702,21 +1857,24 @@ "en" : "Email", "es" : "Correo electrónico", "fr" : "Adresse e‑mail", - "ru" : "Email" + "ru" : "Email", + "zh_cn" : "电子邮件" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs" ] }, "labels.feedback-disabled" : { "translations" : { "en" : "Feedback disabled", - "es" : "El modulo de recepción de opiniones esta deshabilitado." + "es" : "El modulo de recepción de opiniones esta deshabilitado.", + "zh_cn" : "反馈被禁止" }, "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, "labels.feedback-sent" : { "translations" : { "en" : "Feedback sent", - "es" : "Opinión enviada" + "es" : "Opinión enviada", + "zh_cn" : "反馈已发出" }, "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, @@ -1725,7 +1883,8 @@ "en" : "Give feedback", "es" : "Danos tu opinión", "fr" : "Donnez votre avis", - "ru" : "Дать обратную связь" + "ru" : "Дать обратную связь", + "zh_cn" : "提交反馈" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/settings/sidebar.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -1733,7 +1892,8 @@ "translations" : { "en" : "Hide resolved comments", "es" : "Ocultar comentarios resueltos", - "fr" : "Masquer les commentaires résolus" + "fr" : "Masquer les commentaires résolus", + "zh_cn" : "隐藏已决定的评论" }, "used-in" : [ "src/app/main/ui/workspace/comments.cljs", "src/app/main/ui/viewer/header.cljs" ] }, @@ -1742,7 +1902,8 @@ "en" : "Icons", "es" : "Iconos", "fr" : "Icônes", - "ru" : "Иконки" + "ru" : "Иконки", + "zh_cn" : "图标" }, "unused" : true }, @@ -1751,7 +1912,8 @@ "en" : "Images", "es" : "Imágenes", "fr" : "Images", - "ru" : "Изображения" + "ru" : "Изображения", + "zh_cn" : "图片" }, "unused" : true }, @@ -1759,6 +1921,8 @@ "translations" : { "en" : "Something bad happened. Please retry the operation and if the problem persists, contact with support.", "es" : "Ha ocurrido algo extraño. Por favor, reintenta la operación, y si el problema persiste, contacta con el servicio técnico.", + "fr" : "Un problème s’est produit. Veuillez réessayer l’opération et, si le problème persiste, contacter le service technique.", + "zh_cn" : "发生了一些不妙的事。请尝试重新操作。如果问题仍然存在，请联系我们以取得支持。" "fr" : "Un problème s’est produit. Veuillez réessayer l’opération et, si le problème persiste, contacter le service technique." }, "used-in" : [ "src/app/main/ui/static.cljs" ] @@ -1767,7 +1931,8 @@ "translations" : { "en" : "Internal Error", "es" : "Error interno", - "fr" : "Erreur interne" + "fr" : "Erreur interne", + "zh_cn" : "内部错误" }, "used-in" : [ "src/app/main/ui/static.cljs" ] }, @@ -1776,7 +1941,8 @@ "en" : "Language", "es" : "Idioma", "fr" : "Langue", - "ru" : "Язык" + "ru" : "Язык", + "zh_cn" : "语言" }, "used-in" : [ "src/app/main/ui/settings/options.cljs" ] }, @@ -1785,7 +1951,8 @@ "en" : "Logout", "es" : "Salir", "fr" : "Se déconnecter", - "ru" : "Выход" + "ru" : "Выход", + "zh_cn" : "登出" }, "used-in" : [ "src/app/main/ui/settings.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -1793,7 +1960,8 @@ "translations" : { "en" : "Members", "es" : "Integrantes", - "fr" : "Membres" + "fr" : "Membres", + "zh_cn" : "成员" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -1802,7 +1970,8 @@ "en" : "Name", "es" : "Nombre", "fr" : "Nom", - "ru" : "Имя" + "ru" : "Имя", + "zh_cn" : "名字" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -1811,7 +1980,8 @@ "en" : "New password", "es" : "Nueva contraseña", "fr" : "Nouveau mot de passe", - "ru" : "Новый пароль" + "ru" : "Новый пароль", + "zh_cn" : "新密码" }, "used-in" : [ "src/app/main/ui/settings/password.cljs" ] }, @@ -1819,7 +1989,8 @@ "translations" : { "en" : "You have no pending comment notifications", "es" : "No tienes notificaciones de comentarios pendientes", - "fr" : "Vous n’avez aucune notification de commentaire en attente" + "fr" : "Vous n’avez aucune notification de commentaire en attente", + "zh_cn" : "没有待表决的评论通知" }, "used-in" : [ "src/app/main/ui/workspace/comments.cljs", "src/app/main/ui/dashboard/comments.cljs" ] }, @@ -1827,7 +1998,8 @@ "translations" : { "en" : "You’re signed in as", "es" : "Estás identificado como", - "fr" : "Vous êtes connecté en tant que" + "fr" : "Vous êtes connecté en tant que", + "zh_cn" : "你已登陆为" }, "used-in" : [ "src/app/main/ui/static.cljs" ] }, @@ -1835,7 +2007,8 @@ "translations" : { "en" : "This page might not exist or you don’t have permissions to access to it.", "es" : "Esta página no existe o no tienes permisos para verla.", - "fr" : "Cette page n’existe pas ou vous ne disposez pas des permissions nécessaires pour y accéder." + "fr" : "Cette page n’existe pas ou vous ne disposez pas des permissions nécessaires pour y accéder.", + "zh_cn" : "可能该页面不存在，也可能你没有访问权限。" }, "used-in" : [ "src/app/main/ui/static.cljs" ] }, @@ -1843,7 +2016,8 @@ "translations" : { "en" : "Oops!", "es" : "¡Huy!", - "fr" : "Oups !" + "fr" : "Oups !", + "zh_cn" : "嚯！" }, "used-in" : [ "src/app/main/ui/static.cljs" ] }, @@ -1851,7 +2025,8 @@ "translations" : { "en" : [ "1 file", "%s files" ], "es" : [ "1 archivo", "%s archivos" ], - "fr" : [ "1 fichier", "%s fichiers" ] + "fr" : [ "1 fichier", "%s fichiers" ], + "zh_cn" : [ "1 个文件", "共 %s 个文件" ] }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -1859,7 +2034,8 @@ "translations" : { "en" : [ "1 project", "%s projects" ], "es" : [ "1 proyecto", "%s proyectos" ], - "fr" : [ "1 projet", "%s projets" ] + "fr" : [ "1 projet", "%s projets" ], + "zh_cn" : [ "1 个项目", "共 %s 个项目" ] }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -1868,7 +2044,8 @@ "en" : "Old password", "es" : "Contraseña anterior", "fr" : "Ancien mot de passe", - "ru" : "Старый пароль" + "ru" : "Старый пароль", + "zh_cn" : "旧密码" }, "used-in" : [ "src/app/main/ui/settings/password.cljs" ] }, @@ -1876,7 +2053,8 @@ "translations" : { "en" : "Only yours", "es" : "Sólo los tuyos", - "fr" : "Seulement les vôtres" + "fr" : "Seulement les vôtres", + "zh_cn" : "仅你的" }, "used-in" : [ "src/app/main/ui/workspace/comments.cljs" ] }, @@ -1884,6 +2062,8 @@ "translations" : { "en" : "Owner", "es" : "Dueño", + "fr" : "Propriétaire", + "zh_cn" : "所有者" "fr" : "Propriétaire" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs" ] @@ -1893,7 +2073,8 @@ "en" : "Password", "es" : "Contraseña", "fr" : "Mot de passe", - "ru" : "Пароль" + "ru" : "Пароль", + "zh_cn" : "密码" }, "used-in" : [ "src/app/main/ui/settings/sidebar.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -1901,7 +2082,8 @@ "translations" : { "en" : "Permissions", "es" : "Permisos", - "fr" : "Permissions" + "fr" : "Permissions", + "zh_cn" : "许可" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -1910,7 +2092,8 @@ "en" : "Profile", "es" : "Perfil", "fr" : "Profil", - "ru" : "Профиль" + "ru" : "Профиль", + "zh_cn" : "个人资料" }, "used-in" : [ "src/app/main/ui/settings/sidebar.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -1919,7 +2102,8 @@ "en" : "Projects", "es" : "Proyectos", "fr" : "Projets", - "ru" : "Проекты" + "ru" : "Проекты", + "zh_cn" : "项目" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -1929,7 +2113,8 @@ "en" : "Recent", "es" : "Reciente", "fr" : "Récent", - "ru" : "Недавние" + "ru" : "Недавние", + "zh_cn" : "最近" }, "unused" : true }, @@ -1938,7 +2123,8 @@ "en" : "Remove", "es" : "Quitar", "fr" : "Retirer", - "ru" : "" + "ru" : "", + "zh_cn" : "移除" }, "used-in" : [ "src/app/main/ui/workspace/libraries.cljs", "src/app/main/ui/dashboard/team.cljs" ] }, @@ -1946,14 +2132,16 @@ "translations" : { "en" : "Rename", "es" : "Renombrar", - "fr" : "Renommer" + "fr" : "Renommer", + "zh_cn" : "重命名" }, "used-in" : [ "src/app/main/ui/dashboard/grid.cljs", "src/app/main/ui/dashboard/sidebar.cljs", "src/app/main/ui/dashboard/files.cljs" ] }, "labels.rename-team" : { "translations" : { "en" : "Rename team", - "es" : "Renomba el equipo" + "es" : "Renomba el equipo", + "zh_cn" : "重命名团队" }, "used-in" : [ "src/app/main/ui/dashboard/team_form.cljs" ] }, @@ -1961,7 +2149,8 @@ "translations" : { "en" : "Retry", "es" : "Reintentar", - "fr" : "Réessayer" + "fr" : "Réessayer", + "zh_cn" : "重试" }, "used-in" : [ "src/app/main/ui/static.cljs", "src/app/main/ui/static.cljs", "src/app/main/ui/static.cljs" ] }, @@ -1969,7 +2158,8 @@ "translations" : { "en" : "Role", "es" : "Cargo", - "fr" : "Rôle" + "fr" : "Rôle", + "zh_cn" : "角色" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -1979,21 +2169,24 @@ "en" : "Save", "es" : "Guardar", "fr" : "Enregistrer", - "ru" : "Сохранить" + "ru" : "Сохранить", + "zh_cn" : "保存" }, "unused" : true }, "labels.send" : { "translations" : { "en" : "Send", - "es" : "Enviar" + "es" : "Enviar", + "zh_cn" : "发送" }, "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, "labels.sending" : { "translations" : { "en" : "Sending...", - "es" : "Enviando..." + "es" : "Enviando...", + "zh_cn" : "正在发送…" }, "used-in" : [ "src/app/main/ui/settings/feedback.cljs" ] }, @@ -2001,7 +2194,8 @@ "translations" : { "en" : "We are in programmed maintenance of our systems.", "es" : "Estamos en una operación de mantenimiento programado de nuestros sistemas.", - "fr" : "Nous sommes en maintenance planifiée de nos systèmes." + "fr" : "Nous sommes en maintenance planifiée de nos systèmes.", + "zh_cn" : "我们正在进行系统的程序维护。" }, "used-in" : [ "src/app/main/ui/static.cljs" ] }, @@ -2009,7 +2203,8 @@ "translations" : { "en" : "Service Unavailable", "es" : "El servicio no está disponible", - "fr" : "Service non disponible" + "fr" : "Service non disponible", + "zh_cn" : "服务不可用" }, "used-in" : [ "src/app/main/ui/static.cljs" ] }, @@ -2018,7 +2213,8 @@ "en" : "Settings", "es" : "Configuración", "fr" : "Configuration", - "ru" : "Параметры" + "ru" : "Параметры", + "zh_cn" : "设置" }, "used-in" : [ "src/app/main/ui/settings/sidebar.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -2027,7 +2223,8 @@ "en" : "Shared Libraries", "es" : "Bibliotecas Compartidas", "fr" : "Bibliothèques Partagées", - "ru" : "" + "ru" : "", + "zh_cn" : "共享库" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -2035,6 +2232,8 @@ "translations" : { "en" : "Show all comments", "es" : "Mostrar todos los comentarios", + "fr" : "Afficher tous les commentaires", + "zh_cn" : "显示所有评论" "fr" : "Afficher tous les commentaires" }, "used-in" : [ "src/app/main/ui/workspace/comments.cljs", "src/app/main/ui/viewer/header.cljs" ] @@ -2043,7 +2242,8 @@ "translations" : { "en" : "Show only yours comments", "es" : "Mostrar sólo tus comentarios", - "fr" : "Afficher uniquement vos commentaires" + "fr" : "Afficher uniquement vos commentaires", + "zh_cn" : "只显示你的评论" }, "used-in" : [ "src/app/main/ui/workspace/comments.cljs", "src/app/main/ui/viewer/header.cljs" ] }, @@ -2052,7 +2252,8 @@ "en" : "Sign out", "es" : "Salir", "fr" : "Se déconnecter", - "ru" : "Выход" + "ru" : "Выход", + "zh_cn" : "登出" }, "used-in" : [ "src/app/main/ui/static.cljs" ] }, @@ -2061,14 +2262,16 @@ "en" : "Update", "es" : "Actualizar", "fr" : "Actualiser", - "ru" : "Обновить" + "ru" : "Обновить", + "zh_cn" : "更新" }, "used-in" : [ "src/app/main/ui/settings/profile.cljs" ] }, "labels.update-team" : { "translations" : { "en" : "Update team", - "es" : "Actualiza el equipo" + "es" : "Actualiza el equipo", + "zh_cn" : "更新团队" }, "used-in" : [ "src/app/main/ui/dashboard/team_form.cljs" ] }, @@ -2076,7 +2279,8 @@ "translations" : { "en" : "Viewer", "es" : "Visualizador", - "fr" : "Spectateur" + "fr" : "Spectateur", + "zh_cn" : "查看者" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -2084,7 +2288,8 @@ "translations" : { "en" : "Write new comment", "es" : "Escribir un nuevo comentario", - "fr" : "Écrire un nouveau commentaire" + "fr" : "Écrire un nouveau commentaire", + "zh_cn" : "写一条新评论" }, "used-in" : [ "src/app/main/ui/comments.cljs" ] }, @@ -2093,7 +2298,8 @@ "en" : "Loading image…", "es" : "Cargando imagen…", "fr" : "Chargement de l’image…", - "ru" : "Загружаю изображение…" + "ru" : "Загружаю изображение…", + "zh_cn" : "正在加载图片…" }, "used-in" : [ "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/media.cljs" ] }, @@ -2102,7 +2308,8 @@ "en" : "Add as Shared Library", "es" : "Añadir como Biblioteca Compartida", "fr" : "Ajouter comme Bibliothèque Partagée", - "ru" : "" + "ru" : "", + "zh_cn" : "添加为共享库" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ] }, @@ -2111,7 +2318,8 @@ "en" : "Once added as Shared Library, the assets of this file library will be available to be used among the rest of your files.", "es" : "Una vez añadido como Biblioteca Compartida, los recursos de este archivo estarán disponibles para ser usado por el resto de tus archivos.", "fr" : "Une fois ajoutées en tant que Bibliothèque Partagée, les ressources de cette bibliothèque de fichiers seront disponibles pour être utilisées parmi le reste de vos fichiers.", - "ru" : "" + "ru" : "", + "zh_cn" : "一旦添加为共享库，此文件库中的素材就可被用于你的其他文件。" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ] }, @@ -2120,7 +2328,8 @@ "en" : "Add “%s” as Shared Library", "es" : "Añadir “%s” como Biblioteca Compartida", "fr" : "Ajouter « %s » comme Bibliothèque Partagée", - "ru" : "" + "ru" : "", + "zh_cn" : "将“%s”添加为共享库" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ] }, @@ -2129,7 +2338,8 @@ "en" : "Verify new email", "es" : "Verificar el nuevo correo", "fr" : "Vérifier la nouvelle adresse e‑mail", - "ru" : "Подтвердить новый email адрес" + "ru" : "Подтвердить новый email адрес", + "zh_cn" : "验证新的邮件" }, "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ] }, @@ -2138,7 +2348,8 @@ "en" : "We'll send you an email to your current email “%s” to verify your identity.", "es" : "Enviaremos un mensaje a tu correo actual “%s” para verificar tu identidad.", "fr" : "Nous enverrons un e‑mail à votre adresse actuelle « %s » pour vérifier votre identité.", - "ru" : "Мы отправим письмо для подтверждения подлиности на текущий email адрес “%s”." + "ru" : "Мы отправим письмо для подтверждения подлиности на текущий email адрес “%s”.", + "zh_cn" : "我们会发送一封信的邮件到当前的电子邮件“%s”，以验证你的身份。" }, "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ] }, @@ -2147,7 +2358,8 @@ "en" : "New email", "es" : "Nuevo correo", "fr" : "Nouvel e‑mail", - "ru" : "Новый email адрес" + "ru" : "Новый email адрес", + "zh_cn" : "新电子邮件" }, "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ] }, @@ -2156,7 +2368,8 @@ "en" : "Change email", "es" : "Cambiar correo", "fr" : "Changer adresse e‑mail", - "ru" : "Сменить email адрес" + "ru" : "Сменить email адрес", + "zh_cn" : "修改点子邮件" }, "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ] }, @@ -2165,7 +2378,8 @@ "en" : "Change your email", "es" : "Cambiar tu correo", "fr" : "Changez votre adresse e‑mail", - "ru" : "Сменить email адрес" + "ru" : "Сменить email адрес", + "zh_cn" : "修改你的电子邮件" }, "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ] }, @@ -2174,7 +2388,8 @@ "en" : "Cancel and keep my account", "es" : "Cancelar y mantener mi cuenta", "fr" : "Annuler et conserver mon compte", - "ru" : "Отменить и сохранить мой аккаунт" + "ru" : "Отменить и сохранить мой аккаунт", + "zh_cn" : "取消操作并保留我的账号" }, "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ] }, @@ -2183,7 +2398,8 @@ "en" : "Yes, delete my account", "es" : "Si, borrar mi cuenta", "fr" : "Oui, supprimer mon compte", - "ru" : "Да, удалить мой аккаунт" + "ru" : "Да, удалить мой аккаунт", + "zh_cn" : "是的，删除我的账号" }, "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ] }, From 62784d070894eee53626f9f1975a032035b83285 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 24 Feb 2021 14:54:18 +0100 Subject: [PATCH 71/90] :bug: Fix syntax error on locales.json. --- frontend/resources/locales.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/frontend/resources/locales.json b/frontend/resources/locales.json index e70cca208..f9a951ae8 100644 --- a/frontend/resources/locales.json +++ b/frontend/resources/locales.json @@ -1923,7 +1923,6 @@ "es" : "Ha ocurrido algo extraño. Por favor, reintenta la operación, y si el problema persiste, contacta con el servicio técnico.", "fr" : "Un problème s’est produit. Veuillez réessayer l’opération et, si le problème persiste, contacter le service technique.", "zh_cn" : "发生了一些不妙的事。请尝试重新操作。如果问题仍然存在，请联系我们以取得支持。" - "fr" : "Un problème s’est produit. Veuillez réessayer l’opération et, si le problème persiste, contacter le service technique." }, "used-in" : [ "src/app/main/ui/static.cljs" ] }, @@ -2064,7 +2063,6 @@ "es" : "Dueño", "fr" : "Propriétaire", "zh_cn" : "所有者" - "fr" : "Propriétaire" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs", "src/app/main/ui/dashboard/team.cljs" ] }, @@ -2234,7 +2232,6 @@ "es" : "Mostrar todos los comentarios", "fr" : "Afficher tous les commentaires", "zh_cn" : "显示所有评论" - "fr" : "Afficher tous les commentaires" }, "used-in" : [ "src/app/main/ui/workspace/comments.cljs", "src/app/main/ui/viewer/header.cljs" ] }, From 85781c5b7f37be7d11652fbac6fc6939a05dae93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Moya?= Date: Wed, 24 Feb 2021 15:16:16 +0100 Subject: [PATCH 72/90] :bug: Remove unused local fonts --- CHANGES.md | 1 + frontend/resources/locales.json | 14 +++++++++ frontend/src/app/main/fonts.cljs | 30 ------------------- .../workspace/sidebar/options/typography.cljs | 8 ++--- 4 files changed, 19 insertions(+), 34 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 072d37e4a..9232b12a4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -35,6 +35,7 @@ - Fix errors on onboarding file [Taiga #1287](https://tree.taiga.io/project/penpot/issue/1287) - Fix infinite recursion on logout. - Fix issues with frame selection [Taiga #1300](https://tree.taiga.io/project/penpot/issue/1300), [Taiga #1255](https://tree.taiga.io/project/penpot/issue/1255) +- Fix local fonts error [#691](https://github.com/penpot/penpot/issues/691) - Fix problem width handoff code generation [Taiga #1204](https://tree.taiga.io/project/penpot/issue/1204) - Fix problem with indices refreshing on page changes [#646](https://github.com/penpot/penpot/issues/646) - Have language change notification written in the new language [Taiga #1205](https://tree.taiga.io/project/penpot/issue/1205) diff --git a/frontend/resources/locales.json b/frontend/resources/locales.json index f9a951ae8..c73c7388b 100644 --- a/frontend/resources/locales.json +++ b/frontend/resources/locales.json @@ -4244,6 +4244,13 @@ }, "unused" : true }, + "workspace.options.text-options.google" : { + "translations" : { + "en" : "Google", + "es" : "Google" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] + }, "workspace.options.text-options.grow-auto-height" : { "translations" : { "en" : "Auto height", @@ -4304,6 +4311,13 @@ }, "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs", "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] }, + "workspace.options.text-options.preset" : { + "translations" : { + "en" : "Preset", + "es" : "Predefinidos" + }, + "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] + }, "workspace.options.text-options.strikethrough" : { "translations" : { "en" : "Strikethrough", diff --git a/frontend/src/app/main/fonts.cljs b/frontend/src/app/main/fonts.cljs index 61e704537..209350233 100644 --- a/frontend/src/app/main/fonts.cljs +++ b/frontend/src/app/main/fonts.cljs @@ -41,36 +41,6 @@ {:id "bold" :name "bold" :weight "bold" :style "normal"} {:id "bolditalic" :name "bold (italic)" :weight "bold" :style "italic"} {:id "black" :name "black" :weight "900" :style "normal"} - {:id "blackitalic" :name "black (italic)" :weight "900" :style "italic"}]} - {:id "roboto" - :family "roboto" - :name "Roboto" - :variants [{:id "100" :name "100" :weight "100" :style "normal"} - {:id "100italic" :name "100 (italic)" :weight "100" :style "italic"} - {:id "200" :name "200" :weight "200" :style "normal"} - {:id "200italic" :name "200 (italic)" :weight "200" :style "italic"} - {:id "regular" :name "regular" :weight "400" :style "normal"} - {:id "italic" :name "italic" :weight "400" :style "italic"} - {:id "500" :name "500" :weight "500" :style "normal"} - {:id "500italic" :name "500 (italic)" :weight "500" :style "italic"} - {:id "bold" :name "bold" :weight "bold" :style "normal"} - {:id "bolditalic" :name "bold (italic)" :weight "bold" :style "italic"} - {:id "black" :name "black" :weight "900" :style "normal"} - {:id "blackitalic" :name "black (italic)" :weight "900" :style "italic"}]} - {:id "robotocondensed" - :family "robotocondensed" - :name "Roboto Condensed" - :variants [{:id "100" :name "100" :weight "100" :style "normal"} - {:id "100italic" :name "100 (italic)" :weight "100" :style "italic"} - {:id "200" :name "200" :weight "200" :style "normal"} - {:id "200italic" :name "200 (italic)" :weight "200" :style "italic"} - {:id "regular" :name "regular" :weight "400" :style "normal"} - {:id "italic" :name "italic" :weight "400" :style "italic"} - {:id "500" :name "500" :weight "500" :style "normal"} - {:id "500italic" :name "500 (italic)" :weight "500" :style "italic"} - {:id "bold" :name "bold" :weight "bold" :style "normal"} - {:id "bolditalic" :name "bold (italic)" :weight "bold" :style "italic"} - {:id "black" :name "black" :weight "900" :style "normal"} {:id "blackitalic" :name "black (italic)" :weight "900" :style "italic"}]}]) (defonce fontsdb (l/atom {})) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/typography.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/typography.cljs index a9ec6087f..6f4632aac 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/typography.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/typography.cljs @@ -32,14 +32,14 @@ (mf/defc font-select-optgroups {::mf/wrap [mf/memo]} - [] + [{:keys [locale] :as props}] [:* - [:optgroup {:label "Local"} + [:optgroup {:label (t locale "workspace.options.text-options.preset")} (for [font fonts/local-fonts] [:option {:value (:id font) :key (:id font)} (:name font)])] - [:optgroup {:label "Google"} + [:optgroup {:label (t locale "workspace.options.text-options.google")} (for [font (fonts/resolve-fonts :google)] [:option {:value (:id font) :key (:id font)} @@ -97,7 +97,7 @@ :on-change on-font-family-change} (when (= font-id :multiple) [:option {:value ""} (t locale "settings.multiple")]) - [:& font-select-optgroups]]] + [:& font-select-optgroups {:locale locale}]]] [:div.row-flex (let [size-options [8 9 10 11 12 14 18 24 36 48 72] From e3727aaefe5396cd4799ce0a3720d4f21c291b1a Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 24 Feb 2021 16:22:54 +0100 Subject: [PATCH 73/90] :tada: Add onboarding data to the database. --- backend/src/app/config.clj | 42 +++--- backend/src/app/db.clj | 5 - backend/src/app/db/profile_initial_data.clj | 117 --------------- backend/src/app/migrations.clj | 3 + .../sql/0050-mod-server-prop-table.sql | 4 + backend/src/app/rpc/mutations/demo.clj | 6 +- backend/src/app/rpc/mutations/profile.clj | 7 +- backend/src/app/setup.clj | 19 ++- backend/src/app/setup/initial_data.clj | 137 ++++++++++++++++++ backend/src/app/srepl/main.clj | 22 --- 10 files changed, 183 insertions(+), 179 deletions(-) delete mode 100644 backend/src/app/db/profile_initial_data.clj create mode 100644 backend/src/app/migrations/sql/0050-mod-server-prop-table.sql create mode 100644 backend/src/app/setup/initial_data.clj diff --git a/backend/src/app/config.clj b/backend/src/app/config.clj index 742b20727..b78e49fbf 100644 --- a/backend/src/app/config.clj +++ b/backend/src/app/config.clj @@ -76,8 +76,8 @@ :ldap-attrs-fullname "cn" :ldap-attrs-photo "jpegPhoto" - ;; :initial-data-file "resources/initial-data.json" - ;; :initial-data-project-name "Penpot Oboarding" + ;; a server prop key where initial project is stored. + :initial-project-skey "initial-project" }) (s/def ::allow-demo-users ::us/boolean) @@ -103,8 +103,7 @@ (s/def ::http-session-idle-max-age ::dt/duration) (s/def ::http-session-updater-batch-max-age ::dt/duration) (s/def ::http-session-updater-batch-max-size ::us/integer) -(s/def ::initial-data-file ::us/string) -(s/def ::initial-data-project-name ::us/string) +(s/def ::initial-project-skey ::us/string) (s/def ::ldap-attrs-email ::us/string) (s/def ::ldap-attrs-fullname ::us/string) (s/def ::ldap-attrs-photo ::us/string) @@ -161,8 +160,8 @@ ::database-username ::default-blob-version ::error-report-webhook - ::feedback-enabled ::feedback-destination + ::feedback-enabled ::github-client-id ::github-client-secret ::gitlab-base-uri @@ -170,33 +169,37 @@ ::gitlab-client-secret ::google-client-id ::google-client-secret + ::host ::http-server-port + ::http-session-idle-max-age ::http-session-updater-batch-max-age ::http-session-updater-batch-max-size - ::http-session-idle-max-age - ::host - ::ldap-attrs-username + ::initial-project-skey ::ldap-attrs-email ::ldap-attrs-fullname ::ldap-attrs-photo + ::ldap-attrs-username + ::ldap-base-dn ::ldap-bind-dn ::ldap-bind-password - ::ldap-base-dn ::ldap-host ::ldap-port ::ldap-ssl ::ldap-starttls ::ldap-user-query - ::public-uri - ::profile-complaint-threshold + ::local-assets-uri + ::loggers-loki-uri + ::loggers-zmq-uri + ::profile-bounce-max-age ::profile-bounce-threshold ::profile-complaint-max-age - ::profile-bounce-max-age + ::profile-complaint-threshold + ::public-uri ::redis-uri ::registration-domain-whitelist ::registration-enabled - ::rlimits-password ::rlimits-image + ::rlimits-password ::smtp-default-from ::smtp-default-reply-to ::smtp-enabled @@ -206,23 +209,18 @@ ::smtp-ssl ::smtp-tls ::smtp-username - ::storage-backend - ::storage-fs-directory ::srepl-host ::srepl-port - ::local-assets-uri - ::loggers-loki-uri - ::loggers-zmq-uri + ::storage-backend + ::storage-fs-directory ::storage-s3-bucket ::storage-s3-region ::telemetry-enabled - ::telemetry-with-taiga ::telemetry-server-enabled ::telemetry-server-port ::telemetry-uri - ::tenant - ::initial-data-file - ::initial-data-project-name])) + ::telemetry-with-taiga + ::tenant])) (defn- env->config [env] diff --git a/backend/src/app/db.clj b/backend/src/app/db.clj index 6b25433af..73026bae7 100644 --- a/backend/src/app/db.clj +++ b/backend/src/app/db.clj @@ -200,11 +200,6 @@ (sql/insert table params opts) (assoc opts :return-keys true)))) -(defn insert-multi! - [ds table param-list] - (doseq [params param-list] - (insert! ds table params))) - (defn update! ([ds table params where] (update! ds table params where nil)) ([ds table params where opts] diff --git a/backend/src/app/db/profile_initial_data.clj b/backend/src/app/db/profile_initial_data.clj deleted file mode 100644 index 0d810ee25..000000000 --- a/backend/src/app/db/profile_initial_data.clj +++ /dev/null @@ -1,117 +0,0 @@ -;; This Source Code Form is subject to the terms of the Mozilla Public -;; License, v. 2.0. If a copy of the MPL was not distributed with this -;; file, You can obtain one at http://mozilla.org/MPL/2.0/. -;; -;; This Source Code Form is "Incompatible With Secondary Licenses", as -;; defined by the Mozilla Public License, v. 2.0. -;; -;; Copyright (c) 2020-2021 UXBOX Labs SL - -(ns app.db.profile-initial-data - (:require - [app.common.uuid :as uuid] - [app.config :as cfg] - [app.db :as db] - [app.rpc.mutations.projects :as projects] - [app.util.transit :as tr] - [clojure.java.io :as io] - [datoteka.core :as fs])) - -(def sql:file - "select * from file where project_id = ?") - -(def sql:file-library-rel - "with file_ids as (select id from file where project_id = ?) - select * - from file_library_rel - where file_id in (select id from file_ids)") - -(def sql:file-media-object - "with file_ids as (select id from file where project_id = ?) - select * - from file_media_object - where file_id in (select id from file_ids)") - -(defn change-ids - "Given a collection and a map from ID to ID. Changes all the `keys` properties - so they point to the new ID existing in `map-ids`" - [map-ids coll keys] - (let [generate-id - (fn [map-ids {:keys [id]}] - (assoc map-ids id (uuid/next))) - - remap-key - (fn [obj map-ids key] - (cond-> obj - (contains? obj key) - (assoc key (get map-ids (get obj key) (get obj key))))) - - change-id - (fn [map-ids obj] - (reduce #(remap-key %1 map-ids %2) obj keys)) - - new-map-ids (reduce generate-id map-ids coll)] - - [new-map-ids (map (partial change-id new-map-ids) coll)])) - -(defn create-initial-data-dump - [conn project-id output-path] - (let [ ;; Retrieve data from templates - opath (fs/path output-path) - file (db/exec! conn [sql:file, project-id]) - file-library-rel (db/exec! conn [sql:file-library-rel, project-id]) - file-media-object (db/exec! conn [sql:file-media-object, project-id]) - - data {:file file - :file-library-rel file-library-rel - :file-media-object file-media-object}] - (with-open [output (io/output-stream opath)] - (tr/encode-stream data output) - nil))) - -(defn read-initial-data - [path] - (when (fs/exists? path) - (with-open [input (io/input-stream (fs/path path))] - (tr/decode-stream input)))) - -(defn create-profile-initial-data - ([conn profile] - (when-let [initial-data-path (:initial-data-file cfg/config)] - (create-profile-initial-data conn initial-data-path profile))) - - ([conn file profile] - (when-let [{:keys [file file-library-rel file-media-object]} (read-initial-data file)] - (let [sample-project-name (:initial-data-project-name cfg/config "Penpot Onboarding") - - proj (projects/create-project conn {:profile-id (:id profile) - :team-id (:default-team-id profile) - :name sample-project-name}) - - map-ids {} - - ;; Create new ID's and change the references - [map-ids file] (change-ids map-ids file #{:id}) - [map-ids file-library-rel] (change-ids map-ids file-library-rel #{:file-id :library-file-id}) - [_ file-media-object] (change-ids map-ids file-media-object #{:id :file-id :media-id :thumbnail-id}) - - file (map #(assoc % :project-id (:id proj)) file) - file-profile-rel (map #(array-map :file-id (:id %) - :profile-id (:id profile) - :is-owner true - :is-admin true - :can-edit true) - file)] - - (projects/create-project-profile conn {:project-id (:id proj) - :profile-id (:id profile)}) - - (projects/create-team-project-profile conn {:team-id (:default-team-id profile) - :project-id (:id proj) - :profile-id (:id profile)}) - - ;; Re-insert into the database - (db/insert-multi! conn :file file) - (db/insert-multi! conn :file-profile-rel file-profile-rel) - (db/insert-multi! conn :file-library-rel file-library-rel) - (db/insert-multi! conn :file-media-object file-media-object))))) diff --git a/backend/src/app/migrations.clj b/backend/src/app/migrations.clj index 9afa129bf..4b329d2eb 100644 --- a/backend/src/app/migrations.clj +++ b/backend/src/app/migrations.clj @@ -160,6 +160,9 @@ {:name "0049-mod-http-session-table" :fn (mg/resource "app/migrations/sql/0049-mod-http-session-table.sql")} + + {:name "0050-mod-server-prop-table" + :fn (mg/resource "app/migrations/sql/0050-mod-server-prop-table.sql")} ]) diff --git a/backend/src/app/migrations/sql/0050-mod-server-prop-table.sql b/backend/src/app/migrations/sql/0050-mod-server-prop-table.sql new file mode 100644 index 000000000..11f8d140e --- /dev/null +++ b/backend/src/app/migrations/sql/0050-mod-server-prop-table.sql @@ -0,0 +1,4 @@ +ALTER TABLE server_prop + ADD COLUMN preload boolean DEFAULT false; + +UPDATE server_prop SET preload = true; diff --git a/backend/src/app/rpc/mutations/demo.clj b/backend/src/app/rpc/mutations/demo.clj index b7ce34695..80658a5da 100644 --- a/backend/src/app/rpc/mutations/demo.clj +++ b/backend/src/app/rpc/mutations/demo.clj @@ -5,7 +5,7 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020-2021 UXBOX Labs SL (ns app.rpc.mutations.demo "A demo specific mutations." @@ -14,8 +14,8 @@ [app.common.uuid :as uuid] [app.config :as cfg] [app.db :as db] - [app.db.profile-initial-data :refer [create-profile-initial-data]] [app.rpc.mutations.profile :as profile] + [app.setup.initial-data :as sid] [app.tasks :as tasks] [app.util.services :as sv] [buddy.core.codecs :as bc] @@ -48,7 +48,7 @@ (db/with-atomic [conn pool] (->> (#'profile/create-profile conn params) (#'profile/create-profile-relations conn) - (create-profile-initial-data conn)) + (sid/load-initial-project! conn)) ;; Schedule deletion of the demo profile (tasks/submit! conn {:name "delete-profile" diff --git a/backend/src/app/rpc/mutations/profile.clj b/backend/src/app/rpc/mutations/profile.clj index 28f4823dc..40914de57 100644 --- a/backend/src/app/rpc/mutations/profile.clj +++ b/backend/src/app/rpc/mutations/profile.clj @@ -14,12 +14,12 @@ [app.common.uuid :as uuid] [app.config :as cfg] [app.db :as db] - [app.db.profile-initial-data :refer [create-profile-initial-data]] [app.emails :as emails] [app.media :as media] [app.rpc.mutations.projects :as projects] [app.rpc.mutations.teams :as teams] [app.rpc.queries.profile :as profile] + [app.setup.initial-data :as sid] [app.storage :as sto] [app.tasks :as tasks] [app.util.services :as sv] @@ -81,7 +81,8 @@ (let [profile (->> (create-profile conn params) (create-profile-relations conn)) profile (assoc profile ::created true)] - (create-profile-initial-data conn profile) + + (sid/load-initial-project! conn profile) (if-let [token (:invitation-token params)] ;; If invitation token comes in params, this is because the @@ -309,7 +310,7 @@ (register-profile [conn params] (let [profile (->> (create-profile conn params) (create-profile-relations conn))] - (create-profile-initial-data conn profile) + (sid/load-initial-project! conn profile) (assoc profile ::created true)))] (let [profile (profile/retrieve-profile-data-by-email conn email) diff --git a/backend/src/app/setup.clj b/backend/src/app/setup.clj index 3dbbab6d7..21853d79b 100644 --- a/backend/src/app/setup.clj +++ b/backend/src/app/setup.clj @@ -37,20 +37,25 @@ (let [key (-> (bn/random-bytes 64) (bc/bytes->b64u) (bc/bytes->str))] - (db/exec-one! conn ["insert into server_prop (id, content) - values ('secret-key', ?) on conflict do nothing" - (db/tjson key)]))) + (db/insert! conn :server-prop + {:id "secret-key" + :preload true + :content (db/tjson key)} + {:on-conflict-do-nothing true}))) (defn- initialize-instance-id! [{:keys [conn] :as cfg}] (let [iid (uuid/random)] - (db/exec-one! conn ["insert into server_prop (id, content) - values ('instance-id', ?::jsonb) on conflict do nothing" - (db/tjson iid)]))) + + (db/insert! conn :server-prop + {:id "instance-id" + :preload true + :content (db/tjson iid)} + {:on-conflict-do-nothing true}))) (defn- retrieve-all [{:keys [conn] :as cfg}] (reduce (fn [acc row] (assoc acc (keyword (:id row)) (db/decode-transit-pgobject (:content row)))) {} - (db/exec! conn ["select * from server_prop;"]))) + (db/query conn :server-prop {:preload true}))) diff --git a/backend/src/app/setup/initial_data.clj b/backend/src/app/setup/initial_data.clj new file mode 100644 index 000000000..6fd93ee39 --- /dev/null +++ b/backend/src/app/setup/initial_data.clj @@ -0,0 +1,137 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2021 UXBOX Labs SL + +(ns app.setup.initial-data + (:refer-clojure :exclude [load]) + (:require + [app.common.uuid :as uuid] + [app.config :as cfg] + [app.db :as db] + [app.rpc.mutations.projects :as projects] + [app.rpc.queries.profile :as profile])) + +;; --- DUMP GENERATION + +(def sql:file + "select * from file where project_id = ?") + +(def sql:file-library-rel + "with file_ids as (select id from file where project_id = ?) + select * + from file_library_rel + where file_id in (select id from file_ids)") + +(def sql:file-media-object + "with file_ids as (select id from file where project_id = ?) + select * + from file_media_object + where file_id in (select id from file_ids)") + +(defn dump + ([system project-id] (dump system project-id nil)) + ([system project-id {:keys [skey project-name] + :or {project-name "Penpot Onboarding"}}] + (db/with-atomic [conn (:app.db/pool system)] + (let [skey (or skey (cfg/get :initial-project-skey)) + file (db/exec! conn [sql:file project-id]) + file-library-rel (db/exec! conn [sql:file-library-rel project-id]) + file-media-object (db/exec! conn [sql:file-media-object project-id]) + data {:project-name project-name + :file file + :file-library-rel file-library-rel + :file-media-object file-media-object}] + + (db/delete! conn :server-prop + {:id skey}) + (db/insert! conn :server-prop + {:id skey + :preload false + :content (db/tjson data)}) + nil)))) + + +;; --- DUMP LOADING + +(defn- remap-ids + "Given a collection and a map from ID to ID. Changes all the `keys` + properties so they point to the new ID existing in `map-ids`" + [map-ids coll keys] + (let [generate-id + (fn [map-ids {:keys [id]}] + (assoc map-ids id (uuid/next))) + + remap-key + (fn [obj map-ids key] + (cond-> obj + (contains? obj key) + (assoc key (get map-ids (get obj key) (get obj key))))) + + change-id + (fn [map-ids obj] + (reduce #(remap-key %1 map-ids %2) obj keys)) + + new-map-ids (reduce generate-id map-ids coll)] + + [new-map-ids (map (partial change-id new-map-ids) coll)])) + +(defn- retrieve-data + [conn skey] + (when-let [row (db/exec-one! conn ["select content from server_prop where id = ?" skey])] + (when-let [content (:content row)] + (when (db/pgobject? content) + (db/decode-transit-pgobject content))))) + +(defn load-initial-project! + ([conn profile] (load-initial-project! conn profile nil)) + ([conn profile opts] + (let [skey (or (:skey opts) (cfg/get :initial-project-skey)) + data (retrieve-data conn skey)] + (when data + (let [project (projects/create-project conn {:profile-id (:id profile) + :team-id (:default-team-id profile) + :name (:project-name data)}) + + map-ids {} + + [map-ids file] (remap-ids map-ids (:file data) #{:id}) + [map-ids file-library-rel] (remap-ids map-ids (:file-library-rel data) #{:file-id :library-file-id}) + [_ file-media-object] (remap-ids map-ids (:file-media-object data) #{:id :file-id :media-id :thumbnail-id}) + + file (map #(assoc % :project-id (:id project)) file) + file-profile-rel (map #(array-map :file-id (:id %) + :profile-id (:id profile) + :is-owner true + :is-admin true + :can-edit true) + file)] + + (projects/create-project-profile conn {:project-id (:id project) + :profile-id (:id profile)}) + + (projects/create-team-project-profile conn {:team-id (:default-team-id profile) + :project-id (:id project) + :profile-id (:id profile)}) + + ;; Re-insert into the database + (doseq [params file] + (db/insert! conn :file params)) + (doseq [params file-profile-rel] + (db/insert! conn :file-profile-rel params)) + (doseq [params file-library-rel] + (db/insert! conn :file-library-rel params)) + (doseq [params file-media-object] + (db/insert! conn :file-media-object params))))))) + +(defn load + [system {:keys [email] :as opts}] + (db/with-atomic [conn (:app.db/pool system)] + (when-let [profile (profile/retrieve-profile-data-by-email conn email)] + (load-initial-project! conn profile opts) + true))) + diff --git a/backend/src/app/srepl/main.clj b/backend/src/app/srepl/main.clj index c626a6def..8dd2cf197 100644 --- a/backend/src/app/srepl/main.clj +++ b/backend/src/app/srepl/main.clj @@ -6,7 +6,6 @@ [app.common.pages.migrations :as pmg] [app.config :as cfg] [app.db :as db] - [app.db.profile-initial-data :as pid] [app.main :refer [system]] [app.rpc.queries.profile :as prof] [app.srepl.dev :as dev] @@ -53,27 +52,6 @@ ;; (fn [{:keys [data] :as file}] ;; (update-in data [:pages-index #uuid "878278c0-3ef0-11eb-9d67-8551e7624f43" :objects] dissoc nil)))) -(def default-project-id #uuid "5761a890-3b81-11eb-9e7d-556a2f641513") - -(defn initial-data-dump - ([system file] (initial-data-dump system default-project-id file)) - ([system project-id path] - (db/with-atomic [conn (:app.db/pool system)] - (pid/create-initial-data-dump conn project-id path)))) - -(defn load-data-into-user - ([system user-email] - (if-let [file (:initial-data-file cfg/config)] - (load-data-into-user system file user-email) - (prn "Data file not found in configuration"))) - - ([system file user-email] - (db/with-atomic [conn (:app.db/pool system)] - (let [profile (prof/retrieve-profile-data-by-email conn user-email) - profile (merge profile (prof/retrieve-additional-data conn (:id profile)))] - (pid/create-profile-initial-data conn file profile))))) - - ;; Migrate (defn update-file-data-blob-format From cef03536420ab130a7f6fd59fc9ba76a237a528e Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 24 Feb 2021 17:30:06 +0100 Subject: [PATCH 74/90] :bug: Fix wrong permission check on removing member of team. --- backend/src/app/rpc/mutations/teams.clj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/app/rpc/mutations/teams.clj b/backend/src/app/rpc/mutations/teams.clj index d845775f1..b7a8eaaa2 100644 --- a/backend/src/app/rpc/mutations/teams.clj +++ b/backend/src/app/rpc/mutations/teams.clj @@ -146,7 +146,7 @@ nil))) -;; --- Mutation: Tean Update Role +;; --- Mutation: Team Update Role (declare retrieve-team-member) (declare role->params) @@ -218,7 +218,7 @@ :viewer {:is-owner false :is-admin false :can-edit false})) -;; --- Mutation: Team Update Role +;; --- Mutation: Delete Team Member (s/def ::delete-team-member (s/keys :req-un [::profile-id ::team-id ::member-id])) @@ -227,8 +227,8 @@ [{:keys [pool] :as cfg} {:keys [team-id profile-id member-id] :as params}] (db/with-atomic [conn pool] (let [perms (teams/check-read-permissions! conn profile-id team-id)] - (when-not (or (:is-owner perms) - (:is-admin perms)) + (when-not (or (some :is-owner perms) + (some :is-admin perms)) (ex/raise :type :validation :code :insufficient-permissions)) From 8fb5dbb980c286e75b3654525351ab9b97d35fb9 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 24 Feb 2021 18:03:34 +0100 Subject: [PATCH 75/90] :bug: Fix fullname handling on manage cli command. --- backend/src/app/cli/manage.clj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/app/cli/manage.clj b/backend/src/app/cli/manage.clj index a3c26d457..36093375e 100644 --- a/backend/src/app/cli/manage.clj +++ b/backend/src/app/cli/manage.clj @@ -108,7 +108,8 @@ ;; An option with a required argument [["-u" "--email EMAIL" "Email Address"] ["-p" "--password PASSWORD" "Password"] - ["-n" "--name FULLNAME" "Full Name"] + ["-n" "--name FULLNAME" "Full Name" + :id :fullname] ["-v" nil "Verbosity level" :id :verbosity :default 1 From ecd020eec26ef0527752d49e1469f1724c403307 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Thu, 25 Feb 2021 17:07:42 +0100 Subject: [PATCH 76/90] :bug: Disables filters in masking elements --- CHANGES.md | 1 + frontend/src/app/main/ui/shapes/mask.cljs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 9232b12a4..a1e53635b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -29,6 +29,7 @@ - Add more improvements to french translation strings [#591](https://github.com/penpot/penpot/pull/591) - Add some missing database indexes (mainly improves performance on large databases on file-update rpc method, and some background tasks). +- Disables filters in masking elements (problem with Firefox rendering) - Drawing tool will have priority over resize/rotate handlers [Taiga #1225](https://tree.taiga.io/project/penpot/issue/1225) - Fix broken bounding box on editing paths [Taiga #1254](https://tree.taiga.io/project/penpot/issue/1254) - Fix corner cases on invitation/signup flows. diff --git a/frontend/src/app/main/ui/shapes/mask.cljs b/frontend/src/app/main/ui/shapes/mask.cljs index 3f59e1740..fab611fd3 100644 --- a/frontend/src/app/main/ui/shapes/mask.cljs +++ b/frontend/src/app/main/ui/shapes/mask.cljs @@ -32,5 +32,6 @@ :result "comp"}]] [:mask {:id (str (:id mask) "-mask")} [:g {:filter (str/fmt "url(#%s)" (str (:id mask) "-filter"))} - [:& shape-wrapper {:frame frame :shape mask}]]]]))) + [:& shape-wrapper {:frame frame :shape (-> mask + (dissoc :shadow :blur))}]]]]))) From 645954bc7c12be0d1d80bd050f392b62fac7679a Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 25 Feb 2021 17:45:39 +0100 Subject: [PATCH 77/90] :bug: Fix issues on files and project rpc methods. --- backend/src/app/rpc/mutations/files.clj | 1 + backend/src/app/rpc/mutations/projects.clj | 11 +- backend/tests/app/tests/helpers.clj | 141 ++++----- .../tests/app/tests/test_services_files.clj | 277 ++++++++++++------ .../app/tests/test_services_projects.clj | 83 +++++- 5 files changed, 333 insertions(+), 180 deletions(-) diff --git a/backend/src/app/rpc/mutations/files.clj b/backend/src/app/rpc/mutations/files.clj index dce05f643..82cd365d7 100644 --- a/backend/src/app/rpc/mutations/files.clj +++ b/backend/src/app/rpc/mutations/files.clj @@ -155,6 +155,7 @@ :hint "A file cannot be linked to itself")) (db/with-atomic [conn pool] (files/check-edition-permissions! conn profile-id file-id) + (files/check-edition-permissions! conn profile-id library-id) (link-file-to-library conn params))) (def sql:link-file-to-library diff --git a/backend/src/app/rpc/mutations/projects.clj b/backend/src/app/rpc/mutations/projects.clj index de92bb054..deaf42321 100644 --- a/backend/src/app/rpc/mutations/projects.clj +++ b/backend/src/app/rpc/mutations/projects.clj @@ -14,6 +14,7 @@ [app.config :as cfg] [app.db :as db] [app.rpc.queries.projects :as proj] + [app.rpc.queries.teams :as teams] [app.tasks :as tasks] [app.util.services :as sv] [app.util.time :as dt] @@ -38,13 +39,14 @@ :opt-un [::id])) (sv/defmethod ::create-project - [{:keys [pool] :as cfg} params] + [{:keys [pool] :as cfg} {:keys [profile-id team-id] :as params}] (db/with-atomic [conn pool] - (let [proj (create-project conn params) - params (assoc params :project-id (:id proj))] + (teams/check-edition-permissions! conn profile-id team-id) + (let [project (create-project conn params) + params (assoc params :project-id (:id project))] (create-project-profile conn params) (create-team-project-profile conn params) - (assoc proj :is-pinned true)))) + (assoc project :is-pinned true)))) (defn create-project [conn {:keys [id team-id name default?] :as params}] @@ -92,6 +94,7 @@ (sv/defmethod ::update-project-pin [{:keys [pool] :as cfg} {:keys [id profile-id team-id is-pinned] :as params}] (db/with-atomic [conn pool] + (proj/check-edition-permissions! conn profile-id id) (db/exec-one! conn [sql:update-project-pin team-id id profile-id is-pinned is-pinned]) nil)) diff --git a/backend/tests/app/tests/helpers.clj b/backend/tests/app/tests/helpers.clj index a11295263..188d0454a 100644 --- a/backend/tests/app/tests/helpers.clj +++ b/backend/tests/app/tests/helpers.clj @@ -39,12 +39,11 @@ (def ^:dynamic *pool* nil) (def config - (merge {:redis-uri "redis://redis/1" + (merge cfg/config + {:redis-uri "redis://redis/1" :database-uri "postgresql://postgres/penpot_test" :storage-fs-directory "/tmp/app/storage" - :migrations-verbose false} - cfg/config)) - + :migrations-verbose false})) (defn state-init [next] @@ -108,48 +107,7 @@ [prefix & args] (uuid/namespaced uuid/zero (apply str prefix args))) - -(defn create-profile - [conn i] - (let [params {:id (mk-uuid "profile" i) - :fullname (str "Profile " i) - :email (str "profile" i ".test@nodomain.com") - :password "123123" - :is-demo true}] - (->> (#'profile/create-profile conn params) - (#'profile/create-profile-relations conn)))) - -(defn create-team - [conn profile-id i] - (let [id (mk-uuid "team" i) - team (#'teams/create-team conn {:id id - :profile-id profile-id - :name (str "team" i)})] - (#'teams/create-team-profile conn - {:team-id id - :profile-id profile-id - :is-owner true - :is-admin true - :can-edit true}) - team)) - -(defn create-project - [conn profile-id team-id i] - (#'projects/create-project conn {:id (mk-uuid "project" i) - :profile-id profile-id - :team-id team-id - :name (str "project" i)})) - -(defn create-file - [conn profile-id project-id is-shared i] - (#'files/create-file conn {:id (mk-uuid "file" i) - :profile-id profile-id - :project-id project-id - :is-shared is-shared - :name (str "file" i)})) - - -;; --- NEW HELPERS +;; --- FACTORIES (defn create-profile* ([i] (create-profile* *pool* i {})) @@ -202,6 +160,60 @@ :can-edit true}) team))) +(defn link-file-to-library* + ([params] (link-file-to-library* *pool* params)) + ([conn {:keys [file-id library-id] :as params}] + (#'files/link-file-to-library conn {:file-id file-id :library-id library-id}))) + +(defn create-complaint-for + [conn {:keys [id created-at type]}] + (db/insert! conn :profile-complaint-report + {:profile-id id + :created-at (or created-at (dt/now)) + :type (name type) + :content (db/tjson {})})) + +(defn create-global-complaint-for + [conn {:keys [email type created-at]}] + (db/insert! conn :global-complaint-report + {:email email + :type (name type) + :created-at (or created-at (dt/now)) + :content (db/tjson {})})) + + +(defn create-team-permission* + ([params] (create-team-permission* *pool* params)) + ([conn {:keys [team-id profile-id is-owner is-admin can-edit] + :or {is-owner true is-admin true can-edit true}}] + (db/insert! conn :team-profile-rel {:team-id team-id + :profile-id profile-id + :is-owner is-owner + :is-admin is-admin + :can-edit can-edit}))) + +(defn create-project-permission* + ([params] (create-project-permission* *pool* params)) + ([conn {:keys [project-id profile-id is-owner is-admin can-edit] + :or {is-owner true is-admin true can-edit true}}] + (db/insert! conn :project-profile-rel {:project-id project-id + :profile-id profile-id + :is-owner is-owner + :is-admin is-admin + :can-edit can-edit}))) + +(defn create-file-permission* + ([params] (create-file-permission* *pool* params)) + ([conn {:keys [file-id profile-id is-owner is-admin can-edit] + :or {is-owner true is-admin true can-edit true}}] + (db/insert! conn :project-profile-rel {:file-id file-id + :profile-id profile-id + :is-owner is-owner + :is-admin is-admin + :can-edit can-edit}))) + + +;; --- RPC HELPERS (defn handle-error [^Throwable err] @@ -209,14 +221,6 @@ (handle-error (.getCause err)) err)) -(defmacro try-on - [expr] - `(try - (let [result# (deref ~expr)] - [nil result#]) - (catch Exception e# - [(handle-error e#) nil]))) - (defmacro try-on! [expr] `(try @@ -226,16 +230,6 @@ {:error (handle-error e#) :result nil}))) -(defmacro try! - [expr] - `(try - {:error nil - :result ~expr} - (catch Exception e# - {:error (handle-error e#) - :result nil}))) - - (defn mutation! [{:keys [::type] :as data}] (let [method-fn (get-in *system* [:app.rpc/rpc :methods :mutation type])] @@ -248,7 +242,7 @@ (try-on! (method-fn (dissoc data ::type))))) -;; --- Utils +;; --- UTILS (defn print-error! [error] @@ -317,23 +311,6 @@ ([key] (get (merge config data) key)) ([key default] (get (merge config data) key default)))) -(defn create-complaint-for - [conn {:keys [id created-at type]}] - (db/insert! conn :profile-complaint-report - {:profile-id id - :created-at (or created-at (dt/now)) - :type (name type) - :content (db/tjson {})})) - -(defn create-global-complaint-for - [conn {:keys [email type created-at]}] - (db/insert! conn :global-complaint-report - {:email email - :type (name type) - :created-at (or created-at (dt/now)) - :content (db/tjson {})})) - - (defn reset-mock! [m] (reset! m @(mk/make-mock {}))) diff --git a/backend/tests/app/tests/test_services_files.clj b/backend/tests/app/tests/test_services_files.clj index bfd87f287..4de3d8c5f 100644 --- a/backend/tests/app/tests/test_services_files.clj +++ b/backend/tests/app/tests/test_services_files.clj @@ -120,102 +120,209 @@ (t/is (= 0 (count result)))))) )) -(defn- create-file-media-object - [{:keys [profile-id file-id]}] - (let [mfile {:filename "sample.jpg" - :tempfile (th/tempfile "app/tests/_files/sample.jpg") - :content-type "image/jpeg" - :size 312043} - params {::th/type :upload-file-media-object - :profile-id profile-id - :file-id file-id - :is-local true - :name "testfile" - :content mfile} - out (th/mutation! params)] - (t/is (nil? (:error out))) - (:result out))) - -(defn- update-file - [{:keys [profile-id file-id changes revn] :or {revn 0}}] - (let [params {::th/type :update-file - :id file-id - :session-id (uuid/random) - :profile-id profile-id - :revn revn - :changes changes} - out (th/mutation! params)] - (t/is (nil? (:error out))) - (:result out))) - (t/deftest file-media-gc-task - (let [task (:app.tasks.file-media-gc/handler th/*system*) - storage (:app.storage/storage th/*system*) + (letfn [(create-file-media-object [{:keys [profile-id file-id]}] + (let [mfile {:filename "sample.jpg" + :tempfile (th/tempfile "app/tests/_files/sample.jpg") + :content-type "image/jpeg" + :size 312043} + params {::th/type :upload-file-media-object + :profile-id profile-id + :file-id file-id + :is-local true + :name "testfile" + :content mfile} + out (th/mutation! params)] + (t/is (nil? (:error out))) + (:result out))) - prof (th/create-profile* 1) - proj (th/create-project* 1 {:profile-id (:id prof) - :team-id (:default-team-id prof)}) - file (th/create-file* 1 {:profile-id (:id prof) - :project-id (:default-project-id prof) - :is-shared false}) + (update-file [{:keys [profile-id file-id changes revn] :or {revn 0}}] + (let [params {::th/type :update-file + :id file-id + :session-id (uuid/random) + :profile-id profile-id + :revn revn + :changes changes} + out (th/mutation! params)] + (t/is (nil? (:error out))) + (:result out)))] - fmo1 (create-file-media-object {:profile-id (:id prof) - :file-id (:id file)}) - fmo2 (create-file-media-object {:profile-id (:id prof) - :file-id (:id file)}) - shid (uuid/random) + (let [storage (:app.storage/storage th/*system*) - ures (update-file - {:file-id (:id file) - :profile-id (:id prof) - :revn 0 - :changes - [{:type :add-obj - :page-id (first (get-in file [:data :pages])) - :id shid - :parent-id uuid/zero - :frame-id uuid/zero - :obj {:id shid - :name "image" - :frame-id uuid/zero - :parent-id uuid/zero - :type :image - :metadata {:id (:id fmo1)}}}]})] + profile (th/create-profile* 1) + file (th/create-file* 1 {:profile-id (:id profile) + :project-id (:default-project-id profile) + :is-shared false}) - ;; run the task inmediatelly - (let [res (task {})] - (t/is (= 0 (:processed res)))) + fmo1 (create-file-media-object {:profile-id (:id profile) + :file-id (:id file)}) + fmo2 (create-file-media-object {:profile-id (:id profile) + :file-id (:id file)}) + shid (uuid/random) - ;; make the file ellegible for GC waiting 300ms - (th/sleep 300) + ures (update-file + {:file-id (:id file) + :profile-id (:id profile) + :revn 0 + :changes + [{:type :add-obj + :page-id (first (get-in file [:data :pages])) + :id shid + :parent-id uuid/zero + :frame-id uuid/zero + :obj {:id shid + :name "image" + :frame-id uuid/zero + :parent-id uuid/zero + :type :image + :metadata {:id (:id fmo1)}}}]})] - ;; run the task again - (let [res (task {})] - (t/is (= 1 (:processed res)))) + ;; run the task inmediatelly + (let [task (:app.tasks.file-media-gc/handler th/*system*) + res (task {})] + (t/is (= 0 (:processed res)))) - ;; Retrieve file and check trimmed attribute - (let [row (db/exec-one! th/*pool* ["select * from file where id = ?" (:id file)])] - (t/is (:has-media-trimmed row))) + ;; make the file ellegible for GC waiting 300ms (configured + ;; timeout for testing) + (th/sleep 300) - ;; check file media objects - (let [fmos (db/exec! th/*pool* ["select * from file_media_object where file_id = ?" (:id file)])] - (t/is (= 1 (count fmos)))) + ;; run the task again + (let [task (:app.tasks.file-media-gc/handler th/*system*) + res (task {})] + (t/is (= 1 (:processed res)))) - ;; The underlying storage objects are still available. - (t/is (some? (sto/get-object storage (:media-id fmo2)))) - (t/is (some? (sto/get-object storage (:thumbnail-id fmo2)))) - (t/is (some? (sto/get-object storage (:media-id fmo1)))) - (t/is (some? (sto/get-object storage (:thumbnail-id fmo1)))) + ;; retrieve file and check trimmed attribute + (let [row (db/exec-one! th/*pool* ["select * from file where id = ?" (:id file)])] + (t/is (true? (:has-media-trimmed row)))) - ;; but if we pass the touched gc task two of them should disappear - (let [task (:app.storage/gc-touched-task th/*system*) - res (task {})] - (t/is (= 0 (:freeze res))) - (t/is (= 2 (:delete res))) + ;; check file media objects + (let [rows (db/exec! th/*pool* ["select * from file_media_object where file_id = ?" (:id file)])] + (t/is (= 1 (count rows)))) - (t/is (nil? (sto/get-object storage (:media-id fmo2)))) - (t/is (nil? (sto/get-object storage (:thumbnail-id fmo2)))) + ;; The underlying storage objects are still available. + (t/is (some? (sto/get-object storage (:media-id fmo2)))) + (t/is (some? (sto/get-object storage (:thumbnail-id fmo2)))) (t/is (some? (sto/get-object storage (:media-id fmo1)))) - (t/is (some? (sto/get-object storage (:thumbnail-id fmo1))))) + (t/is (some? (sto/get-object storage (:thumbnail-id fmo1)))) + + ;; but if we pass the touched gc task two of them should disappear + (let [task (:app.storage/gc-touched-task th/*system*) + res (task {})] + (t/is (= 0 (:freeze res))) + (t/is (= 2 (:delete res))) + + (t/is (nil? (sto/get-object storage (:media-id fmo2)))) + (t/is (nil? (sto/get-object storage (:thumbnail-id fmo2)))) + (t/is (some? (sto/get-object storage (:media-id fmo1)))) + (t/is (some? (sto/get-object storage (:thumbnail-id fmo1))))) + + ))) + +(t/deftest permissions-checks-creating-file + (let [profile1 (th/create-profile* 1) + profile2 (th/create-profile* 2) + + data {::th/type :create-file + :profile-id (:id profile2) + :project-id (:default-project-id profile1) + :name "foobar" + :is-shared false} + out (th/mutation! data) + error (:error out)] + + ;; (th/print-result! out) + (t/is (th/ex-info? error)) + (t/is (th/ex-of-type? error :not-found)))) + +(t/deftest permissions-checks-rename-file + (let [profile1 (th/create-profile* 1) + profile2 (th/create-profile* 2) + + file (th/create-file* 1 {:project-id (:default-project-id profile1) + :profile-id (:id profile1)}) + data {::th/type :rename-file + :id (:id file) + :profile-id (:id profile2) + :name "foobar"} + out (th/mutation! data) + error (:error out)] + + ;; (th/print-result! out) + (t/is (th/ex-info? error)) + (t/is (th/ex-of-type? error :not-found)))) + +(t/deftest permissions-checks-delete-file + (let [profile1 (th/create-profile* 1) + profile2 (th/create-profile* 2) + + file (th/create-file* 1 {:project-id (:default-project-id profile1) + :profile-id (:id profile1)}) + data {::th/type :delete-file + :profile-id (:id profile2) + :id (:id file)} + out (th/mutation! data) + error (:error out)] + + ;; (th/print-result! out) + (t/is (th/ex-info? error)) + (t/is (th/ex-of-type? error :not-found)))) + +(t/deftest permissions-checks-set-file-shared + (let [profile1 (th/create-profile* 1) + profile2 (th/create-profile* 2) + file (th/create-file* 1 {:project-id (:default-project-id profile1) + :profile-id (:id profile1)}) + data {::th/type :set-file-shared + :profile-id (:id profile2) + :id (:id file) + :is-shared true} + out (th/mutation! data) + error (:error out)] + + ;; (th/print-result! out) + (t/is (th/ex-info? error)) + (t/is (th/ex-of-type? error :not-found)))) + +(t/deftest permissions-checks-link-to-library-1 + (let [profile1 (th/create-profile* 1) + profile2 (th/create-profile* 2) + file1 (th/create-file* 1 {:project-id (:default-project-id profile1) + :profile-id (:id profile1) + :is-shared true}) + file2 (th/create-file* 2 {:project-id (:default-project-id profile1) + :profile-id (:id profile1)}) + + data {::th/type :link-file-to-library + :profile-id (:id profile2) + :file-id (:id file2) + :library-id (:id file1)} + + out (th/mutation! data) + error (:error out)] + + ;; (th/print-result! out) + (t/is (th/ex-info? error)) + (t/is (th/ex-of-type? error :not-found)))) + +(t/deftest permissions-checks-link-to-library-2 + (let [profile1 (th/create-profile* 1) + profile2 (th/create-profile* 2) + file1 (th/create-file* 1 {:project-id (:default-project-id profile1) + :profile-id (:id profile1) + :is-shared true}) + + file2 (th/create-file* 2 {:project-id (:default-project-id profile2) + :profile-id (:id profile2)}) + + data {::th/type :link-file-to-library + :profile-id (:id profile2) + :file-id (:id file2) + :library-id (:id file1)} + + out (th/mutation! data) + error (:error out)] + + ;; (th/print-result! out) + (t/is (th/ex-info? error)) + (t/is (th/ex-of-type? error :not-found)))) - )) diff --git a/backend/tests/app/tests/test_services_projects.clj b/backend/tests/app/tests/test_services_projects.clj index 4d638a41b..1b7f4f08b 100644 --- a/backend/tests/app/tests/test_services_projects.clj +++ b/backend/tests/app/tests/test_services_projects.clj @@ -19,15 +19,15 @@ (t/use-fixtures :once th/state-init) (t/use-fixtures :each th/database-reset) -(t/deftest projects-crud - (let [prof (th/create-profile* 1) - team (th/create-team* 1 {:profile-id (:id prof)}) +(t/deftest projects-simple-crud + (let [profile (th/create-profile* 1) + team (th/create-team* 1 {:profile-id (:id profile)}) project-id (uuid/next)] ;; crate project (let [data {::th/type :create-project :id project-id - :profile-id (:id prof) + :profile-id (:id profile) :team-id (:id team) :name "test project"} out (th/mutation! data)] @@ -40,7 +40,7 @@ ;; query a list of projects (let [data {::th/type :projects :team-id (:id team) - :profile-id (:id prof)} + :profile-id (:id profile)} out (th/query! data)] ;; (th/print-result! out) @@ -54,7 +54,7 @@ (let [data {::th/type :rename-project :id project-id :name "renamed project" - :profile-id (:id prof)} + :profile-id (:id profile)} out (th/mutation! data)] ;; (th/print-result! out) (t/is (nil? (:error out))) @@ -63,7 +63,7 @@ ;; retrieve project (let [data {::th/type :project :id project-id - :profile-id (:id prof)} + :profile-id (:id profile)} out (th/query! data)] ;; (th/print-result! out) (t/is (nil? (:error out))) @@ -73,7 +73,7 @@ ;; delete project (let [data {::th/type :delete-project :id project-id - :profile-id (:id prof)} + :profile-id (:id profile)} out (th/mutation! data)] ;; (th/print-result! out) @@ -83,10 +83,75 @@ ;; query a list of projects after delete" (let [data {::th/type :projects :team-id (:id team) - :profile-id (:id prof)} + :profile-id (:id profile)} out (th/query! data)] ;; (th/print-result! out) (t/is (nil? (:error out))) (let [result (:result out)] (t/is (= 0 (count result))))) )) + +(t/deftest permissions-checks-create-project + (let [profile1 (th/create-profile* 1) + profile2 (th/create-profile* 2) + + data {::th/type :create-project + :profile-id (:id profile2) + :team-id (:default-team-id profile1) + :name "test project"} + out (th/mutation! data) + error (:error out)] + + ;; (th/print-result! out) + (t/is (th/ex-info? error)) + (t/is (th/ex-of-type? error :not-found)))) + +(t/deftest permissions-checks-rename-project + (let [profile1 (th/create-profile* 1) + profile2 (th/create-profile* 2) + project (th/create-project* 1 {:team-id (:default-team-id profile1) + :profile-id (:id profile1)}) + data {::th/type :rename-project + :id (:id project) + :profile-id (:id profile2) + :name "foobar"} + out (th/mutation! data) + error (:error out)] + + ;; (th/print-result! out) + (t/is (th/ex-info? error)) + (t/is (th/ex-of-type? error :not-found)))) + +(t/deftest permissions-checks-delete-project + (let [profile1 (th/create-profile* 1) + profile2 (th/create-profile* 2) + project (th/create-project* 1 {:team-id (:default-team-id profile1) + :profile-id (:id profile1)}) + data {::th/type :delete-project + :id (:id project) + :profile-id (:id profile2)} + out (th/mutation! data) + error (:error out)] + + ;; (th/print-result! out) + (t/is (th/ex-info? error)) + (t/is (th/ex-of-type? error :not-found)))) + +(t/deftest permissions-checks-delete-project + (let [profile1 (th/create-profile* 1) + profile2 (th/create-profile* 2) + project (th/create-project* 1 {:team-id (:default-team-id profile1) + :profile-id (:id profile1)}) + data {::th/type :update-project-pin + :id (:id project) + :team-id (:default-team-id profile1) + :profile-id (:id profile2) + :is-pinned true} + + out (th/mutation! data) + error (:error out)] + + ;; (th/print-result! out) + (t/is (th/ex-info? error)) + (t/is (th/ex-of-type? error :not-found)))) + From 129cc86e3b11e741afeca7abe8abf1fbb8d7a01c Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sun, 28 Feb 2021 19:51:12 +0100 Subject: [PATCH 78/90] :sparkles: Minor improvements on getting profile additional data. --- backend/src/app/rpc/mutations/profile.clj | 16 ++++++---------- backend/src/app/rpc/queries/profile.clj | 10 +++++++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/src/app/rpc/mutations/profile.clj b/backend/src/app/rpc/mutations/profile.clj index 40914de57..0b2d9c906 100644 --- a/backend/src/app/rpc/mutations/profile.clj +++ b/backend/src/app/rpc/mutations/profile.clj @@ -242,10 +242,10 @@ profile)] (db/with-atomic [conn pool] - (let [profile (-> (profile/retrieve-profile-data-by-email conn email) - (validate-profile) - (profile/strip-private-attrs)) - profile (merge profile (profile/retrieve-additional-data conn (:id profile)))] + (let [profile (->> (profile/retrieve-profile-data-by-email conn email) + (validate-profile) + (profile/strip-private-attrs) + (profile/populate-additional-data conn))] (if-let [token (:invitation-token params)] ;; If the request comes with an invitation token, this means ;; that user wants to accept it with different user. A very @@ -293,11 +293,7 @@ (defn login-or-register [{:keys [conn] :as cfg} {:keys [email backend] :as params}] - (letfn [(populate-additional-data [conn profile] - (let [data (profile/retrieve-additional-data conn (:id profile))] - (merge profile data))) - - (create-profile [conn {:keys [fullname email]}] + (letfn [(create-profile [conn {:keys [fullname email]}] (db/insert! conn :profile {:id (uuid/next) :fullname fullname @@ -315,7 +311,7 @@ (let [profile (profile/retrieve-profile-data-by-email conn email) profile (if profile - (populate-additional-data conn profile) + (profile/populate-additional-data conn profile) (register-profile conn params))] (profile/strip-private-attrs profile)))) diff --git a/backend/src/app/rpc/queries/profile.clj b/backend/src/app/rpc/queries/profile.clj index b02ca6ce9..5d87ba7da 100644 --- a/backend/src/app/rpc/queries/profile.clj +++ b/backend/src/app/rpc/queries/profile.clj @@ -71,6 +71,10 @@ {:default-team-id (:id team) :default-project-id (:id project)})) +(defn populate-additional-data + [conn profile] + (merge profile (retrieve-additional-data conn (:id profile)))) + (defn decode-profile-row [{:keys [props] :as row}] (cond-> row @@ -83,9 +87,9 @@ (defn retrieve-profile [conn id] - (let [profile (some-> (retrieve-profile-data conn id) - (strip-private-attrs) - (merge (retrieve-additional-data conn id)))] + (let [profile (some->> (retrieve-profile-data conn id) + (strip-private-attrs) + (populate-additional-data conn))] (when (nil? profile) (ex/raise :type :not-found :hint "Object doest not exists.")) From 61ad11245131b4205cc7562e9132daa87607f42c Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sun, 28 Feb 2021 19:57:19 +0100 Subject: [PATCH 79/90] :sparkles: Minor improvement on retrieve profile by email fn. --- backend/src/app/rpc/queries/profile.clj | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/backend/src/app/rpc/queries/profile.clj b/backend/src/app/rpc/queries/profile.clj index 5d87ba7da..59ed2e8b0 100644 --- a/backend/src/app/rpc/queries/profile.clj +++ b/backend/src/app/rpc/queries/profile.clj @@ -13,6 +13,7 @@ [app.common.spec :as us] [app.common.uuid :as uuid] [app.db :as db] + [app.db.sql :as sql] [app.util.services :as sv] [clojure.spec.alpha :as s] [cuerdas.core :as str])) @@ -96,18 +97,12 @@ profile)) - -(def sql:profile-by-email - "select * from profile - where email=? - and deleted_at is null") - (defn retrieve-profile-data-by-email [conn email] - (let [email (str/lower email)] - (-> (db/exec-one! conn [sql:profile-by-email email]) - (decode-profile-row)))) - + (let [sql (sql/select :profile {:email (str/lower email)}) + data (db/exec-one! conn sql)] + (when (and data (nil? (:deleted-at data))) + (decode-profile-row data)))) ;; --- Attrs Helpers From 2a8a0afd096b5152197470a6669df426b29c1138 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sun, 28 Feb 2021 19:58:15 +0100 Subject: [PATCH 80/90] :bug: Fix many bugs on onboarding file loading process. --- backend/src/app/setup/initial_data.clj | 135 ++++++++++++++++--------- 1 file changed, 90 insertions(+), 45 deletions(-) diff --git a/backend/src/app/setup/initial_data.clj b/backend/src/app/setup/initial_data.clj index 6fd93ee39..573e042f0 100644 --- a/backend/src/app/setup/initial_data.clj +++ b/backend/src/app/setup/initial_data.clj @@ -10,11 +10,15 @@ (ns app.setup.initial-data (:refer-clojure :exclude [load]) (:require + [app.common.data :as d] + [app.common.pages.migrations :as pmg] [app.common.uuid :as uuid] [app.config :as cfg] [app.db :as db] [app.rpc.mutations.projects :as projects] - [app.rpc.queries.profile :as profile])) + [app.rpc.queries.profile :as profile] + [app.util.blob :as blob] + [clojure.walk :as walk])) ;; --- DUMP GENERATION @@ -38,47 +42,76 @@ ([system project-id {:keys [skey project-name] :or {project-name "Penpot Onboarding"}}] (db/with-atomic [conn (:app.db/pool system)] - (let [skey (or skey (cfg/get :initial-project-skey)) - file (db/exec! conn [sql:file project-id]) - file-library-rel (db/exec! conn [sql:file-library-rel project-id]) - file-media-object (db/exec! conn [sql:file-media-object project-id]) - data {:project-name project-name - :file file - :file-library-rel file-library-rel - :file-media-object file-media-object}] + (let [skey (or skey (cfg/get :initial-project-skey)) + files (db/exec! conn [sql:file project-id]) + flibs (db/exec! conn [sql:file-library-rel project-id]) + fmeds (db/exec! conn [sql:file-media-object project-id]) + data {:project-name project-name + :files files + :flibs flibs + :fmeds fmeds}] - (db/delete! conn :server-prop - {:id skey}) + (db/delete! conn :server-prop {:id skey}) (db/insert! conn :server-prop {:id skey :preload false :content (db/tjson data)}) - nil)))) + skey)))) ;; --- DUMP LOADING -(defn- remap-ids - "Given a collection and a map from ID to ID. Changes all the `keys` - properties so they point to the new ID existing in `map-ids`" - [map-ids coll keys] - (let [generate-id - (fn [map-ids {:keys [id]}] - (assoc map-ids id (uuid/next))) +(defn- process-file + [file index] + (letfn [(process-form [form] + (cond-> form + ;; Relink Components + (and (map? form) + (uuid? (:component-file form))) + (update :component-file #(get index % %)) - remap-key - (fn [obj map-ids key] - (cond-> obj - (contains? obj key) - (assoc key (get map-ids (get obj key) (get obj key))))) + ;; Relink Image Shapes + (and (map? form) + (map? (:metadata form)) + (= :image (:type form))) + (update-in [:metadata :id] #(get index % %)))) - change-id - (fn [map-ids obj] - (reduce #(remap-key %1 map-ids %2) obj keys)) + ;; A function responsible to analize all file data and + ;; replace the old :component-file reference with the new + ;; ones, using the provided file-index + (relink-shapes [data] + (walk/postwalk process-form data)) - new-map-ids (reduce generate-id map-ids coll)] + ;; A function responsible of process the :media attr of file + ;; data and remap the old ids with the new ones. + (relink-media [media] + (reduce-kv (fn [res k v] + (let [id (get index k)] + (if (uuid? id) + (-> res + (assoc id (assoc v :id id)) + (dissoc k)) + res))) + media + media))] - [new-map-ids (map (partial change-id new-map-ids) coll)])) + (update file :data + (fn [data] + (-> data + (blob/decode) + (assoc :id (:id file)) + (pmg/migrate-data) + (update :pages-index relink-shapes) + (update :components relink-shapes) + (update :media relink-media) + (d/without-nils) + (blob/encode)))))) + +(defn- remap-id + [item index key] + (cond-> item + (contains? item key) + (assoc key (get index (get item key) (get item key))))) (defn- retrieve-data [conn skey] @@ -97,19 +130,26 @@ :team-id (:default-team-id profile) :name (:project-name data)}) - map-ids {} + index (as-> {} index + (reduce #(assoc %1 (:id %2) (uuid/next)) index (:files data)) + (reduce #(assoc %1 (:id %2) (uuid/next)) index (:fmeds data))) - [map-ids file] (remap-ids map-ids (:file data) #{:id}) - [map-ids file-library-rel] (remap-ids map-ids (:file-library-rel data) #{:file-id :library-file-id}) - [_ file-media-object] (remap-ids map-ids (:file-media-object data) #{:id :file-id :media-id :thumbnail-id}) + flibs (map #(remap-id % index :file-id) (:flibs data)) - file (map #(assoc % :project-id (:id project)) file) - file-profile-rel (map #(array-map :file-id (:id %) - :profile-id (:id profile) - :is-owner true - :is-admin true - :can-edit true) - file)] + files (->> (:files data) + (map #(assoc % :id (get index (:id %)))) + (map #(assoc % :project-id (:id project))) + (map #(process-file % index))) + + fmeds (->> (:fmeds data) + (map #(assoc % :id (get index (:id %)))) + (map #(remap-id % index :file-id))) + + fprofs (map #(array-map :file-id (:id %) + :profile-id (:id profile) + :is-owner true + :is-admin true + :can-edit true) files)] (projects/create-project-profile conn {:project-id (:id project) :profile-id (:id profile)}) @@ -119,19 +159,24 @@ :profile-id (:id profile)}) ;; Re-insert into the database - (doseq [params file] + (doseq [params files] (db/insert! conn :file params)) - (doseq [params file-profile-rel] + + (doseq [params fprofs] (db/insert! conn :file-profile-rel params)) - (doseq [params file-library-rel] + + (doseq [params flibs] (db/insert! conn :file-library-rel params)) - (doseq [params file-media-object] + + (doseq [params fmeds] (db/insert! conn :file-media-object params))))))) (defn load [system {:keys [email] :as opts}] (db/with-atomic [conn (:app.db/pool system)] - (when-let [profile (profile/retrieve-profile-data-by-email conn email)] + (when-let [profile (some->> email + (profile/retrieve-profile-data-by-email conn) + (profile/populate-additional-data conn))] (load-initial-project! conn profile opts) true))) From 833944bebb33a9443daae0e0786146f9398732c3 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sun, 28 Feb 2021 20:04:07 +0100 Subject: [PATCH 81/90] :bug: Fix CI buid. --- backend/tests/app/tests/helpers.clj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/tests/app/tests/helpers.clj b/backend/tests/app/tests/helpers.clj index 188d0454a..1804a81b0 100644 --- a/backend/tests/app/tests/helpers.clj +++ b/backend/tests/app/tests/helpers.clj @@ -39,11 +39,11 @@ (def ^:dynamic *pool* nil) (def config - (merge cfg/config - {:redis-uri "redis://redis/1" + (merge {:redis-uri "redis://redis/1" :database-uri "postgresql://postgres/penpot_test" :storage-fs-directory "/tmp/app/storage" - :migrations-verbose false})) + :migrations-verbose false} + cfg/config)) (defn state-init [next] From 0683c4a96379e1bf0b11cf4de0bba77eed6162ae Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 1 Mar 2021 12:14:30 +0100 Subject: [PATCH 82/90] :tada: Add better feedback backend. --- backend/resources/emails/feedback/en.subj | 2 +- backend/resources/emails/feedback/en.txt | 5 ++- backend/src/app/config.clj | 2 + backend/src/app/http.clj | 4 +- backend/src/app/main.clj | 4 ++ backend/src/app/rpc.clj | 1 - backend/src/app/rpc/mutations/feedback.clj | 41 ------------------- frontend/src/app/main/repo.cljs | 6 +++ .../src/app/main/ui/settings/feedback.cljs | 21 +++------- 9 files changed, 26 insertions(+), 60 deletions(-) delete mode 100644 backend/src/app/rpc/mutations/feedback.clj diff --git a/backend/resources/emails/feedback/en.subj b/backend/resources/emails/feedback/en.subj index 2ecd8c0c4..7b4c21809 100644 --- a/backend/resources/emails/feedback/en.subj +++ b/backend/resources/emails/feedback/en.subj @@ -1 +1 @@ -[FEEDBACK]: From {{ profile.email }} +[PENPOT FEEDBACK]: {{subject|abbreviate:19}} (from {% if profile %}{{ profile.email }}{% else %}{{from}}{% endif %}) diff --git a/backend/resources/emails/feedback/en.txt b/backend/resources/emails/feedback/en.txt index f6e602a19..c768a9fd9 100644 --- a/backend/resources/emails/feedback/en.txt +++ b/backend/resources/emails/feedback/en.txt @@ -1,6 +1,9 @@ +{% if profile %} Feedback from: {{profile.fullname}} <{{profile.email}}> - Profile ID: {{profile.id}} +{% else %} +Feedback from: {{from}} +{% endif %} Subject: {{subject}} diff --git a/backend/src/app/config.clj b/backend/src/app/config.clj index b78e49fbf..a4f8a0817 100644 --- a/backend/src/app/config.clj +++ b/backend/src/app/config.clj @@ -90,6 +90,7 @@ (s/def ::error-report-webhook ::us/string) (s/def ::feedback-destination ::us/string) (s/def ::feedback-enabled ::us/boolean) +(s/def ::feedback-token ::us/string) (s/def ::github-client-id ::us/string) (s/def ::github-client-secret ::us/string) (s/def ::gitlab-base-uri ::us/string) @@ -162,6 +163,7 @@ ::error-report-webhook ::feedback-destination ::feedback-enabled + ::feedback-token ::github-client-id ::github-client-secret ::gitlab-base-uri diff --git a/backend/src/app/http.clj b/backend/src/app/http.clj index 2e2a40dfe..06ea21b85 100644 --- a/backend/src/app/http.clj +++ b/backend/src/app/http.clj @@ -111,7 +111,7 @@ :body "internal server error"}))))))) (defn- create-router - [{:keys [session rpc oauth metrics svgparse assets] :as cfg}] + [{:keys [session rpc oauth metrics svgparse assets feedback] :as cfg}] (rr/router [["/metrics" {:get (:handler metrics)}] @@ -136,6 +136,8 @@ [middleware/cookies]]} ["/svg" {:post svgparse}] + ["/feedback" {:middleware [(:middleware session)] + :post feedback}] ["/oauth" ["/google" {:post (get-in oauth [:google :handler])}] diff --git a/backend/src/app/main.clj b/backend/src/app/main.clj index 20d4177db..024310bd2 100644 --- a/backend/src/app/main.clj +++ b/backend/src/app/main.clj @@ -112,6 +112,7 @@ :svgparse (ig/ref :app.svgparse/handler) :storage (ig/ref :app.storage/storage) :sns-webhook (ig/ref :app.http.awsns/handler) + :feedback (ig/ref :app.http.feedback/handler) :error-report-handler (ig/ref :app.loggers.mattermost/handler)} :app.http.assets/handlers @@ -121,6 +122,9 @@ :cache-max-age (dt/duration {:hours 24}) :signature-max-age (dt/duration {:hours 24 :minutes 5})} + :app.http.feedback/handler + {:pool (ig/ref :app.db/pool)} + :app.http.oauth/all {:google (ig/ref :app.http.oauth/google) :gitlab (ig/ref :app.http.oauth/gitlab) diff --git a/backend/src/app/rpc.clj b/backend/src/app/rpc.clj index af91b913e..e236eac4e 100644 --- a/backend/src/app/rpc.clj +++ b/backend/src/app/rpc.clj @@ -135,7 +135,6 @@ 'app.rpc.mutations.projects 'app.rpc.mutations.viewer 'app.rpc.mutations.teams - 'app.rpc.mutations.feedback 'app.rpc.mutations.ldap 'app.rpc.mutations.verify-token) (map (partial process-method cfg)) diff --git a/backend/src/app/rpc/mutations/feedback.clj b/backend/src/app/rpc/mutations/feedback.clj deleted file mode 100644 index 875a93985..000000000 --- a/backend/src/app/rpc/mutations/feedback.clj +++ /dev/null @@ -1,41 +0,0 @@ -;; This Source Code Form is subject to the terms of the Mozilla Public -;; License, v. 2.0. If a copy of the MPL was not distributed with this -;; file, You can obtain one at http://mozilla.org/MPL/2.0/. -;; -;; This Source Code Form is "Incompatible With Secondary Licenses", as -;; defined by the Mozilla Public License, v. 2.0. -;; -;; Copyright (c) 2021 UXBOX Labs SL - -(ns app.rpc.mutations.feedback - (:require - [app.common.exceptions :as ex] - [app.common.spec :as us] - [app.config :as cfg] - [app.db :as db] - [app.emails :as emails] - [app.rpc.queries.profile :as profile] - [app.util.services :as sv] - [clojure.spec.alpha :as s])) - -(s/def ::subject ::us/string) -(s/def ::content ::us/string) - -(s/def ::send-profile-feedback - (s/keys :req-un [::profile-id ::subject ::content])) - -(sv/defmethod ::send-profile-feedback - [{:keys [pool] :as cfg} {:keys [profile-id subject content] :as params}] - (when-not (:feedback-enabled cfg/config) - (ex/raise :type :validation - :code :feedback-disabled - :hint "feedback module is disabled")) - - (db/with-atomic [conn pool] - (let [profile (profile/retrieve-profile-data conn profile-id)] - (emails/send! conn emails/feedback - {:to (:feedback-destination cfg/config) - :profile profile - :subject subject - :content content}) - nil))) diff --git a/frontend/src/app/main/repo.cljs b/frontend/src/app/main/repo.cljs index 462284eb5..2ec5b3e26 100644 --- a/frontend/src/app/main/repo.cljs +++ b/frontend/src/app/main/repo.cljs @@ -106,6 +106,12 @@ (seq params)) (send-mutation! id form))) +(defmethod mutation :send-feedback + [id params] + (let [uri (str cfg/public-uri "/api/feedback")] + (->> (http/send! {:method :post :uri uri :body params}) + (rx/mapcat handle-response)))) + (defmethod mutation :update-profile-photo [id params] (let [form (js/FormData.)] diff --git a/frontend/src/app/main/ui/settings/feedback.cljs b/frontend/src/app/main/ui/settings/feedback.cljs index 125303a23..1f8e88519 100644 --- a/frontend/src/app/main/ui/settings/feedback.cljs +++ b/frontend/src/app/main/ui/settings/feedback.cljs @@ -30,16 +30,7 @@ (s/def ::feedback-form (s/keys :req-un [::subject ::content])) -(defn- on-error - [form error] - (st/emit! (dm/error (tr "errors.generic")))) - -(defn- on-success - [form] - (st/emit! (dm/success (tr "notifications.profile-saved")))) - - -(mf/defc options-form +(mf/defc feedback-form [] (let [profile (mf/deref refs/profile) form (fm/use-form :spec ::feedback-form) @@ -50,6 +41,7 @@ (mf/use-callback (mf/deps profile) (fn [event] + (reset! loading false) (st/emit! (dm/success (tr "labels.feedback-sent"))) (swap! form assoc :data {} :touched {} :errors {}))) @@ -58,7 +50,7 @@ (mf/deps profile) (fn [{:keys [code] :as error}] (reset! loading false) - (if (= code :feedbck-disabled) + (if (= code :feedback-disabled) (st/emit! (dm/error (tr "labels.feedback-disabled"))) (st/emit! (dm/error (tr "errors.generic")))))) @@ -68,9 +60,8 @@ (fn [form event] (reset! loading true) (let [data (:clean-data @form)] - (prn "on-submit" data) - (->> (rp/mutation! :send-profile-feedback data) - (rx/subs on-succes on-error #(reset! loading false))))))] + (->> (rp/mutation! :send-feedback data) + (rx/subs on-succes on-error)))))] [:& fm/form {:class "feedback-form" :on-submit on-submit @@ -117,4 +108,4 @@ [] [:div.dashboard-settings [:div.form-container - [:& options-form]]]) + [:& feedback-form]]]) From a595effbe9976928e01046bc8b1e424186f31b39 Mon Sep 17 00:00:00 2001 From: Maemolee Date: Thu, 25 Feb 2021 18:16:11 +0800 Subject: [PATCH 83/90] :tada: Update locales.json with more chinese translations. Add more Chinese translations --- frontend/resources/locales.json | 404 +++++++++++++++++++++----------- 1 file changed, 267 insertions(+), 137 deletions(-) diff --git a/frontend/resources/locales.json b/frontend/resources/locales.json index c73c7388b..b7e0d744a 100644 --- a/frontend/resources/locales.json +++ b/frontend/resources/locales.json @@ -919,7 +919,7 @@ "ru" : "Что-то пошло не так.", "zh_cn" : "发生了某种错误。" }, - "used-in" : [ "src/app/main/ui/auth/verify_token.cljs", "src/app/main/ui/settings/profile.cljs", "src/app/main/ui/settings/feedback.cljs", "src/app/main/ui/settings/feedback.cljs", "src/app/main/ui/settings/options.cljs", "src/app/main/ui/dashboard/team.cljs" ] + "used-in" : [ "src/app/main/ui/auth/verify_token.cljs", "src/app/main/ui/settings/profile.cljs", "src/app/main/ui/settings/feedback.cljs", "src/app/main/ui/settings/options.cljs", "src/app/main/ui/dashboard/team.cljs" ] }, "errors.google-auth-not-enabled" : { "translations" : { @@ -967,7 +967,7 @@ "es" : "Parece que el contenido de la imagen no coincide con la etensión del archivo.", "fr" : "Il semble que le contenu de l’image ne correspond pas à l’extension de fichier.", "ru" : "", - "zh_cn" : "图片内容好像与文件扩展名不匹配。" + "zh_cn" : "图片内容好像与文档扩展名不匹配。" }, "used-in" : [ "src/app/main/data/workspace/persistence.cljs", "src/app/main/data/media.cljs" ] }, @@ -1437,7 +1437,7 @@ "en" : "Typography", "es" : "Tipografía", "fr" : "Typographie", - "zh_cn" : "文字排版" + "zh_cn" : "排版" }, "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ] }, @@ -1527,7 +1527,7 @@ "en" : "Text Transform", "es" : "Transformación de texto", "fr" : "Transformation de texte", - "zh_cn" : "文字变换" + "zh_cn" : "文本变换" }, "used-in" : [ "src/app/main/ui/handoff/attributes/text.cljs" ] }, @@ -2025,7 +2025,7 @@ "en" : [ "1 file", "%s files" ], "es" : [ "1 archivo", "%s archivos" ], "fr" : [ "1 fichier", "%s fichiers" ], - "zh_cn" : [ "1 个文件", "共 %s 个文件" ] + "zh_cn" : [ "1 个文档", "共 %s 个文档" ] }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -2316,7 +2316,7 @@ "es" : "Una vez añadido como Biblioteca Compartida, los recursos de este archivo estarán disponibles para ser usado por el resto de tus archivos.", "fr" : "Une fois ajoutées en tant que Bibliothèque Partagée, les ressources de cette bibliothèque de fichiers seront disponibles pour être utilisées parmi le reste de vos fichiers.", "ru" : "", - "zh_cn" : "一旦添加为共享库，此文件库中的素材就可被用于你的其他文件。" + "zh_cn" : "一旦添加为共享库，此文档库中的素材就可被用于你的其他文档中。" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ] }, @@ -2405,7 +2405,8 @@ "en" : "By removing your account you’ll lose all your current projects and archives.", "es" : "Si borras tu cuenta perderás todos tus proyectos y archivos.", "fr" : "En supprimant votre compte, vous perdrez tous vos projets et archives actuelles.", - "ru" : "Удалив аккаунт Вы потеряете все прокты и архивы." + "ru" : "Удалив аккаунт Вы потеряете все прокты и архивы.", + "zh_cn" : "删除账号后，你会失去所有项目和存档。" }, "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ] }, @@ -2414,7 +2415,8 @@ "en" : "Are you sure you want to delete your account?", "es" : "¿Seguro que quieres borrar tu cuenta?", "fr" : "Êtes‑vous sûr de vouloir supprimer votre compte ?", - "ru" : "Вы уверены, что хотите удалить аккаунт?" + "ru" : "Вы уверены, что хотите удалить аккаунт?", + "zh_cn" : "你确定想要删除你的账号？" }, "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ] }, @@ -2422,7 +2424,8 @@ "translations" : { "en" : "Delete conversation", "es" : "Eliminar conversación", - "fr" : "Supprimer la conversation" + "fr" : "Supprimer la conversation", + "zh_cn" : "删除对话" }, "used-in" : [ "src/app/main/ui/comments.cljs" ] }, @@ -2430,7 +2433,8 @@ "translations" : { "en" : "Are you sure you want to delete this conversation? All comments in this thread will be deleted.", "es" : "¿Seguro que quieres eliminar esta conversación? Todos los comentarios en este hilo serán eliminados.", - "fr" : "Êtes‑vous sûr de vouloir supprimer cette conversation ? Tous les commentaires de ce fil seront supprimés." + "fr" : "Êtes‑vous sûr de vouloir supprimer cette conversation ? Tous les commentaires de ce fil seront supprimés.", + "zh_cn" : "你确定想要删除这个对话？该讨论串里的所有评论都会被一同删除。" }, "used-in" : [ "src/app/main/ui/comments.cljs" ] }, @@ -2438,7 +2442,8 @@ "translations" : { "en" : "Delete conversation", "es" : "Eliminar conversación", - "fr" : "Supprimer une conversation" + "fr" : "Supprimer une conversation", + "zh_cn" : "删除对话" }, "used-in" : [ "src/app/main/ui/comments.cljs" ] }, @@ -2446,7 +2451,8 @@ "translations" : { "en" : "Delete file", "es" : "Eliminar archivo", - "fr" : "Supprimer le fichier" + "fr" : "Supprimer le fichier", + "zh_cn" : "删除文档" }, "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ] }, @@ -2454,7 +2460,8 @@ "translations" : { "en" : "Are you sure you want to delete this file?", "es" : "¿Seguro que quieres eliminar este archivo?", - "fr" : "Êtes‑vous sûr de vouloir supprimer ce fichier ?" + "fr" : "Êtes‑vous sûr de vouloir supprimer ce fichier ?", + "zh_cn" : "你确定想要删除这个文档？" }, "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ] }, @@ -2462,7 +2469,8 @@ "translations" : { "en" : "Deleting file", "es" : "Eliminando archivo", - "fr" : "Supprimer un fichier" + "fr" : "Supprimer un fichier", + "zh_cn" : "正在删除文档" }, "used-in" : [ "src/app/main/ui/dashboard/grid.cljs" ] }, @@ -2470,7 +2478,8 @@ "translations" : { "en" : "Are you sure you want to delete this page?", "es" : "¿Seguro que quieres borrar esta página?", - "fr" : "Êtes‑vous sûr de vouloir supprimer cette page ?" + "fr" : "Êtes‑vous sûr de vouloir supprimer cette page ?", + "zh_cn" : "你确定想要删除这个页面？" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs" ] }, @@ -2478,7 +2487,8 @@ "translations" : { "en" : "Delete page", "es" : "Borrar página", - "fr" : "Supprimer une page" + "fr" : "Supprimer une page", + "zh_cn" : "删除页面" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs" ] }, @@ -2486,7 +2496,8 @@ "translations" : { "en" : "Delete project", "es" : "Eliminar proyecto", - "fr" : "Supprimer le projet" + "fr" : "Supprimer le projet", + "zh_cn" : "删除项目" }, "used-in" : [ "src/app/main/ui/dashboard/files.cljs" ] }, @@ -2494,7 +2505,8 @@ "translations" : { "en" : "Are you sure you want to delete this project?", "es" : "¿Seguro que quieres eliminar este proyecto?", - "fr" : "Êtes‑vous sûr de vouloir supprimer ce projet ?" + "fr" : "Êtes‑vous sûr de vouloir supprimer ce projet ?", + "zh_cn" : "你确定想要删除这个项目？" }, "used-in" : [ "src/app/main/ui/dashboard/files.cljs" ] }, @@ -2502,7 +2514,8 @@ "translations" : { "en" : "Delete project", "es" : "Eliminar proyecto", - "fr" : "Supprimer un projet" + "fr" : "Supprimer un projet", + "zh_cn" : "删除项目" }, "used-in" : [ "src/app/main/ui/dashboard/files.cljs" ] }, @@ -2510,7 +2523,8 @@ "translations" : { "en" : "Delete team", "es" : "Eliminar equipo", - "fr" : "Supprimer l’équipe" + "fr" : "Supprimer l’équipe", + "zh_cn" : "删除团队" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -2518,7 +2532,8 @@ "translations" : { "en" : "Are you sure you want to delete this team? All projects and files associated with team will be permanently deleted.", "es" : "¿Seguro que quieres eliminar este equipo? Todos los proyectos y archivos asociados con el equipo serán eliminados permamentemente.", - "fr" : "Êtes‑vous sûr de vouloir supprimer cette équipe ? Tous les projets et fichiers associés à l’équipe seront définitivement supprimés." + "fr" : "Êtes‑vous sûr de vouloir supprimer cette équipe ? Tous les projets et fichiers associés à l’équipe seront définitivement supprimés.", + "zh_cn" : "你确定想要删除这个团队？与该团队关联的所有项目和文档都会被永久删除。" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -2526,7 +2541,8 @@ "translations" : { "en" : "Deleting team", "es" : "Eliminando equipo", - "fr" : "Suppression d’une équipe" + "fr" : "Suppression d’une équipe", + "zh_cn" : "正在删除团队" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -2534,7 +2550,8 @@ "translations" : { "en" : "Delete member", "es" : "Eliminando miembro", - "fr" : "Supprimer le membre" + "fr" : "Supprimer le membre", + "zh_cn" : "删除成员" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -2542,7 +2559,8 @@ "translations" : { "en" : "Are you sure you want to delete this member from the team?", "es" : "¿Seguro que quieres eliminar este integrante del equipo?", - "fr" : "Êtes‑vous sûr de vouloir supprimer ce membre de l’équipe ?" + "fr" : "Êtes‑vous sûr de vouloir supprimer ce membre de l’équipe ?", + "zh_cn" : "你确定想要从团队中删除这个成员？" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -2550,7 +2568,8 @@ "translations" : { "en" : "Delete team member", "es" : "Eliminar integrante del equipo", - "fr" : "Supprimer un membre d’équipe" + "fr" : "Supprimer un membre d’équipe", + "zh_cn" : "删除团队成员" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -2558,7 +2577,8 @@ "translations" : { "en" : "Invite to join the team", "es" : "Invitar a unirse al equipo", - "fr" : "Inviter à rejoindre l’équipe" + "fr" : "Inviter à rejoindre l’équipe", + "zh_cn" : "邀请加入团队" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -2566,7 +2586,8 @@ "translations" : { "en" : "You are %s owner.", "es" : "Eres %s dueño.", - "fr" : "Vous êtes le propriétaire de %s." + "fr" : "Vous êtes le propriétaire de %s.", + "zh_cn" : "你是%s的所有者。" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -2574,7 +2595,8 @@ "translations" : { "en" : "Select other member to promote before leave", "es" : "Promociona otro miembro a dueño antes de abandonar el equipo", - "fr" : "Sélectionnez un autre membre à promouvoir avant de quitter l’équipe" + "fr" : "Sélectionnez un autre membre à promouvoir avant de quitter l’équipe", + "zh_cn" : "请在退出前，从其他成员中选择一位晋升。" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -2582,7 +2604,8 @@ "translations" : { "en" : "Promote and leave", "es" : "Promocionar y abandonar", - "fr" : "Promouvoir et quitter" + "fr" : "Promouvoir et quitter", + "zh_cn" : "晋升并退出" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -2590,7 +2613,8 @@ "translations" : { "en" : "Select a member to promote", "es" : "Selecciona un miembro a promocionar", - "fr" : "Sélectionnez un membre à promouvoir" + "fr" : "Sélectionnez un membre à promouvoir", + "zh_cn" : "选择一位成员晋升" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -2598,7 +2622,8 @@ "translations" : { "en" : "Select a member to promote", "es" : "Selecciona un miembro a promocionar", - "fr" : "Sélectionnez un membre à promouvoir" + "fr" : "Sélectionnez un membre à promouvoir", + "zh_cn" : "选择一位成员晋升" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -2606,7 +2631,8 @@ "translations" : { "en" : "Leave team", "es" : "Abandonar el equipo", - "fr" : "Quitter l’équipe" + "fr" : "Quitter l’équipe", + "zh_cn" : "退出团队" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -2614,7 +2640,8 @@ "translations" : { "en" : "Are you sure you want to leave this team?", "es" : "¿Seguro que quieres abandonar este equipo?", - "fr" : "Êtes‑vous sûr de vouloir quitter cette équipe ?" + "fr" : "Êtes‑vous sûr de vouloir quitter cette équipe ?", + "zh_cn" : "选择一位成员晋升" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -2622,7 +2649,8 @@ "translations" : { "en" : "Leaving team", "es" : "Abandonando el equipo", - "fr" : "Quitter l’équipe" + "fr" : "Quitter l’équipe", + "zh_cn" : "正在退出团队" }, "used-in" : [ "src/app/main/ui/dashboard/sidebar.cljs" ] }, @@ -2630,7 +2658,8 @@ "translations" : { "en" : "Promote", "es" : "Promocionar", - "fr" : "Promouvoir" + "fr" : "Promouvoir", + "zh_cn" : "晋升" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -2638,7 +2667,8 @@ "translations" : { "en" : "Are you sure you want to promote this user to owner?", "es" : "¿Seguro que quieres promocionar este usuario a dueño?", - "fr" : "Êtes‑vous sûr de vouloir promouvoir cette personne propriétaire ?" + "fr" : "Êtes‑vous sûr de vouloir promouvoir cette personne propriétaire ?", + "zh_cn" : "你确定想要晋升该用户为所有者？" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -2646,7 +2676,8 @@ "translations" : { "en" : "Promote to owner", "es" : "Promocionar a dueño", - "fr" : "Promouvoir propriétaire" + "fr" : "Promouvoir propriétaire", + "zh_cn" : "晋升为所有者" }, "used-in" : [ "src/app/main/ui/dashboard/team.cljs" ] }, @@ -2655,7 +2686,8 @@ "en" : "Remove as Shared Library", "es" : "Eliminar como Biblioteca Compartida", "fr" : "Supprimer en tant que Bibliothèque Partagée", - "ru" : "" + "ru" : "", + "zh_cn" : "不再作为共享库" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ] }, @@ -2664,7 +2696,8 @@ "en" : "Once removed as Shared Library, the File Library of this file will stop being available to be used among the rest of your files.", "es" : "Una vez eliminado como Biblioteca Compartida, la Biblioteca de este archivo dejará de estar disponible para ser usada por el resto de tus archivos.", "fr" : "Une fois supprimée en tant que Bibliothèque Partagée, la Bibliothèque de ce fichier ne pourra plus être utilisée par le reste de vos fichiers.", - "ru" : "" + "ru" : "", + "zh_cn" : "一旦不再作为共享库，该文档库就不能继续用于你的其他文档中。" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ] }, @@ -2673,7 +2706,8 @@ "en" : "Remove “%s” as Shared Library", "es" : "Añadir “%s” como Biblioteca Compartida", "fr" : "Retirer « %s » en tant que Bibliothèque Partagée", - "ru" : "" + "ru" : "", + "zh_cn" : "不再将“%s”作为共享库" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs", "src/app/main/ui/dashboard/grid.cljs" ] }, @@ -2682,7 +2716,8 @@ "en" : "Update component", "es" : "Actualizar componente", "fr" : "Actualiser le composant", - "ru" : "" + "ru" : "", + "zh_cn" : "更新组件" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ] }, @@ -2691,7 +2726,8 @@ "en" : "Cancel", "es" : "Cancelar", "fr" : "Annuler", - "ru" : "" + "ru" : "", + "zh_cn" : "取消" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ] }, @@ -2700,7 +2736,8 @@ "en" : "You are about to update a component in a shared library. This may affect other files that use it.", "es" : "Vas a actualizar un componente en una librería compartida. Esto puede afectar a otros archivos que la usen.", "fr" : "Vous êtes sur le point de mettre à jour le composant d’une Bibliothèque Partagée. Cela peut affecter d’autres fichiers qui l’utilisent.", - "ru" : "" + "ru" : "", + "zh_cn" : "你即将更新共享库中的一个组件。这可能会对使用该组件的其他文档产生影响。" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ] }, @@ -2709,7 +2746,8 @@ "en" : "Update a component in a shared library", "es" : "Actualizar un componente en librería", "fr" : "Actualiser le composant d’une bibliothèque", - "ru" : "" + "ru" : "", + "zh_cn" : "更新共享库中的一个组件" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/options/component.cljs", "src/app/main/ui/workspace/context_menu.cljs" ] }, @@ -2718,7 +2756,8 @@ "en" : "You can't delete you profile. Reassign your teams before proceed.", "es" : "No puedes borrar tu perfil. Reasigna tus equipos antes de seguir.", "fr" : "Vous ne pouvez pas supprimer votre profil. Réassignez vos équipes avant de continuer.", - "ru" : "Вы не можете удалить профиль. Сначала смените команду." + "ru" : "Вы не можете удалить профиль. Сначала смените команду.", + "zh_cn" : "你无法删除你的个人资料。请先转让你的团队。" }, "used-in" : [ "src/app/main/ui/settings/delete_account.cljs" ] }, @@ -2727,15 +2766,17 @@ "en" : "Profile saved successfully!", "es" : "Perfil guardado correctamente!", "fr" : "Profil enregistré avec succès !", - "ru" : "Профиль успешно сохранен!" + "ru" : "Профиль успешно сохранен!", + "zh_cn" : "个人资料保存成功！" }, - "used-in" : [ "src/app/main/ui/settings/profile.cljs", "src/app/main/ui/settings/feedback.cljs", "src/app/main/ui/settings/options.cljs" ] + "used-in" : [ "src/app/main/ui/settings/profile.cljs", "src/app/main/ui/settings/options.cljs" ] }, "notifications.validation-email-sent" : { "translations" : { "en" : "Verification email sent to %s. Check your email!", "es" : "Verificación de email enviada a %s. Comprueba tu correo.", - "fr" : "E‑mail de vérification envoyé à %s. Vérifiez votre e‑mail !" + "fr" : "E‑mail de vérification envoyé à %s. Vérifiez votre e‑mail !", + "zh_cn" : "验证邮件已发至%s。请检查邮箱。" }, "used-in" : [ "src/app/main/ui/settings/change_email.cljs" ] }, @@ -2744,7 +2785,8 @@ "en" : "Go to login", "es" : null, "fr" : "Aller à la page de connexion", - "ru" : null + "ru" : null, + "zh_cn" : "去登录" }, "used-in" : [ "src/app/main/ui/auth/recovery.cljs" ] }, @@ -2753,7 +2795,8 @@ "en" : "Mixed", "es" : "Varios", "fr" : "Divers", - "ru" : "Смешаный" + "ru" : "Смешаный", + "zh_cn" : "混合" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/options/stroke.cljs", "src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs", "src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs", "src/app/main/ui/workspace/sidebar/options/typography.cljs", "src/app/main/ui/workspace/sidebar/options/typography.cljs", "src/app/main/ui/workspace/sidebar/options/typography.cljs", "src/app/main/ui/workspace/sidebar/options/shadow.cljs", "src/app/main/ui/workspace/sidebar/options/blur.cljs" ] }, @@ -2762,7 +2805,8 @@ "en" : "No frames found on the page.", "es" : "No se ha encontrado ningún tablero.", "fr" : "Aucun cadre trouvé sur la page.", - "ru" : "На странице не найдено ни одного кадра" + "ru" : "На странице не найдено ни одного кадра", + "zh_cn" : "该页面上未找到任何画框。" }, "used-in" : [ "src/app/main/ui/handoff.cljs", "src/app/main/ui/viewer.cljs" ] }, @@ -2771,7 +2815,8 @@ "en" : "Frame not found.", "es" : "No se encuentra el tablero.", "fr" : "Cadre introuvable.", - "ru" : "Кадры не найдены." + "ru" : "Кадры не найдены.", + "zh_cn" : "画框未找到。" }, "used-in" : [ "src/app/main/ui/handoff.cljs", "src/app/main/ui/viewer.cljs" ] }, @@ -2780,7 +2825,8 @@ "en" : "Don't show interactions", "es" : "No mostrar interacciones", "fr" : "Ne pas afficher les interactions", - "ru" : "Не показывать взаимодействия" + "ru" : "Не показывать взаимодействия", + "zh_cn" : "不显示交互" }, "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] }, @@ -2789,7 +2835,8 @@ "en" : "Edit page", "es" : "Editar página", "fr" : "Modifier la page", - "ru" : "Редактировать страницу" + "ru" : "Редактировать страницу", + "zh_cn" : "编辑页面" }, "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] }, @@ -2798,7 +2845,8 @@ "en" : "Full Screen", "es" : "Pantalla completa", "fr" : "Plein écran", - "ru" : "Полный экран" + "ru" : "Полный экран", + "zh_cn" : "全屏" }, "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] }, @@ -2807,7 +2855,8 @@ "en" : "Copy link", "es" : "Copiar enlace", "fr" : "Copier le lien", - "ru" : "Копировать ссылку" + "ru" : "Копировать ссылку", + "zh_cn" : "复制链接" }, "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] }, @@ -2816,7 +2865,8 @@ "en" : "Create link", "es" : "Crear enlace", "fr" : "Créer le lien", - "ru" : "Создать ссылку" + "ru" : "Создать ссылку", + "zh_cn" : "创建链接" }, "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] }, @@ -2825,7 +2875,8 @@ "en" : "Share link will appear here", "es" : "El enlace para compartir aparecerá aquí", "fr" : "Le lien de partage apparaîtra ici", - "ru" : "Здесь будет ссылка для обмена" + "ru" : "Здесь будет ссылка для обмена", + "zh_cn" : "分享链接将会显示在这里" }, "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] }, @@ -2834,7 +2885,8 @@ "en" : "Remove link", "es" : "Eliminar enlace", "fr" : "Supprimer le lien", - "ru" : "Удалить ссылку" + "ru" : "Удалить ссылку", + "zh_cn" : "移除链接" }, "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] }, @@ -2843,7 +2895,8 @@ "en" : "Anyone with the link will have access", "es" : "Cualquiera con el enlace podrá acceder", "fr" : "Toute personne disposant du lien aura accès", - "ru" : "Любой, у кого есть ссылка будет иметь доступ" + "ru" : "Любой, у кого есть ссылка будет иметь доступ", + "zh_cn" : "任何人都可以通过本链接访问" }, "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] }, @@ -2852,7 +2905,8 @@ "en" : "Share link", "es" : "Enlace", "fr" : "Lien de partage", - "ru" : "Поделиться ссылкой" + "ru" : "Поделиться ссылкой", + "zh_cn" : "分享链接" }, "used-in" : [ "src/app/main/ui/viewer/header.cljs", "src/app/main/ui/viewer/header.cljs", "src/app/main/ui/viewer/header.cljs" ] }, @@ -2861,7 +2915,8 @@ "en" : "Show interactions", "es" : "Mostrar interacciones", "fr" : "Afficher les interactions", - "ru" : "Показывать взаимодействия" + "ru" : "Показывать взаимодействия", + "zh_cn" : "显示交互" }, "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] }, @@ -2870,7 +2925,8 @@ "en" : "Show interactions on click", "es" : "Mostrar interacciones al hacer click", "fr" : "Afficher les interactions au clic", - "ru" : "Показывать взаимодействия по клику" + "ru" : "Показывать взаимодействия по клику", + "zh_cn" : "点击时显示交互" }, "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] }, @@ -2879,7 +2935,8 @@ "en" : "Sitemap", "es" : "Mapa del sitio", "fr" : "Plan du site", - "ru" : "План сайта" + "ru" : "План сайта", + "zh_cn" : "站点地图" }, "used-in" : [ "src/app/main/ui/viewer/header.cljs" ] }, @@ -2888,7 +2945,8 @@ "en" : "Align horizontal center", "es" : "Alinear al centro", "fr" : "Aligner horizontalement au centre", - "ru" : "Выровнять по горизонтали" + "ru" : "Выровнять по горизонтали", + "zh_cn" : "水平居中对齐" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ] }, @@ -2897,7 +2955,8 @@ "en" : "Distribute horizontal spacing", "es" : "Distribuir espacio horizontal", "fr" : "Répartir l’espacement horizontal", - "ru" : "Распределить горизонтальное пространство" + "ru" : "Распределить горизонтальное пространство", + "zh_cn" : "水平均匀分布" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ] }, @@ -2906,7 +2965,8 @@ "en" : "Align left", "es" : "Alinear a la izquierda", "fr" : "Aligner à gauche", - "ru" : "Выровнять по левому краю" + "ru" : "Выровнять по левому краю", + "zh_cn" : "靠左对齐" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ] }, @@ -2915,7 +2975,8 @@ "en" : "Align right", "es" : "Alinear a la derecha", "fr" : "Aligner à droite", - "ru" : "Выровнять по правому краю" + "ru" : "Выровнять по правому краю", + "zh_cn" : "靠右对齐" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ] }, @@ -2924,7 +2985,8 @@ "en" : "Align bottom", "es" : "Alinear abajo", "fr" : "Aligner en bas", - "ru" : "Выровнять по нижнему краю" + "ru" : "Выровнять по нижнему краю", + "zh_cn" : "底部对齐" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ] }, @@ -2933,7 +2995,8 @@ "en" : "Align vertical center", "es" : "Alinear al centro", "fr" : "Aligner verticalement au centre", - "ru" : "Выровнять по вертикали" + "ru" : "Выровнять по вертикали", + "zh_cn" : "垂直居中对齐" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ] }, @@ -2942,7 +3005,8 @@ "en" : "Distribute vertical spacing", "es" : "Distribuir espacio vertical", "fr" : "Répartir l’espacement vertical", - "ru" : "Распределить вертикальное пространство" + "ru" : "Распределить вертикальное пространство", + "zh_cn" : "垂直均匀分布" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ] }, @@ -2951,7 +3015,8 @@ "en" : "Align top", "es" : "Alinear arriba", "fr" : "Aligner en haut", - "ru" : "Выровнять по верхнему краю" + "ru" : "Выровнять по верхнему краю", + "zh_cn" : "顶部对齐" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/align.cljs" ] }, @@ -2960,7 +3025,8 @@ "en" : "Assets", "es" : "Recursos", "fr" : "Ressources", - "ru" : "" + "ru" : "", + "zh_cn" : "素材" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ] }, @@ -2969,7 +3035,8 @@ "en" : "All assets", "es" : "Todos", "fr" : "Toutes", - "ru" : "" + "ru" : "", + "zh_cn" : "所有素材" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ] }, @@ -2978,7 +3045,8 @@ "en" : "Graphics", "es" : "Gráficos", "fr" : "Graphiques", - "ru" : "" + "ru" : "", + "zh_cn" : "图形" }, "unused" : true }, @@ -2987,7 +3055,8 @@ "en" : "Colors", "es" : "Colores", "fr" : "Couleurs", - "ru" : "" + "ru" : "", + "zh_cn" : "颜色" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ] }, @@ -2996,7 +3065,8 @@ "en" : "Components", "es" : "Componentes", "fr" : "Composants", - "ru" : "" + "ru" : "", + "zh_cn" : "组件" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ] }, @@ -3005,7 +3075,8 @@ "en" : "Delete", "es" : "Borrar", "fr" : "Supprimer", - "ru" : "" + "ru" : "", + "zh_cn" : "删除" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ] }, @@ -3014,7 +3085,8 @@ "en" : "Duplicate", "es" : "Duplicar", "fr" : "Dupliquer", - "ru" : "" + "ru" : "", + "zh_cn" : "创建副本" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ] }, @@ -3023,7 +3095,8 @@ "en" : "Edit", "es" : "Editar", "fr" : "Modifier", - "ru" : "" + "ru" : "", + "zh_cn" : "编辑" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ] }, @@ -3032,7 +3105,8 @@ "en" : "File library", "es" : "Biblioteca del archivo", "fr" : "Bibliothèque du fichier", - "ru" : "" + "ru" : "", + "zh_cn" : "文档库" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ] }, @@ -3041,7 +3115,8 @@ "en" : "Graphics", "es" : "Gráficos", "fr" : "Graphiques", - "ru" : "" + "ru" : "", + "zh_cn" : "图形" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ] }, @@ -3050,7 +3125,8 @@ "en" : "Libraries", "es" : "Bibliotecas", "fr" : "Bibliothèques", - "ru" : "" + "ru" : "", + "zh_cn" : "库" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ] }, @@ -3059,7 +3135,8 @@ "en" : "No assets found", "es" : "No se encontraron recursos", "fr" : "Aucune ressource trouvée", - "ru" : "" + "ru" : "", + "zh_cn" : "未找到素材" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ] }, @@ -3068,7 +3145,8 @@ "en" : "Rename", "es" : "Renombrar", "fr" : "Renommer", - "ru" : "" + "ru" : "", + "zh_cn" : "重命名" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/sitemap.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ] }, @@ -3077,7 +3155,8 @@ "en" : "Search assets", "es" : "Buscar recursos", "fr" : "Chercher des ressources", - "ru" : "" + "ru" : "", + "zh_cn" : "搜索素材" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ] }, @@ -3086,7 +3165,8 @@ "en" : "SHARED", "es" : "COMPARTIDA", "fr" : "PARTAGÉ", - "ru" : "" + "ru" : "", + "zh_cn" : "共享的" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs" ] }, @@ -3094,7 +3174,8 @@ "translations" : { "en" : "Typographies", "es" : "Tipografías", - "fr" : "Typographies" + "fr" : "Typographies", + "zh_cn" : "排版" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/assets.cljs", "src/app/main/ui/workspace/sidebar/assets.cljs" ] }, @@ -3102,7 +3183,8 @@ "translations" : { "en" : "Font", "es" : "Fuente", - "fr" : "Police" + "fr" : "Police", + "zh_cn" : "字体" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] }, @@ -3110,7 +3192,8 @@ "translations" : { "en" : "Size", "es" : "Tamaño", - "fr" : "Taille" + "fr" : "Taille", + "zh_cn" : "尺寸" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] }, @@ -3118,7 +3201,8 @@ "translations" : { "en" : "Variant", "es" : "Variante", - "fr" : "Variante" + "fr" : "Variante", + "zh_cn" : "变体" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] }, @@ -3126,7 +3210,8 @@ "translations" : { "en" : "Go to style library file to edit", "es" : "Ir al archivo de la biblioteca del estilo para editar", - "fr" : "Accéder au fichier de bibliothèque de styles à modifier" + "fr" : "Accéder au fichier de bibliothèque de styles à modifier", + "zh_cn" : "前往样式库文件进行编辑" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] }, @@ -3134,7 +3219,8 @@ "translations" : { "en" : "Letter Spacing", "es" : "Interletrado", - "fr" : "Interlettrage" + "fr" : "Interlettrage", + "zh_cn" : "字距" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] }, @@ -3142,7 +3228,8 @@ "translations" : { "en" : "Line Height", "es" : "Interlineado", - "fr" : "Interlignage" + "fr" : "Interlignage", + "zh_cn" : "行高" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] }, @@ -3150,7 +3237,8 @@ "translations" : { "en" : "Ag", "es" : "Ag", - "fr" : "Ag" + "fr" : "Ag", + "zh_cn" : "Ag" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs", "src/app/main/ui/handoff/attributes/text.cljs", "src/app/main/ui/handoff/attributes/text.cljs" ] }, @@ -3158,7 +3246,8 @@ "translations" : { "en" : "Text Transform", "es" : "Transformar texto", - "fr" : "Transformer le texte" + "fr" : "Transformer le texte", + "zh_cn" : "文本变换" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/options/typography.cljs" ] }, @@ -3166,7 +3255,8 @@ "translations" : { "en" : "Linear gradient", "es" : "Degradado lineal", - "fr" : "Dégradé linéaire" + "fr" : "Dégradé linéaire", + "zh_cn" : "线性渐变" }, "used-in" : [ "src/app/main/data/workspace/libraries.cljs", "src/app/main/ui/components/color_bullet.cljs" ] }, @@ -3174,7 +3264,8 @@ "translations" : { "en" : "Radial gradient", "es" : "Degradado radial", - "fr" : "Dégradé radial" + "fr" : "Dégradé radial", + "zh_cn" : "放射渐变" }, "used-in" : [ "src/app/main/data/workspace/libraries.cljs", "src/app/main/ui/components/color_bullet.cljs" ] }, @@ -3183,7 +3274,8 @@ "en" : "Disable dynamic alignment", "es" : "Desactivar alineamiento dinámico", "fr" : "Désactiver l’alignement dynamique", - "ru" : "Отключить активное выравнивание" + "ru" : "Отключить активное выравнивание", + "zh_cn" : "禁用动态对齐" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3192,7 +3284,8 @@ "en" : "Disable snap to grid", "es" : "Desactivar alinear a la rejilla", "fr" : "Désactiver l’alignement sur la grille", - "ru" : "Отключить привязку к сетке" + "ru" : "Отключить привязку к сетке", + "zh_cn" : "禁用吸附到网格" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3201,7 +3294,8 @@ "en" : "Enable dynamic aligment", "es" : "Activar alineamiento dinámico", "fr" : "Activer l’alignement dynamique", - "ru" : "Включить активное выравнивание" + "ru" : "Включить активное выравнивание", + "zh_cn" : "启用动态对齐" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3210,7 +3304,8 @@ "en" : "Snap to grid", "es" : "Alinear a la rejilla", "fr" : "Aligner sur la grille", - "ru" : "Привяка к сетке" + "ru" : "Привяка к сетке", + "zh_cn" : "吸附到网格" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3219,7 +3314,8 @@ "en" : "Hide assets", "es" : "Ocultar recursos", "fr" : "Masquer les ressources", - "ru" : "" + "ru" : "", + "zh_cn" : "隐藏素材" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3228,7 +3324,8 @@ "en" : "Hide grids", "es" : "Ocultar rejillas", "fr" : "Masquer la grille", - "ru" : "Спрятать сетку" + "ru" : "Спрятать сетку", + "zh_cn" : "隐藏网格" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3237,7 +3334,8 @@ "en" : "Hide layers", "es" : "Ocultar capas", "fr" : "Masquer les calques", - "ru" : "Спрятать слои" + "ru" : "Спрятать слои", + "zh_cn" : "隐藏图层" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3246,7 +3344,8 @@ "en" : "Hide color palette", "es" : "Ocultar paleta de colores", "fr" : "Masquer la palette de couleurs", - "ru" : "Спрятать палитру цветов" + "ru" : "Спрятать палитру цветов", + "zh_cn" : "隐藏调色盘" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3255,7 +3354,8 @@ "en" : "Hide rules", "es" : "Ocultar reglas", "fr" : "Masquer les règles", - "ru" : "Спрятать линейки" + "ru" : "Спрятать линейки", + "zh_cn" : "隐藏标尺" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3264,7 +3364,8 @@ "en" : "Select all", "es" : "Seleccionar todo", "fr" : "Tout sélectionner", - "ru" : "" + "ru" : "", + "zh_cn" : "全选" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3273,7 +3374,8 @@ "en" : "Show assets", "es" : "Mostrar recursos", "fr" : "Montrer les ressources", - "ru" : "" + "ru" : "", + "zh_cn" : "显示素材" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3282,7 +3384,8 @@ "en" : "Show grid", "es" : "Mostrar rejilla", "fr" : "Montrer la grille", - "ru" : "Показать сетку" + "ru" : "Показать сетку", + "zh_cn" : "显示网格" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3291,7 +3394,8 @@ "en" : "Show layers", "es" : "Mostrar capas", "fr" : "Montrer les calques", - "ru" : "Показать слои" + "ru" : "Показать слои", + "zh_cn" : "显示图层" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3300,7 +3404,8 @@ "en" : "Show color palette", "es" : "Mostrar paleta de colores", "fr" : "Montrer la palette de couleurs", - "ru" : "Показать палитру цветов" + "ru" : "Показать палитру цветов", + "zh_cn" : "显示调色盘" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3309,7 +3414,8 @@ "en" : "Show rules", "es" : "Mostrar reglas", "fr" : "Montrer les règles", - "ru" : "Показать линейки" + "ru" : "Показать линейки", + "zh_cn" : "显示标尺" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3317,7 +3423,8 @@ "translations" : { "en" : "Error on saving", "es" : "Error al guardar", - "fr" : "Erreur d’enregistrement" + "fr" : "Erreur d’enregistrement", + "zh_cn" : "保存时发生错误" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3325,7 +3432,8 @@ "translations" : { "en" : "Saved", "es" : "Guardado", - "fr" : "Enregistré" + "fr" : "Enregistré", + "zh_cn" : "已保存" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3333,7 +3441,8 @@ "translations" : { "en" : "Saving", "es" : "Guardando", - "fr" : "Enregistrement" + "fr" : "Enregistrement", + "zh_cn" : "正在保存" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3341,7 +3450,8 @@ "translations" : { "en" : "Unsaved changes", "es" : "Cambios sin guardar", - "fr" : "Modifications non sauvegardées" + "fr" : "Modifications non sauvegardées", + "zh_cn" : "未保存的修改" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3350,7 +3460,8 @@ "en" : "View mode (%s)", "es" : "Modo de visualización (%s)", "fr" : "Mode spectateur (%s)", - "ru" : "Режим просмотра (%s)" + "ru" : "Режим просмотра (%s)", + "zh_cn" : "查看模式（%s）" }, "used-in" : [ "src/app/main/ui/workspace/header.cljs" ] }, @@ -3359,7 +3470,8 @@ "en" : "Add", "es" : "Añadir", "fr" : "Ajouter", - "ru" : "" + "ru" : "", + "zh_cn" : "添加" }, "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] }, @@ -3368,7 +3480,8 @@ "en" : "%s colors", "es" : "%s colors", "fr" : "%s couleurs", - "ru" : "" + "ru" : "", + "zh_cn" : "%s种颜色" }, "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] }, @@ -3376,7 +3489,8 @@ "translations" : { "en" : "Big thumbnails", "es" : "Miniaturas grandes", - "fr" : "Grandes vignettes" + "fr" : "Grandes vignettes", + "zh_cn" : "大缩略图" }, "used-in" : [ "src/app/main/ui/workspace/colorpalette.cljs" ] }, @@ -3384,7 +3498,8 @@ "translations" : { "en" : "File library", "es" : "Biblioteca del archivo", - "fr" : "Bibliothèque du fichier" + "fr" : "Bibliothèque du fichier", + "zh_cn" : "文档库" }, "used-in" : [ "src/app/main/ui/workspace/colorpicker/libraries.cljs", "src/app/main/ui/workspace/colorpalette.cljs" ] }, @@ -3392,7 +3507,8 @@ "translations" : { "en" : "Recent colors", "es" : "Colores recientes", - "fr" : "Couleurs récentes" + "fr" : "Couleurs récentes", + "zh_cn" : "最近使用的颜色" }, "used-in" : [ "src/app/main/ui/workspace/colorpicker/libraries.cljs", "src/app/main/ui/workspace/colorpalette.cljs" ] }, @@ -3400,7 +3516,8 @@ "translations" : { "en" : "Save color style", "es" : "Guardar estilo de color", - "fr" : "Enregistrer le style de couleur" + "fr" : "Enregistrer le style de couleur", + "zh_cn" : "保存颜色风格" }, "used-in" : [ "src/app/main/ui/workspace/colorpicker.cljs" ] }, @@ -3408,7 +3525,8 @@ "translations" : { "en" : "Small thumbnails", "es" : "Miniaturas pequeñas", - "fr" : "Petites vignettes" + "fr" : "Petites vignettes", + "zh_cn" : "小缩略图" }, "used-in" : [ "src/app/main/ui/workspace/colorpalette.cljs" ] }, @@ -3417,7 +3535,8 @@ "en" : "%s components", "es" : "%s componentes", "fr" : "%s composants", - "ru" : "" + "ru" : "", + "zh_cn" : "%s个组件" }, "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] }, @@ -3426,7 +3545,8 @@ "en" : "File library", "es" : "Biblioteca de este archivo", "fr" : "Bibliothèque du fichier", - "ru" : "" + "ru" : "", + "zh_cn" : "文档库" }, "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] }, @@ -3435,7 +3555,8 @@ "en" : "%s graphics", "es" : "%s gráficos", "fr" : "%s graphiques", - "ru" : "" + "ru" : "", + "zh_cn" : "%s个图形" }, "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] }, @@ -3444,7 +3565,8 @@ "en" : "LIBRARIES IN THIS FILE", "es" : "BIBLIOTECAS EN ESTE ARCHIVO", "fr" : "BIBLIOTHÈQUES DANS CE FICHIER", - "ru" : "" + "ru" : "", + "zh_cn" : "本文档中的库" }, "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] }, @@ -3453,7 +3575,8 @@ "en" : "LIBRARIES", "es" : "BIBLIOTECAS", "fr" : "BIBLIOTHÈQUES", - "ru" : "" + "ru" : "", + "zh_cn" : "库" }, "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] }, @@ -3462,7 +3585,8 @@ "en" : "LIBRARY", "es" : "BIBLIOTECA", "fr" : "BIBLIOTHÈQUE", - "ru" : "" + "ru" : "", + "zh_cn" : "库" }, "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] }, @@ -3471,7 +3595,8 @@ "en" : "There are no Shared Libraries that need update", "es" : "No hay bibliotecas que necesiten ser actualizadas", "fr" : "Aucune Bibliothèque Partagée n’a besoin d’être mise à jour", - "ru" : "" + "ru" : "", + "zh_cn" : "没有需要更新的共享库" }, "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] }, @@ -3480,7 +3605,8 @@ "en" : "No matches found for “%s“", "es" : "No se encuentra “%s“", "fr" : "Aucune correspondance pour « %s »", - "ru" : "Совпадений для “%s“ не найдено" + "ru" : "Совпадений для “%s“ не найдено", + "zh_cn" : "没有找到“%s”的匹配项" }, "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] }, @@ -3489,7 +3615,8 @@ "en" : "There are no Shared Libraries available", "es" : "No hay bibliotecas compartidas disponibles", "fr" : "Aucune Bibliothèque Partagée disponible", - "ru" : "" + "ru" : "", + "zh_cn" : "没有可用的共享库" }, "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] }, @@ -3498,7 +3625,8 @@ "en" : "Search shared libraries", "es" : "Buscar bibliotecas compartidas", "fr" : "Rechercher des Bibliothèques Partagées", - "ru" : "" + "ru" : "", + "zh_cn" : "搜索共享库" }, "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] }, @@ -3507,7 +3635,8 @@ "en" : "SHARED LIBRARIES", "es" : "BIBLIOTECAS COMPARTIDAS", "fr" : "BIBLIOTHÈQUES PARTAGÉES", - "ru" : "" + "ru" : "", + "zh_cn" : "共享库" }, "used-in" : [ "src/app/main/ui/workspace/libraries.cljs" ] }, @@ -3515,7 +3644,8 @@ "translations" : { "en" : "Multiple typographies", "es" : "Varias tipografías", - "fr" : "Multiple typographies" + "fr" : "Multiple typographies", + "zh_cn" : "复合排版" }, "used-in" : [ "src/app/main/ui/workspace/sidebar/options/text.cljs" ] }, From 56ed474d8cef5c30b30e554da7db64516e1f0dea Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 1 Mar 2021 12:34:54 +0100 Subject: [PATCH 84/90] :sparkles: Minor improvements on http ns. --- backend/src/app/http.clj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/app/http.clj b/backend/src/app/http.clj index 06ea21b85..f15411d6a 100644 --- a/backend/src/app/http.clj +++ b/backend/src/app/http.clj @@ -83,9 +83,10 @@ (s/def ::oauth map?) (s/def ::storage map?) (s/def ::assets map?) +(s/def ::feedback fn?) (defmethod ig/pre-init-spec ::router [_] - (s/keys :req-un [::rpc ::session ::metrics ::oauth ::storage ::assets])) + (s/keys :req-un [::rpc ::session ::metrics ::oauth ::storage ::assets ::feedback])) (defmethod ig/init-key ::router [_ cfg] From fe114d2e666022295fe85102b0b5762d49c24f95 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 1 Mar 2021 12:48:03 +0100 Subject: [PATCH 85/90] :sparkles: Add missing file. --- backend/src/app/http/feedback.clj | 73 +++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 backend/src/app/http/feedback.clj diff --git a/backend/src/app/http/feedback.clj b/backend/src/app/http/feedback.clj new file mode 100644 index 000000000..afd952864 --- /dev/null +++ b/backend/src/app/http/feedback.clj @@ -0,0 +1,73 @@ +;; This Source Code Form is subject to the terms of the Mozilla Public +;; License, v. 2.0. If a copy of the MPL was not distributed with this +;; file, You can obtain one at http://mozilla.org/MPL/2.0/. +;; +;; This Source Code Form is "Incompatible With Secondary Licenses", as +;; defined by the Mozilla Public License, v. 2.0. +;; +;; Copyright (c) 2021 UXBOX Labs SL + +(ns app.http.feedback + "A general purpose feedback module." + (:require + [app.common.data :as d] + [app.common.exceptions :as ex] + [app.common.spec :as us] + [app.config :as cfg] + [app.db :as db] + [app.emails :as emails] + [app.rpc.queries.profile :as profile] + [clojure.spec.alpha :as s] + [integrant.core :as ig])) + +(declare send-feedback) + +(defmethod ig/pre-init-spec ::handler [_] + (s/keys :req-un [::db/pool])) + +(defmethod ig/init-key ::handler + [_ {:keys [pool] :as scfg}] + (let [ftoken (cfg/get :feedback-token ::no-token) + enabled (cfg/get :feedback-enabled) + dest (cfg/get :feedback-destination) + scfg (assoc scfg :destination dest)] + + (fn [{:keys [profile-id] :as request}] + (let [token (get-in request [:headers "x-feedback-token"]) + params (d/merge (:params request) + (:body-params request))] + + (when-not enabled + (ex/raise :type :validation + :code :feedback-disabled + :hint "feedback module is disabled")) + + (cond + (uuid? profile-id) + (let [profile (profile/retrieve-profile-data pool profile-id) + params (assoc params :from (:email profile))] + (when-not (:is-muted profile) + (send-feedback scfg profile params))) + + (= token ftoken) + (send-feedback scfg nil params)) + + {:status 204 :body ""})))) + +(s/def ::content ::us/string) +(s/def ::from ::us/email) +(s/def ::subject ::us/string) + +(s/def ::feedback + (s/keys :req-un [::from ::subject ::content])) + +(defn send-feedback + [{:keys [pool destination]} profile params] + (let [params (us/conform ::feedback params)] + (emails/send! pool emails/feedback + {:to destination + :profile profile + :from (:from params) + :subject (:subject params) + :content (:content params)}) + nil)) From 9fb8ba2ff1f3deeca1545094f14a61a6ed6e5cb6 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 1 Mar 2021 13:16:06 +0100 Subject: [PATCH 86/90] :tada: Add better reply-to handling on feedback module. --- backend/resources/emails/feedback/en.subj | 2 +- backend/resources/emails/feedback/en.txt | 5 ++--- backend/src/app/config.clj | 2 ++ backend/src/app/http/feedback.clj | 26 +++++++++++------------ 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/backend/resources/emails/feedback/en.subj b/backend/resources/emails/feedback/en.subj index 7b4c21809..7f1c38c4b 100644 --- a/backend/resources/emails/feedback/en.subj +++ b/backend/resources/emails/feedback/en.subj @@ -1 +1 @@ -[PENPOT FEEDBACK]: {{subject|abbreviate:19}} (from {% if profile %}{{ profile.email }}{% else %}{{from}}{% endif %}) +[PENPOT FEEDBACK]: {{subject|abbreviate:19}} (from {{email}}) diff --git a/backend/resources/emails/feedback/en.txt b/backend/resources/emails/feedback/en.txt index c768a9fd9..a60d380c8 100644 --- a/backend/resources/emails/feedback/en.txt +++ b/backend/resources/emails/feedback/en.txt @@ -1,8 +1,7 @@ {% if profile %} -Feedback from: {{profile.fullname}} <{{profile.email}}> -Profile ID: {{profile.id}} +Feedback profile: {{profile.fullname}} <{{profile.email}}> / {{profile.id}} {% else %} -Feedback from: {{from}} +Feedback from: {{email}} {% endif %} Subject: {{subject}} diff --git a/backend/src/app/config.clj b/backend/src/app/config.clj index a4f8a0817..a9fe74ac8 100644 --- a/backend/src/app/config.clj +++ b/backend/src/app/config.clj @@ -90,6 +90,7 @@ (s/def ::error-report-webhook ::us/string) (s/def ::feedback-destination ::us/string) (s/def ::feedback-enabled ::us/boolean) +(s/def ::feedback-reply-to ::us/email) (s/def ::feedback-token ::us/string) (s/def ::github-client-id ::us/string) (s/def ::github-client-secret ::us/string) @@ -163,6 +164,7 @@ ::error-report-webhook ::feedback-destination ::feedback-enabled + ::feedback-reply-to ::feedback-token ::github-client-id ::github-client-secret diff --git a/backend/src/app/http/feedback.clj b/backend/src/app/http/feedback.clj index afd952864..759b9c992 100644 --- a/backend/src/app/http/feedback.clj +++ b/backend/src/app/http/feedback.clj @@ -27,11 +27,8 @@ (defmethod ig/init-key ::handler [_ {:keys [pool] :as scfg}] - (let [ftoken (cfg/get :feedback-token ::no-token) - enabled (cfg/get :feedback-enabled) - dest (cfg/get :feedback-destination) - scfg (assoc scfg :destination dest)] - + (let [ftoken (cfg/get :feedback-token ::no-token) + enabled (cfg/get :feedback-enabled)] (fn [{:keys [profile-id] :as request}] (let [token (get-in request [:headers "x-feedback-token"]) params (d/merge (:params request) @@ -47,7 +44,7 @@ (let [profile (profile/retrieve-profile-data pool profile-id) params (assoc params :from (:email profile))] (when-not (:is-muted profile) - (send-feedback scfg profile params))) + (send-feedback pool profile params))) (= token ftoken) (send-feedback scfg nil params)) @@ -62,12 +59,15 @@ (s/keys :req-un [::from ::subject ::content])) (defn send-feedback - [{:keys [pool destination]} profile params] - (let [params (us/conform ::feedback params)] + [pool profile params] + (let [params (us/conform ::feedback params) + destination (cfg/get :feedback-destination) + reply-to (cfg/get :feedback-reply-to)] (emails/send! pool emails/feedback - {:to destination - :profile profile - :from (:from params) - :subject (:subject params) - :content (:content params)}) + {:to destination + :profile profile + :reply-to (:from params) + :email (:from params) + :subject (:subject params) + :content (:content params)}) nil)) From f12f46981bcc1bde0f39b31fb6a3d86f9c2ab20e Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 1 Mar 2021 15:41:39 +0100 Subject: [PATCH 87/90] :bug: Add mising remap-id on onboarding files setup. --- backend/src/app/setup/initial_data.clj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/src/app/setup/initial_data.clj b/backend/src/app/setup/initial_data.clj index 573e042f0..092a0ea1c 100644 --- a/backend/src/app/setup/initial_data.clj +++ b/backend/src/app/setup/initial_data.clj @@ -134,7 +134,9 @@ (reduce #(assoc %1 (:id %2) (uuid/next)) index (:files data)) (reduce #(assoc %1 (:id %2) (uuid/next)) index (:fmeds data))) - flibs (map #(remap-id % index :file-id) (:flibs data)) + flibs (->> (:flibs data) + (map #(remap-id % index :file-id)) + (map #(remap-id % index :library-file-id))) files (->> (:files data) (map #(assoc % :id (get index (:id %)))) From 9b8d73ef86d13c8dca10da1b2bf6b5b4a33937a7 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 1 Mar 2021 16:37:58 +0100 Subject: [PATCH 88/90] :bug: Fix topic encoding on msg publication. --- backend/src/app/msgbus.clj | 2 +- backend/src/app/rpc/mutations/files.clj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/app/msgbus.clj b/backend/src/app/msgbus.clj index 143d5c08f..63ea00ae4 100644 --- a/backend/src/app/msgbus.clj +++ b/backend/src/app/msgbus.clj @@ -219,7 +219,7 @@ (defn- impl-redis-pub [rac {:keys [topic message]}] - (let [topic (str topic) + (let [topic (str (cfg/get :tenant) "." topic) message (blob/encode message) res (a/chan 1)] (-> (.publish ^RedisAsyncCommands rac ^String topic ^bytes message) diff --git a/backend/src/app/rpc/mutations/files.clj b/backend/src/app/rpc/mutations/files.clj index 82cd365d7..bb453122f 100644 --- a/backend/src/app/rpc/mutations/files.clj +++ b/backend/src/app/rpc/mutations/files.clj @@ -313,7 +313,7 @@ (let [lchanges (filter library-change? changes)] ;; Asynchronously publish message to the msgbus - (msgbus :pub {:topic (str (:id file)) + (msgbus :pub {:topic (:id file) :message {:type :file-change :profile-id (:profile-id params) @@ -325,7 +325,7 @@ (when (and (:is-shared file) (seq lchanges)) (let [team-id (retrieve-team-id conn (:project-id file))] ;; Asynchronously publish message to the msgbus - (msgbus :pub {:topic (str team-id) + (msgbus :pub {:topic team-id :message {:type :library-change :profile-id (:profile-id params) From 52a3cd6ae490db5d823ed3a4be869555bdad83bb Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 1 Mar 2021 16:38:28 +0100 Subject: [PATCH 89/90] :bug: Don't show update library message on onboarding files. --- backend/src/app/setup/initial_data.clj | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/backend/src/app/setup/initial_data.clj b/backend/src/app/setup/initial_data.clj index 092a0ea1c..281616c84 100644 --- a/backend/src/app/setup/initial_data.clj +++ b/backend/src/app/setup/initial_data.clj @@ -18,6 +18,7 @@ [app.rpc.mutations.projects :as projects] [app.rpc.queries.profile :as profile] [app.util.blob :as blob] + [app.util.time :as dt] [clojure.walk :as walk])) ;; --- DUMP GENERATION @@ -130,21 +131,29 @@ :team-id (:default-team-id profile) :name (:project-name data)}) + now (dt/now) + ignore (dt/plus now (dt/duration {:seconds 5})) index (as-> {} index (reduce #(assoc %1 (:id %2) (uuid/next)) index (:files data)) (reduce #(assoc %1 (:id %2) (uuid/next)) index (:fmeds data))) flibs (->> (:flibs data) (map #(remap-id % index :file-id)) - (map #(remap-id % index :library-file-id))) + (map #(remap-id % index :library-file-id)) + (map #(assoc % :synced-at now)) + (map #(assoc % :created-at now))) files (->> (:files data) (map #(assoc % :id (get index (:id %)))) (map #(assoc % :project-id (:id project))) + (map #(assoc % :created-at now)) + (map #(assoc % :modified-at now)) + (map #(assoc % :ignore-sync-until ignore)) (map #(process-file % index))) fmeds (->> (:fmeds data) (map #(assoc % :id (get index (:id %)))) + (map #(assoc % :created-at now)) (map #(remap-id % index :file-id))) fprofs (map #(array-map :file-id (:id %) From c54d9b777d8e0138742987d9bea9c606c74d2e21 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 1 Mar 2021 16:39:13 +0100 Subject: [PATCH 90/90] :bug: Minor memory leak fix on workspace initialization. --- frontend/src/app/main/data/workspace.cljs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs index ed09670ac..3c4243ee0 100644 --- a/frontend/src/app/main/data/workspace.cljs +++ b/frontend/src/app/main/data/workspace.cljs @@ -181,8 +181,10 @@ ;; Mark file initialized when indexes are ready (->> stream (rx/filter #(= ::dwc/index-initialized %)) - (rx/map (constantly - (file-initialized project-id file-id)))) + (rx/first) + (rx/map (fn [] + (file-initialized project-id file-id)))) + )))) (defn- file-initialized