From 16b00810d077d9e9559267a6939c89ce47337078 Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 8 Aug 2017 15:02:32 +0100 Subject: [PATCH] Added logging, because of problems in downstream project. --- project.clj | 1 + src/scot/weft/i18n/core.clj | 25 ++++++++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/project.clj b/project.clj index 64b1026..1bba44b 100644 --- a/project.clj +++ b/project.clj @@ -4,4 +4,5 @@ :license {:name "Eclipse Public License" :url "http://www.eclipse.org/legal/epl-v10.html"} :dependencies [[org.clojure/clojure "1.7.0"] + [com.taoensso/timbre "4.10.0"] [instaparse "1.4.7"]]) diff --git a/src/scot/weft/i18n/core.clj b/src/scot/weft/i18n/core.clj index e40a907..6d6f047 100644 --- a/src/scot/weft/i18n/core.clj +++ b/src/scot/weft/i18n/core.clj @@ -3,7 +3,8 @@ scot.weft.i18n.core (:require [clojure.string :as cs] [clojure.java.io :as io] - [instaparse.core :as insta])) + [instaparse.core :as insta] + [taoensso.timbre :as timbre])) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;; @@ -132,16 +133,18 @@ Returns a map of message keys to strings." [accept-language-header resource-path default-locale] - (read-string - (slurp - (or - (first - (remove - nil? - (map - #(find-language-file-name % resource-path) - (acceptable-languages accept-language-header)))) - (str resource-path default-locale ".edn"))))) + (let [file-path (first + (remove + nil? + (map + #(find-language-file-name % resource-path) + (acceptable-languages accept-language-header))))] + (timbre/debug (str "Found i18n file at '" file-path "'")) + (read-string + (slurp + (or + file-path + (str resource-path default-locale ".edn")))))) (def get-messages