From dab9e42dae6e5287935e5dfc418fcb2adf036b9a Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 6 Sep 2015 19:29:07 +0200 Subject: Showing the total amount of monthly payments --- src/client/View/LoggedIn/Monthly.elm | 3 ++- src/server/Model/Message/Translations.hs | 10 +++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/client/View/LoggedIn/Monthly.elm b/src/client/View/LoggedIn/Monthly.elm index 715288b..6d30e4a 100644 --- a/src/client/View/LoggedIn/Monthly.elm +++ b/src/client/View/LoggedIn/Monthly.elm @@ -38,12 +38,13 @@ monthlyPayments model loggedInView = monthlyCount : Model -> Monthly -> Html monthlyCount model monthly = let count = List.length monthly.payments + total = List.sum << List.map .cost <| monthly.payments key = if count > 1 then "PluralMonthlyCount" else "SingularMonthlyCount" in button [ class "count" , onClick actions.address (UpdateLoggedIn << UpdateMonthly <| ToggleDetail) ] - [ text (getParamMessage [toString count] key model.translations) + [ text (getParamMessage [toString count, toString total] key model.translations) , div [ class "expand" ] [ if monthly.visibleDetail diff --git a/src/server/Model/Message/Translations.hs b/src/server/Model/Message/Translations.hs index 501f00f..0a1226a 100644 --- a/src/server/Model/Message/Translations.hs +++ b/src/server/Model/Message/Translations.hs @@ -216,6 +216,10 @@ m l SingularMonthlyCount = French -> "Vous avez {1} paiement mensuel." m l PluralMonthlyCount = - case l of - English -> "You have {1} monthly payments." - French -> "Vous avez {1} paiements mensuels." + T.concat + [ case l of + English -> "You have {1} monthly payments with a total of {2} " + French -> "Vous avez {1} paiements mensuels d'une valeur totale de {2} " + , m l MoneySymbol + , "." + ] -- cgit v1.2.3