feat(i18n): 12h-clock for english locales

This commit is contained in:
Gregor Kleen 2019-10-21 15:14:30 +02:00
parent 205d7688bf
commit 331ba1fed3

View File

@ -511,7 +511,7 @@ instance Button UniWorX ButtonSubmit where
getTimeLocale' :: [Lang] -> TimeLocale
getTimeLocale' = $(timeLocaleMap [("de-de", "de_DE.utf8"), ("en-eu", "en_IE.utf8")])
getTimeLocale' = $(timeLocaleMap [("de-de", "de_DE.utf8"), ("en-GB", "en_GB.utf8")])
appTZ :: TZ
appTZ = $(includeSystemTZ "Europe/Berlin")
@ -3625,14 +3625,11 @@ updateUserLanguage (Just lang) = do
invalidArgs ["Unsupported language"]
muid <- maybeAuthId
case muid of
Just uid -> do
langs <- languages
update uid [ UserLanguages =. Just (Languages $ lang : nub (filter ((&&) <$> (`elem` appLanguages) <*> (/= lang)) langs)) ]
updateUserLanguage Nothing
Nothing -> do
setLangCookie lang
return $ Just lang
for_ muid $ \uid -> do
langs <- languages
update uid [ UserLanguages =. Just (Languages $ lang : nub (filter ((&&) <$> (`elem` appLanguages) <*> (/= lang)) langs)) ]
setLangCookie lang
return $ Just lang
updateUserLanguage Nothing = runMaybeT $ do
uid <- MaybeT maybeAuthId
User{..} <- MaybeT $ get uid