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

Deprecated individual config variables in favour of a config map.

Browse source
This commit is contained in:
Simon Brooke 2023-01-05 12:45:02 +00:00
parent aadf7f46a0
commit d1c96732b5
No known key found for this signature in database
GPG key ID: A7A4F18D1D4DF987
4 changed files with 63 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,13 +22,18 @@
(def ^:dynamic *resource-path*
"The default path within the resources space on which translation files
will be sought."
will be sought. Deprecated, prefer `(:resource-path *config*)`."
"i18n")
(def ^:dynamic *default-language*
"The default language to seek."
"The default language to seek. Deprecated, prefer `(:default-language *config*)`."
(-> (locale/get-default) locale/to-language-tag))
(def ^:dynamic *config*
"Extensible configuration for i18n."
{:default-language (-> (locale/get-default) locale/to-language-tag)
:resource-path "i18n"})
(def accept-language-grammar
"Grammar for `Accept-Language` headers"
"HEADER := SPECIFIER | SPECIFIERS;
@ -218,9 +223,13 @@
* `default-locale` should be a locale specifier to use if no acceptable locale can be
identified."
(fn ([^Keyword token ^String accept-language-header ^String resource-path ^String default-locale]
(let [message ((get-messages accept-language-header resource-path default-locale) token)]
(let [message (token (get-messages accept-language-header resource-path default-locale))]
(or message (name token))))
([^Keyword token ^String accept-language-header]
(get-message token accept-language-header *resource-path* *default-language*))
(get-message token
accept-language-header
(or (:resource-path *config*) *resource-path*)
(or (:default-language *config*) *default-language*)))
([^Keyword token]
(get-message token *default-language* *resource-path* *default-language*))))
(get-message token
(or (:default-language *config*) *default-language*)))))