TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-23 02:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move ui language into messages

Browse Source
This commit is contained in:
Eike Kettner
2021-04-10 16:13:49 +02:00
parent 92ae22a68d
commit e630786104
6 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/webapp/src/main/elm/Data/UiSettings.elm
View File

@ -31,7 +31,7 @@ import Dict exposing (Dict)
import Html exposing (Attribute)
import Html.Attributes as HA
import Messages
import UiLanguage exposing (UiLanguage)
import Messages.UiLanguage exposing (UiLanguage)
{-| Settings for the web ui. All fields should be optional, since it
@ -167,7 +167,7 @@ defaults =
, uiTheme = Data.UiTheme.Light
, sideMenuVisible = True
, powerSearchEnabled = False
, uiLang = UiLanguage.English
, uiLang = Messages.UiLanguage.English
}
@ -222,7 +222,7 @@ merge given fallback =
, powerSearchEnabled = given.powerSearchEnabled
, uiLang =
Maybe.map Messages.fromIso2 given.uiLang
|> Maybe.withDefault UiLanguage.English
|> Maybe.withDefault Messages.UiLanguage.English
}