From 331ba1fed3ca5e25942c906b10f670e2ed03299b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <kleen@cip.ifi.lmu.de>
Date: Mon, 21 Oct 2019 15:14:30 +0200
Subject: [PATCH] feat(i18n): 12h-clock for english locales

---
 src/Foundation.hs | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 9f973bfd5..3ba6f09bb 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -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