Design income form

2 files changed, 47 insertions, 12 deletions

diff --git a/src/server/Model/Message/Key.hs b/src/server/Model/Message/Key.hs
index 4a49900..d34eea3 100644
--- a/src/server/Model/Message/Key.hs
+++ b/src/server/Model/Message/Key.hs
@@ -51,7 +51,6 @@ data Key =
 
   | CategoryRequired
   | CostRequired
-  | DateValidationError
 
   -- Payments
 
@@ -77,12 +76,21 @@ data Key =
   -- Income
 
   | CumulativeIncomesSince
-  | AddIncome
   | Income
   | MonthlyNetIncomes
   | IncomeNotDeleted
   | Creation
   | Amount
+  | Delete
+
+  -- Form
+
+  | Empty
+  | InvalidString
+  | InvalidDate
+  | InvalidInt
+  | SmallerIntThan
+  | GreaterIntThan
 
   -- Http error
 
diff --git a/src/server/Model/Message/Translations.hs b/src/server/Model/Message/Translations.hs
index 3ceb7a3..2060611 100644
--- a/src/server/Model/Message/Translations.hs
+++ b/src/server/Model/Message/Translations.hs
@@ -198,11 +198,6 @@ m l CostRequired =
     English -> "Type a positive cost."
     French  -> "Entre un coût positif."
 
-m l DateValidationError =
-  case l of
-    English -> "The date must be day/month/year"
-    French  -> "La date doit avoir la forme jour/mois/année"
-
 -- Payments
 
 m l Add =
@@ -289,11 +284,6 @@ m l CumulativeIncomesSince =
     English -> "Cumulative incomes since {0}"
     French  -> "Revenus nets cumulés depuis le {0}"
 
-m l AddIncome =
-  case l of
-    English -> "Add a monthly income"
-    French  -> "Ajouter un revenu mensuel net"
-
 m l Income =
   case l of
     English -> "Income"
@@ -319,6 +309,43 @@ m l Amount =
     English -> "Amount"
     French  -> "Montant"
 
+m l Delete =
+  case l of
+    English -> "Delete"
+    French  -> "Supprimer"
+
+-- Form error
+
+m l Empty =
+  case l of
+    English -> "Required field"
+    French  -> "Champ requis"
+
+m l InvalidString =
+  case l of
+    English -> "String required"
+    French  -> "Chaîne de caractères requise"
+
+m l InvalidDate =
+  case l of
+    English -> "day/month/year required"
+    French  -> "jour/mois/année requis"
+
+m l InvalidInt =
+  case l of
+    English -> "Integer required"
+    French  -> "Entier requis"
+
+m l SmallerIntThan =
+  case l of
+    English -> "Integer bigger than {0} required"
+    French  -> "Entier supérieur à {0} requis"
+
+m l GreaterIntThan =
+  case l of
+    English -> "Integer smaller than {0} required"
+    French  -> "Entier inférieur à {0} requis"
+
 -- Http error
 
 m l Timeout =