fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gregor Kleen 2019-10-21 15:14:30 +02:00
parent 205d7688bf
commit 331ba1fed3
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Foundation.hs
View File

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