From cc3d62fd48a2a21a67c454ff2eddee59b36e271f Mon Sep 17 00:00:00 2001
From: Tom Robinson <tlrobinson@gmail.com>
Date: Wed, 23 Aug 2017 09:36:19 -0700
Subject: [PATCH] Detect locale
---
bin/i18n/build-translation-resources | 3 ++-
src/metabase/routes.clj | 15 ++++++++++-----
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/bin/i18n/build-translation-resources b/bin/i18n/build-translation-resources
index b8eb0dfde64..059b3c553ca 100755
--- a/bin/i18n/build-translation-resources
+++ b/bin/i18n/build-translation-resources
@@ -9,13 +9,14 @@ fi
POT_NAME="locales/metabase.pot"
LOCALES=$(find locales -type f -name "*.po" -exec basename {} .po \;)
+LOCALES_QUOTED=$(echo "$LOCALES" | awk '{ printf "\"%s\" ", $0 }')
FRONTEND_LANG_DIR="resources/frontend_client/app/locales"
# backend
cat << EOF > "resources/locales.clj"
{
- :locales #{"de_DE" "en"}
+ :locales #{$LOCALES_QUOTED}
:packages ["metabase"]
:bundle "metabase.Messages"
}
diff --git a/src/metabase/routes.clj b/src/metabase/routes.clj
index 430a5f3f0f4..c5ee3b99aa8 100644
--- a/src/metabase/routes.clj
+++ b/src/metabase/routes.clj
@@ -13,6 +13,7 @@
[routes :as api]]
[metabase.core.initialization-status :as init-status]
[metabase.util.embed :as embed]
+ [puppetlabs.i18n.core :refer [trs locale-negotiator user-locale]]
[ring.util.response :as resp]
[stencil.core :as stencil]))
@@ -32,8 +33,12 @@
(stencil/render-string (load-file-at-path path) variables))
(defn- load-localization []
- ;; TODO: detect language
- (load-file-at-path "frontend_client/app/locales/de.json"))
+ (if (user-locale)
+ (try
+ (load-file-at-path (str "frontend_client/app/locales/" (user-locale) ".json"))
+ (catch Throwable e
+ "null"))
+ "null"))
(defn- entrypoint [entry embeddable? {:keys [uri]}]
(-> (if (init-status/complete?)
@@ -47,9 +52,9 @@
resp/response
(resp/content-type "text/html; charset=utf-8")))
-(def ^:private index (partial entrypoint "index" (not :embeddable)))
-(def ^:private public (partial entrypoint "public" :embeddable))
-(def ^:private embed (partial entrypoint "embed" :embeddable))
+(def ^:private index (locale-negotiator (partial entrypoint "index" (not :embeddable))))
+(def ^:private public (locale-negotiator (partial entrypoint "public" :embeddable)))
+(def ^:private embed (locale-negotiator (partial entrypoint "embed" :embeddable)))
(defroutes ^:private public-routes
(GET ["/question/:uuid.:export-format", :uuid u/uuid-regex, :export-format dataset-api/export-format-regex]
--
GitLab