Skip to content
Snippets Groups Projects
Commit 066eb4c2 authored by Joe Bordes's avatar Joe Bordes
Browse files

i18n(backend) adjustments on review comments

parent 7a68a5de
Branches
Tags
No related merge requests found
......@@ -4,9 +4,9 @@
[compojure.core :refer [GET]]
[metabase.api.common :refer [defendpoint define-routes]]
[metabase.models.setting :as setting :refer [defsetting]]
[puppetlabs.i18n.core :refer [tru]]
[metabase.util :as u]
[metabase.util.schema :as su]
[puppetlabs.i18n.core :refer [tru]]
[schema.core :as s]))
(defn- valid-json?
......@@ -64,8 +64,7 @@
:builtin true}})
(defsetting custom-geojson
(tru "JSON containing information about custom GeoJSON files for use in map visualizations instead of the default US
State or World GeoJSON.")
(tru "JSON containing information about custom GeoJSON files for use in map visualizations instead of the default US State or World GeoJSON.")
:type :json
:default {}
:getter (fn [] (merge (setting/get-json :custom-geojson) builtin-geojson))
......
......@@ -9,7 +9,7 @@
[toucan.db :as db]))
(defsetting getting-started-things-to-know
(tru "'Some things to know' text field for the Getting Started guide."))
(tru "''Some things to know'' text field for the Getting Started guide."))
(defsetting getting-started-contact-name
(tru "Name of somebody users can contact for help in the Getting Started guide."))
......
......@@ -19,9 +19,9 @@
[metabase.util
[password :as pass]
[schema :as su]]
[puppetlabs.i18n.core :refer [tru]]
[schema.core :as s]
[throttle.core :as throttle]
[puppetlabs.i18n.core :refer [tru]]
[toucan.db :as db]))
(defn- create-session!
......
......@@ -24,8 +24,8 @@
table]
[metabase.sync.interface :as si]
[metabase.util :as u]
[schema.core :as s]
[puppetlabs.i18n.core :refer [tru]]
[schema.core :as s]
[toucan.db :as db])
(:import clojure.lang.Keyword
java.text.SimpleDateFormat
......
......@@ -113,8 +113,8 @@
(re-humanize-table-and-field-names!))
(defsetting ^{:added "0.28.0"} humanization-strategy
(tru "Metabase can attempt to transform your table and field names into more sensible, human-readable versions, e.g.
\"somehorriblename\" becomes \"Some Horrible Name\". This doesn’t work all that well if the names are in a language
other than English, however. Do you want us to take a guess?")
(str (tru "Metabase can attempt to transform your table and field names into more sensible, human-readable versions, e.g. \"somehorriblename\" becomes \"Some Horrible Name\".")
(tru "This doesn’t work all that well if the names are in a language other than English, however.")
(tru "Do you want us to take a guess?"))
:default "advanced"
:setter set-humanization-strategy!)
......@@ -6,10 +6,10 @@
[clj-http.client :as client]
[environ.core :refer [env]]
[metabase.models.setting :as setting :refer [defsetting]]
[puppetlabs.i18n.core :refer [tru]]
[metabase.config :as config]
[metabase.util :as u]
[metabase.util.schema :as su]
[puppetlabs.i18n.core :refer [tru]]
[schema.core :as s]))
(def ^:private ValidToken
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment