diff --git a/bin/i18n/build-translation-resources b/bin/i18n/build-translation-resources
index b8eb0dfde64d0b181172e37b7c6c03488ee674df..059b3c553ca66e5749b0d3503c4c6a1e02b8b8b1 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 430a5f3f0f4e19a78b9f9bd4f0739b765e8c4de9..c5ee3b99aa8065d86e6e3aa3d5e130d0048c7f34 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]