simon/internationalisation
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Don't throw exception if no valid file found; instead log it, and return nil.

Browse source
This commit is contained in:
Simon Brooke 2017-09-07 14:09:53 +01:00
parent a574b527c0
commit 53124ab1a8
2 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/scot/weft/i18n/core.clj
View file

@ -133,7 +133,7 @@
* `default-locale` should be a locale specifier to use if no acceptable locale can be * `default-locale` should be a locale specifier to use if no acceptable locale can be
identified. identified.
Returns a map of message keys to strings." Returns a map of message keys to strings; if no useable file is found, returns nil."
{:doc/format :markdown} {:doc/format :markdown}
[^String accept-language-header ^String resource-path ^String default-locale] [^String accept-language-header ^String resource-path ^String default-locale]
(let [file-path (first (let [file-path (first
@ -143,6 +143,7 @@
#(find-language-file-name % resource-path) #(find-language-file-name % resource-path)
(acceptable-languages accept-language-header))))] (acceptable-languages accept-language-header))))]
(timbre/debug (str "Found i18n file at '" file-path "'")) (timbre/debug (str "Found i18n file at '" file-path "'"))
(try
(read-string (read-string
(slurp (slurp
(or (or
@ -150,7 +151,10 @@
(.getAbsolutePath (.getAbsolutePath
(io/file (io/file
resource-path resource-path
(str default-locale ".edn")))))))) (str default-locale ".edn"))))))
(catch Exception any
(timbre/error (str "Failed to load internationalisation because " (.getMessage any)))
nil))))
(def get-messages (def get-messages

5
test/scot/weft/i18n/test/core.clj
View file

@ -203,4 +203,7 @@
(is (is
(= (=
"Ceci n'est pas une pipe." "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" "resources/i18n" "en-GB"))))
(is
(= nil (get-messages "xx-XX;q=0.5, yy-YY" "resources/i18n" "zz-ZZ"))
"If no usable file is found, an exception should not be thrown.")))