From 6541fa5316816d6f97a87a370775cfe278e7eeb8 Mon Sep 17 00:00:00 2001 From: Joris Date: Thu, 7 Apr 2016 23:58:23 +0200 Subject: Add cumulative incomes by user --- src/server/Model/Message/Key.hs | 2 +- src/server/Model/Message/Translations.hs | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/server/Model') diff --git a/src/server/Model/Message/Key.hs b/src/server/Model/Message/Key.hs index b42cdcd..43b8faa 100644 --- a/src/server/Model/Message/Key.hs +++ b/src/server/Model/Message/Key.hs @@ -52,7 +52,6 @@ data Key = | CategoryRequired | CostRequired | DateValidationError - | IncomeValidationError -- Payments @@ -73,6 +72,7 @@ data Key = -- Income + | CumulativeIncomesSince | AddIncome | Income | MonthlyNetIncomes diff --git a/src/server/Model/Message/Translations.hs b/src/server/Model/Message/Translations.hs index 1d3fbe6..d4e5454 100644 --- a/src/server/Model/Message/Translations.hs +++ b/src/server/Model/Message/Translations.hs @@ -203,11 +203,6 @@ m l DateValidationError = English -> "The date must be day/month/year" French -> "La date doit avoir la forme jour/mois/année" -m l IncomeValidationError = - case l of - English -> "The income must be a positive integer." - French -> "Le revenu doit être un entier positif." - -- Payments m l Add = @@ -269,9 +264,14 @@ m l ByMonths = -- Income +m l CumulativeIncomesSince = + case l of + English -> "Cumulative incomes since {0}" + French -> "Revenus nets cumulés depuis le {0}" + m l AddIncome = case l of - English -> "Add a monthly net income" + English -> "Add a monthly income" French -> "Ajouter un revenu mensuel net" m l Income = @@ -281,7 +281,7 @@ m l Income = m l MonthlyNetIncomes = case l of - English -> "Monthly net incomes" + English -> "Monthly incomes" French -> "Revenus mensuels nets" m l IncomeNotDeleted = -- cgit v1.2.3