Merge branch 'develop'

project.clj

@@ -1,4 +1,4 @@
-(defproject org.clojars.simon_brooke/internationalisation "1.0.2"
+(defproject org.clojars.simon_brooke/internationalisation "1.0.3"
   :description "Internationalisation library for Clojure"
   :url "https://github.com/simon-brooke/internationalisation"
   :license {:name "Eclipse Public License"
@@ -9,4 +9,5 @@
   :plugins [[lein-codox "0.10.3"]]
   :profiles {:dev {:resource-paths ["resources"]}}
   :lein-release {:deploy-via :clojars}
+  :signing {:gpg-key "Simon Brooke (Stultus in monte) <simon@journeyman.cc>"}
   )

src/scot/weft/i18n/core.clj

@@ -160,12 +160,13 @@
                         (acceptable-languages accept-language-header))))]
     (timbre/debug (str "Found i18n file at '" file-path "'"))
     (try
+      (read-string
         (slurp-resource
           (or
             file-path
             (join java.io.File/separator
                   [resource-path
-                 (str default-locale ".edn")])))
+                   (str default-locale ".edn")]))))
       (catch Exception any
         (timbre/error (str "Failed to load internationalisation because " (.getMessage any)))
         nil))))

test/scot/weft/i18n/test/core.clj

@@ -199,11 +199,11 @@
     (is
       (=
         "This is not a pipe"
-        (:pipe (get-messages "en-GB, fr-FR;q=0.9" "resources/i18n" "en-GB"))))
+        (:pipe (get-messages "en-GB, fr-FR;q=0.9" "i18n" "en-GB"))))
     (is
       (=
         "Ceci n'est pas une pipe."
-        (:pipe (get-messages "en-GB;q=0.9, fr-FR" "resources/i18n" "en-GB"))))
+        (:pipe (get-messages "en-GB;q=0.9, fr-FR" "i18n" "en-GB"))))
     (is
-      (= nil (get-messages "xx-XX;q=0.5, yy-YY" "resources/i18n" "zz-ZZ"))
+      (= nil (get-messages "xx-XX;q=0.5, yy-YY" "i18n" "zz-ZZ"))
       "If no usable file is found, an exception should not be thrown.")))