Move ui language into messages

modules/webapp/src/main/elm/App/Data.elm

@@ -14,6 +14,7 @@ import Data.Flags exposing (Flags)
 import Data.UiSettings exposing (UiSettings)
 import Data.UiTheme exposing (UiTheme)
 import Http
+import Messages.UiLanguage exposing (UiLanguage)
 import Page exposing (Page(..))
 import Page.CollectiveSettings.Data
 import Page.Home.Data
@@ -25,7 +26,6 @@ import Page.Queue.Data
 import Page.Register.Data
 import Page.Upload.Data
 import Page.UserSettings.Data
-import UiLanguage exposing (UiLanguage)
 import Url exposing (Url)
 
 
@@ -101,7 +101,7 @@ init key url flags_ settings =
       , uiSettings = settings
       , sidebarVisible = settings.sideMenuVisible
       , anonymousTheme = Data.UiTheme.Light
-      , anonymousUiLang = UiLanguage.English
+      , anonymousUiLang = Messages.UiLanguage.English
       , langMenuOpen = False
       }
     , Cmd.batch
@@ -163,7 +163,7 @@ type Msg
 
 
 defaultPage : Flags -> Page
-defaultPage flags =
+defaultPage _ =
     HomePage
 
 

modules/webapp/src/main/elm/App/View2.elm

@@ -9,6 +9,7 @@ import Html.Attributes exposing (..)
 import Html.Events exposing (onClick)
 import Messages exposing (Messages)
 import Messages.App exposing (Texts)
+import Messages.UiLanguage
 import Page exposing (Page(..))
 import Page.CollectiveSettings.View2 as CollectiveSettings
 import Page.Home.Data
@@ -22,7 +23,6 @@ import Page.Register.View2 as Register
 import Page.Upload.View2 as Upload
 import Page.UserSettings.View2 as UserSettings
 import Styles as S
-import UiLanguage
 
 
 view : Model -> List (Html Msg)
@@ -198,7 +198,7 @@ langMenu model =
             [ class dropdownMenu
             , classList [ ( "hidden", not model.langMenuOpen ) ]
             ]
-            (List.map langItem UiLanguage.all)
+            (List.map langItem Messages.UiLanguage.all)
         ]