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

Revert "All tests pass again! Two separate silly bugs."

Browse source 
This reverts commit 6f3817022a.
This commit is contained in:
Simon Brooke 2017-09-08 15:51:02 +01:00 committed by simon
parent 6f3817022a
commit c31a3548d4
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -160,13 +160,12 @@
(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))))

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

@ -199,11 +199,11 @@
(is
(=
"This is not a pipe"
(:pipe (get-messages "en-GB, fr-FR;q=0.9" "i18n" "en-GB"))))
(:pipe (get-messages "en-GB, fr-FR;q=0.9" "resources/i18n" "en-GB"))))
(is
(=
"Ceci n'est pas une pipe."
(:pipe (get-messages "en-GB;q=0.9, fr-FR" "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" "i18n" "zz-ZZ"))
(= 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.")))