From 6d8bd530cbe3120b3afd2a1a7e041eb901521cc9 Mon Sep 17 00:00:00 2001 From: eikek Date: Mon, 7 Jun 2021 10:08:15 +0200 Subject: [PATCH] Fix translation for direction --- .../webapp/src/main/elm/Comp/DetailEdit.elm | 24 +++++++++---------- .../src/main/elm/Comp/ItemDetail/EditForm.elm | 2 +- .../main/elm/Comp/ItemDetail/FormChange.elm | 2 +- .../elm/Comp/ItemDetail/MultiEditMenu.elm | 2 +- .../src/main/elm/Comp/ItemDetail/Update.elm | 2 +- .../src/main/elm/Comp/ItemDetail/View2.elm | 2 +- .../src/main/elm/Comp/ScanMailboxForm.elm | 2 +- .../webapp/src/main/elm/Comp/SearchMenu.elm | 2 +- .../webapp/src/main/elm/Data/Direction.elm | 6 ++--- .../src/main/elm/Messages/Comp/DetailEdit.elm | 15 ++++++++++++ .../elm/Messages/Comp/ItemDetail/EditForm.elm | 5 ++++ .../Comp/ItemDetail/MultiEditMenu.elm | 5 ++++ .../src/main/elm/Messages/Comp/SearchMenu.elm | 5 ++++ 13 files changed, 52 insertions(+), 22 deletions(-) diff --git a/modules/webapp/src/main/elm/Comp/DetailEdit.elm b/modules/webapp/src/main/elm/Comp/DetailEdit.elm index 577cb59a..0b861b63 100644 --- a/modules/webapp/src/main/elm/Comp/DetailEdit.elm +++ b/modules/webapp/src/main/elm/Comp/DetailEdit.elm @@ -694,15 +694,15 @@ view2 texts attr settings model = (viewIntern2 texts settings True model) -formHeading : String -> Model -> Html msg -formHeading classes model = +formHeading : Texts -> String -> Model -> Html msg +formHeading texts classes model = let heading = - fold (\_ -> "Add Tag") - (\_ -> "Add Person") - (\_ -> "Add Organization") - (\_ -> "Add Equipment") - (\_ -> "Add Custom Field") + fold (\_ -> texts.addTagHeader) + (\_ -> texts.addPersonHeader) + (\_ -> texts.addOrgHeader) + (\_ -> texts.addEquipmentHeader) + (\_ -> texts.addCustomFieldHeader) headIcon = fold (\_ -> Icons.tagIcon2 "mr-2") @@ -724,11 +724,11 @@ viewModal2 texts settings mm = mm == Nothing heading = - fold (\_ -> "Add Tag") - (\_ -> "Add Person") - (\_ -> "Add Organization") - (\_ -> "Add Equipment") - (\_ -> "Add Custom Field") + fold (\_ -> texts.addTagHeader) + (\_ -> texts.addPersonHeader) + (\_ -> texts.addOrgHeader) + (\_ -> texts.addEquipmentHeader) + (\_ -> texts.addCustomFieldHeader) headIcon = fold (\_ -> Icons.tagIcon2 "mr-2") diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm index edefdf3e..129e5fc1 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/EditForm.elm @@ -117,7 +117,7 @@ formTabs texts flags settings model = directionCfg = { makeOption = \entry -> - { text = Data.Direction.toString entry + { text = texts.direction entry , additional = "" } , placeholder = texts.chooseDirection diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/FormChange.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/FormChange.elm index 2bb39e91..121ef7dd 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/FormChange.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/FormChange.elm @@ -104,7 +104,7 @@ multiUpdate flags ids change receive = DirectionChange dir -> let data = - ItemsAndDirection items (Data.Direction.toString dir) + ItemsAndDirection items (Data.Direction.asString dir) in Api.setDirectionMultiple flags data receive diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm index 09dcee4f..9fe1d01b 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/MultiEditMenu.elm @@ -688,7 +688,7 @@ renderEditForm2 texts flags cfg settings model = directionCfg = { makeOption = \entry -> - { text = Data.Direction.toString entry + { text = texts.direction entry , additional = "" } , placeholder = texts.chooseDirection diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm index ea47c6d6..3cf80460 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm @@ -1628,7 +1628,7 @@ setDirection flags model = in case dir of Just d -> - Api.setDirection flags model.item.id (DirectionValue (Data.Direction.toString d)) SaveResp + Api.setDirection flags model.item.id (DirectionValue (Data.Direction.asString d)) SaveResp Nothing -> Cmd.none diff --git a/modules/webapp/src/main/elm/Comp/ItemDetail/View2.elm b/modules/webapp/src/main/elm/Comp/ItemDetail/View2.elm index 864d3b8f..d4c93ebd 100644 --- a/modules/webapp/src/main/elm/Comp/ItemDetail/View2.elm +++ b/modules/webapp/src/main/elm/Comp/ItemDetail/View2.elm @@ -314,7 +314,7 @@ addDetailForm texts settings model = [ class "flex flex-col px-2 py-2 mb-4" , class S.box ] - [ Comp.DetailEdit.formHeading S.header3 mm + [ Comp.DetailEdit.formHeading texts.detailEdit S.header3 mm , Html.map ModalEditMsg (Comp.DetailEdit.view2 texts.detailEdit [] settings mm) ] diff --git a/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm b/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm index b47422d2..a90cb407 100644 --- a/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm +++ b/modules/webapp/src/main/elm/Comp/ScanMailboxForm.elm @@ -303,7 +303,7 @@ makeSettings model = , deleteMail = model.deleteMail , targetFolder = model.targetFolder , folders = folders - , direction = Maybe.map Data.Direction.toString model.direction + , direction = Maybe.map Data.Direction.asString model.direction , schedule = Data.CalEvent.makeEvent timer , itemFolder = model.itemFolderId , fileFilter = model.fileFilter diff --git a/modules/webapp/src/main/elm/Comp/SearchMenu.elm b/modules/webapp/src/main/elm/Comp/SearchMenu.elm index c12f0e46..2ecca6e7 100644 --- a/modules/webapp/src/main/elm/Comp/SearchMenu.elm +++ b/modules/webapp/src/main/elm/Comp/SearchMenu.elm @@ -1120,7 +1120,7 @@ searchTabs texts ddd flags settings model = directionCfg = { makeOption = \entry -> - { text = Data.Direction.toString entry + { text = texts.direction entry , additional = "" } , placeholder = texts.chooseDirection diff --git a/modules/webapp/src/main/elm/Data/Direction.elm b/modules/webapp/src/main/elm/Data/Direction.elm index b7230f6f..3933dcd4 100644 --- a/modules/webapp/src/main/elm/Data/Direction.elm +++ b/modules/webapp/src/main/elm/Data/Direction.elm @@ -1,6 +1,7 @@ module Data.Direction exposing ( Direction(..) , all + , asString , fromString , icon , icon2 @@ -8,7 +9,6 @@ module Data.Direction exposing , iconFromMaybe2 , iconFromString , iconFromString2 - , toString ) @@ -37,8 +37,8 @@ all = ] -toString : Direction -> String -toString dir = +asString : Direction -> String +asString dir = case dir of Incoming -> "Incoming" diff --git a/modules/webapp/src/main/elm/Messages/Comp/DetailEdit.elm b/modules/webapp/src/main/elm/Messages/Comp/DetailEdit.elm index 4288734e..f8e5081b 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/DetailEdit.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/DetailEdit.elm @@ -24,6 +24,11 @@ type alias Texts = , httpError : Http.Error -> String , submitSuccessful : String , missingRequiredFields : String + , addTagHeader : String + , addPersonHeader : String + , addOrgHeader : String + , addEquipmentHeader : String + , addCustomFieldHeader : String } @@ -38,6 +43,11 @@ gb = , httpError = Messages.Comp.HttpError.gb , submitSuccessful = "Successfully saved." , missingRequiredFields = "Please fill required fields." + , addTagHeader = "Add Tag" + , addPersonHeader = "Add Person" + , addOrgHeader = "Add Organization" + , addEquipmentHeader = "Add Equipment" + , addCustomFieldHeader = "Add Custom Field" } @@ -52,4 +62,9 @@ de = , httpError = Messages.Comp.HttpError.de , submitSuccessful = "Erfolgreich gespeichert." , missingRequiredFields = "Bitte erforderliche Felder ausfüllen." + , addTagHeader = "Tag anlegen" + , addPersonHeader = "Person anlegen" + , addOrgHeader = "Organisation anlegen" + , addEquipmentHeader = "Zubehör anlegen" + , addCustomFieldHeader = "Benutzer-Feld anlegen" } diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/EditForm.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/EditForm.elm index 1cccf11a..efc5907e 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/EditForm.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/EditForm.elm @@ -4,8 +4,10 @@ module Messages.Comp.ItemDetail.EditForm exposing , gb ) +import Data.Direction exposing (Direction) import Messages.Basics import Messages.Comp.CustomFieldMultiInput +import Messages.Data.Direction import Messages.DateFormat as DF import Messages.UiLanguage @@ -27,6 +29,7 @@ type alias Texts = , editEquipment : String , suggestions : String , formatDate : Int -> String + , direction : Direction -> String } @@ -48,6 +51,7 @@ gb = , editEquipment = "Edit equipment" , suggestions = "Suggestions" , formatDate = DF.formatDateLong Messages.UiLanguage.English + , direction = Messages.Data.Direction.gb } @@ -69,4 +73,5 @@ de = , editEquipment = "Zubehör ändern" , suggestions = "Vorschläge" , formatDate = DF.formatDateLong Messages.UiLanguage.German + , direction = Messages.Data.Direction.de } diff --git a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/MultiEditMenu.elm b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/MultiEditMenu.elm index feb60d67..42ed2ac7 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/MultiEditMenu.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/ItemDetail/MultiEditMenu.elm @@ -4,8 +4,10 @@ module Messages.Comp.ItemDetail.MultiEditMenu exposing , gb ) +import Data.Direction exposing (Direction) import Messages.Basics import Messages.Comp.CustomFieldMultiInput +import Messages.Data.Direction type alias Texts = @@ -20,6 +22,7 @@ type alias Texts = , unconfirm : String , changeTagMode : String , dueDateTab : String + , direction : Direction -> String } @@ -36,6 +39,7 @@ gb = , unconfirm = "Unconfirm" , changeTagMode = "Change tag edit mode" , dueDateTab = "Due Date" + , direction = Messages.Data.Direction.gb } @@ -52,4 +56,5 @@ de = , unconfirm = "Widerufe Betätigung" , changeTagMode = "Wechsel den Änderungs-Modus für Tags" , dueDateTab = "Fälligkeits-Datum" + , direction = Messages.Data.Direction.de } diff --git a/modules/webapp/src/main/elm/Messages/Comp/SearchMenu.elm b/modules/webapp/src/main/elm/Messages/Comp/SearchMenu.elm index 3f42de79..38896d44 100644 --- a/modules/webapp/src/main/elm/Messages/Comp/SearchMenu.elm +++ b/modules/webapp/src/main/elm/Messages/Comp/SearchMenu.elm @@ -4,10 +4,12 @@ module Messages.Comp.SearchMenu exposing , gb ) +import Data.Direction exposing (Direction) import Messages.Basics import Messages.Comp.CustomFieldMultiInput import Messages.Comp.FolderSelect import Messages.Comp.TagSelect +import Messages.Data.Direction type alias Texts = @@ -36,6 +38,7 @@ type alias Texts = , dueTo : String , sourceTab : String , searchInItemSource : String + , direction : Direction -> String } @@ -66,6 +69,7 @@ gb = , dueTo = "Due To" , sourceTab = "Source" , searchInItemSource = "Search in item source…" + , direction = Messages.Data.Direction.gb } @@ -96,4 +100,5 @@ de = , dueTo = "Fällig bis" , sourceTab = "Quelle" , searchInItemSource = "Suche in Dokument Quelle…" + , direction = Messages.Data.Direction.de }