From 21a96ce44d44882b4ca67e0fdab5942ce397235b Mon Sep 17 00:00:00 2001 From: SJost Date: Tue, 12 Jun 2018 10:05:58 +0200 Subject: [PATCH] AlertMessage close working with i18n now. --- src/Foundation.hs | 1 + src/Utils/DB.hs | 4 +--- templates/standalone/alerts.julius | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Foundation.hs b/src/Foundation.hs index ad8f9b5b8..08ee410b6 100644 --- a/src/Foundation.hs +++ b/src/Foundation.hs @@ -412,6 +412,7 @@ instance Yesod UniWorX where defaultLayout widget = do master <- getYesod mmsgs <- getMessages + messageRender <- getMessageRender -- needed, since there is no i18n interpolation in Julius mcurrentRoute <- getCurrentRoute diff --git a/src/Utils/DB.hs b/src/Utils/DB.hs index 744cbe85a..6c149e668 100644 --- a/src/Utils/DB.hs +++ b/src/Utils/DB.hs @@ -11,10 +11,8 @@ import qualified Data.List as List import Data.Map (Map) import qualified Data.Map as Map -import Database.Persist +-- import Database.Persist -- currently not needed here --- getKeyBy :: PersistEntity val => Unique val -> ReaderT backend0 m0 (Maybe (Entity val)) --- getKeyBy :: Unique a -> YesodDB site (Key a) entities2map :: PersistEntity record => [Entity record] -> Map (Key record) record entities2map = foldl' (\m entity -> Map.insert (entityKey entity) (entityVal entity) m) Map.empty diff --git a/templates/standalone/alerts.julius b/templates/standalone/alerts.julius index f32962cb7..af87ed683 100644 --- a/templates/standalone/alerts.julius +++ b/templates/standalone/alerts.julius @@ -6,8 +6,7 @@ window.utils.alert = function(alertEl) { var closeEl = document.createElement('DIV'); closeEl.classList.add('alert__close'); - // TODO: fix this. How to request translation in *.julius .files? - closeEl.innerText = "_{MsgCloseAlert}"; + closeEl.innerText = #{String (messageRender MsgCloseAlert)}; closeEl.addEventListener('click', function(event) { alertEl.classList.add('alert--invisible'); });