From 79ab662a8079cc38434aa84dca4047384ceff10e Mon Sep 17 00:00:00 2001 From: Josh Berman Date: Sun, 26 Nov 2017 11:52:37 +0200 Subject: [PATCH 1/2] Fix docs on `languages` set and `getMessageRender` to use it (#1325) --- yesod-core/ChangeLog.md | 3 +++ yesod-core/Yesod/Core/Handler.hs | 8 ++++---- yesod-core/yesod-core.cabal | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/yesod-core/ChangeLog.md b/yesod-core/ChangeLog.md index 6e9d8d3e..85a3e3ad 100644 --- a/yesod-core/ChangeLog.md +++ b/yesod-core/ChangeLog.md @@ -1,3 +1,6 @@ +## 1.4.37.1 +* Fix documentation on `languages` function, update `getMessageRender` to use said function. [1325] (https://github.com/yesodweb/yesod/issues/1325) + ## 1.4.37 * Add `setWeakEtag` function in Yesod.Core.Handler module. diff --git a/yesod-core/Yesod/Core/Handler.hs b/yesod-core/Yesod/Core/Handler.hs index 94dd27dc..b393a641 100644 --- a/yesod-core/Yesod/Core/Handler.hs +++ b/yesod-core/Yesod/Core/Handler.hs @@ -1079,7 +1079,7 @@ getMessageRender :: (MonadHandler m, RenderMessage (HandlerSite m) message) => m (message -> Text) getMessageRender = do env <- askHandlerEnv - l <- reqLangs <$> getRequest + l <- languages return $ renderMessage (rheSite env) l -- | Use a per-request cache to avoid performing the same action multiple times. @@ -1130,15 +1130,15 @@ cachedBy k action = do -- | Get the list of supported languages supplied by the user. -- --- Languages are determined based on the following three (in descending order +-- Languages are determined based on the following (in descending order -- of preference): -- +-- * The _LANG user session variable. +-- -- * The _LANG get parameter. -- -- * The _LANG cookie. -- --- * The _LANG user session variable. --- -- * Accept-Language HTTP header. -- -- Yesod will seek the first language from the returned list matched with languages supporting by your application. This language will be used to render i18n templates. diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal index 80794eb3..859b391a 100644 --- a/yesod-core/yesod-core.cabal +++ b/yesod-core/yesod-core.cabal @@ -1,5 +1,5 @@ name: yesod-core -version: 1.4.37 +version: 1.4.37.1 license: MIT license-file: LICENSE author: Michael Snoyman From 6d6afcf8261f39b7de2c30381a1555afe345ffd3 Mon Sep 17 00:00:00 2001 From: Josh Berman Date: Sun, 26 Nov 2017 12:09:17 +0200 Subject: [PATCH 2/2] point changelog to PR not issue --- yesod-core/ChangeLog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yesod-core/ChangeLog.md b/yesod-core/ChangeLog.md index 85a3e3ad..b24dc010 100644 --- a/yesod-core/ChangeLog.md +++ b/yesod-core/ChangeLog.md @@ -1,5 +1,5 @@ ## 1.4.37.1 -* Fix documentation on `languages` function, update `getMessageRender` to use said function. [1325] (https://github.com/yesodweb/yesod/issues/1325) +* Fix documentation on `languages` function, update `getMessageRender` to use said function. [#1457] (https://github.com/yesodweb/yesod/pull/1457) ## 1.4.37