From 27e11b20b06f2f2dbfb56c0998a63169b4b8abc4 Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 8 Nov 2017 23:47:26 +0100
Subject: Use a better project structure

---
 common/src/Common/Message/Translation.hs | 697 +++++++++++++++++++++++++++++++
 1 file changed, 697 insertions(+)
 create mode 100644 common/src/Common/Message/Translation.hs

(limited to 'common/src/Common/Message/Translation.hs')

diff --git a/common/src/Common/Message/Translation.hs b/common/src/Common/Message/Translation.hs
new file mode 100644
index 0000000..900a9e9
--- /dev/null
+++ b/common/src/Common/Message/Translation.hs
@@ -0,0 +1,697 @@
+{-# LANGUAGE OverloadedStrings #-}
+
+module Common.Message.Translation
+  ( get
+  ) where
+
+import Data.Text (Text)
+import qualified Data.Text as T
+
+import Common.Message.Key
+import Common.Message.Lang (Lang(..))
+
+get :: Lang -> Key -> Text
+get = m
+
+m :: Lang -> Key -> Text
+
+m l App_Title =
+  case l of
+    English -> "Shared Cost"
+    French  -> "Partage des frais"
+
+m l Category_Add =
+  case l of
+    English -> "Add an category"
+    French  -> "Ajouter une catégorie"
+
+m l Category_Clone =
+  case l of
+    English -> "Clone an category"
+    French  -> "Cloner une catégorie"
+
+m l Category_Color =
+  case l of
+    English -> "Color"
+    French  -> "Couleur"
+
+m l Category_DeleteConfirm =
+  case l of
+    English -> "Are you sure to delete this category ?"
+    French  -> "Voulez-vous vraiment supprimer cette catégorie ?"
+
+m l Category_Edit =
+  case l of
+    English -> "Edit an category"
+    French  -> "Modifier une catégorie"
+
+m l Category_Empty =
+  case l of
+    English -> "No category."
+    French  -> "Aucune catégorie."
+
+m l Category_Name =
+  case l of
+    English -> "Name"
+    French  -> "Nom"
+
+m l Category_NotDeleted =
+  case l of
+    English -> "The category could not have been deleted."
+    French  -> "La catégorie n’a pas pu être supprimé."
+
+m l Category_Title =
+  case l of
+    English -> "Categories"
+    French  -> "Catégories"
+
+m l Category_Used =
+  case l of
+    English -> "This category is currently being used"
+    French  -> "Cette catégorie est actuellement utilisée"
+
+m l (Date_Short day month year) =
+  case l of
+    English ->
+      T.intercalate "-" [ padded year 4, padded month 2, padded day 2 ]
+    French ->
+      T.intercalate "/" [ padded day 2, padded month 2, padded year 4 ]
+  where padded num pad =
+          let str = show num
+          in  T.pack $ replicate (pad - length str) '0' ++ str
+
+m l (Date_ShortMonthAndYear month year) =
+  case l of
+    English ->
+      T.intercalate "-" . map (T.pack . show) $ [ year, month ]
+    French ->
+      T.intercalate "/" . map (T.pack . show) $ [ month, year ]
+
+m l (Date_Long day month year) =
+  case l of
+    English ->
+      T.concat [ month, " " , T.pack . show $ day, ", ", T.pack . show $ year ]
+    French ->
+      T.intercalate " " [ T.pack . show $ day, month, T.pack . show $ year ]
+
+m l Dialog_Confirm =
+  case l of
+    English -> "Confirm"
+    French  -> "Confirmer"
+
+m l Dialog_Undo =
+  case l of
+    English -> "Undo"
+    French  -> "Annuler"
+
+m l Error_CategoryCreate =
+  case l of
+    English -> "Error at category creation"
+    French  -> "Erreur lors de la création de la catégorie"
+
+m l Error_CategoryDelete =
+  case l of
+    English -> "Error at category deletion"
+    French  -> "Erreur lors de la suppression de la catégorie"
+
+m l Error_CategoryEdit =
+  case l of
+    English -> "Error at category edition"
+    French  -> "Erreur lors de la modification de la catégorie"
+
+m l Error_IncomeCreate =
+  case l of
+    English -> "Error at income creation"
+    French  -> "Erreur lors de la création du revenu"
+
+m l Error_IncomeDelete =
+  case l of
+    English -> "Error at income deletion"
+    French  -> "Erreur lors de la suppression du revenu"
+
+m l Error_IncomeEdit =
+  case l of
+    English -> "Error at income edition"
+    French  -> "Erreur lors de la modification du revenu"
+
+m l Error_PaymentCreate =
+  case l of
+    English -> "Error at payment creation"
+    French  -> "Erreur lors de la création du paiement"
+
+m l Error_PaymentDelete =
+  case l of
+    English -> "Error at payment deletion"
+    French  -> "Erreur lors de la suppression du paiement"
+
+m l Error_PaymentEdit =
+  case l of
+    English -> "Error at payment edition"
+    French  -> "Erreur lors de la modification du paiement"
+
+m l Error_SignOut =
+  case l of
+    English -> "Error at sign out"
+    French  -> "Erreur lors de la déconnexion"
+
+m l Form_AlreadyExists =
+  case l of
+    English -> "Dupplicate field"
+    French  -> "Doublon"
+
+m l Form_CostMustNotBeNull =
+  case l of
+    English -> "Cost must not be zero"
+    French -> "Le coût ne doît pas être nul"
+
+m l Form_Empty =
+  case l of
+    English -> "Required field"
+    French  -> "Champ requis"
+
+m l (Form_GreaterIntThan number) =
+  case l of
+    English -> T.concat [ "Integer smaller than ", T.pack . show $ number, " or equal required" ]
+    French  -> T.concat [ "Entier inférieur ou égal à ", T.pack . show $ number, " requis" ]
+
+m l Form_InvalidCategory =
+  case l of
+    English -> "Invalid category"
+    French  -> "Catégorie invalide"
+
+m l Form_InvalidColor =
+  case l of
+    English -> "Invalid color"
+    French  -> "Couleur invalide"
+
+m l Form_InvalidDate =
+  case l of
+    English -> "day/month/year required"
+    French  -> "jour/mois/année requis"
+
+m l Form_InvalidInt =
+  case l of
+    English -> "Integer required"
+    French  -> "Entier requis"
+
+m l Form_InvalidString =
+  case l of
+    English -> "String required"
+    French  -> "Chaîne de caractères requise"
+
+m l (Form_SmallerIntThan number) =
+  case l of
+    English -> T.concat [ "Integer bigger than ", T.pack . show $ number, " or equal required" ]
+    French  -> T.concat [ "Entier supérieur ou égal à ", T.pack . show $ number, " requis" ]
+
+m l HttpError_BadPayload =
+  case l of
+    English -> "Bad payload server error"
+    French  -> "Contenu inattendu en provenance du serveur"
+
+m l HttpError_BadUrl =
+  case l of
+    English -> "URL not valid"
+    French  -> "l’URL n’est pas valide"
+
+m l HttpError_NetworkError =
+  case l of
+    English -> "Network can not be reached"
+    French  -> "Le serveur n’est pas accessible"
+
+m l HttpError_Timeout =
+  case l of
+    English -> "Timeout server error"
+    French  -> "Le serveur met trop de temps à répondre"
+
+m l Income_AddLong =
+  case l of
+    English -> "Add an income"
+    French  -> "Ajouter un revenu"
+
+m l Income_AddShort =
+  case l of
+    English -> "Add"
+    French  -> "Ajouter"
+
+m l Income_Amount =
+  case l of
+    English -> "Amount"
+    French  -> "Montant"
+
+m l Income_Clone =
+  case l of
+    English -> "Clone an income"
+    French  -> "Cloner un revenu"
+
+m l (Income_CumulativeSince since) =
+  case l of
+    English -> T.concat [ "Cumulative incomes since ", since ]
+    French  -> T.concat [ "Revenus nets cumulés depuis le ", since ]
+
+m l Income_Date =
+  case l of
+    English -> "Date"
+    French  -> "Date"
+
+m l Income_DeleteConfirm =
+  case l of
+    English -> "Are you sure to delete this income ?"
+    French  -> "Voulez-vous vraiment supprimer ce revenu ?"
+
+m l Income_Edit =
+  case l of
+    English -> "Edit an income"
+    French  -> "Modifier un revenu"
+
+m l Income_Empty =
+  case l of
+    English -> "No income."
+    French  -> "Aucun revenu."
+
+m l Income_MonthlyNet =
+  case l of
+    English -> "Net monthly incomes"
+    French  -> "Revenus mensuels nets"
+
+m l Income_NotDeleted =
+  case l of
+    English -> "The income could not have been deleted."
+    French  -> "Le revenu n’a pas pu être supprimé."
+
+m l Income_Title =
+  case l of
+    English -> "Income"
+    French  -> "Revenu"
+
+m l Month_January =
+  case l of
+    English -> "january"
+    French  -> "janvier"
+
+m l Month_February =
+  case l of
+    English -> "february"
+    French  -> "février"
+
+m l Month_March =
+  case l of
+    English -> "march"
+    French  -> "mars"
+
+m l Month_April =
+  case l of
+    English -> "april"
+    French  -> "avril"
+
+m l Month_May =
+  case l of
+    English -> "may"
+    French  -> "mai"
+
+m l Month_June =
+  case l of
+    English -> "june"
+    French  -> "juin"
+
+m l Month_July =
+  case l of
+    English -> "july"
+    French  -> "juillet"
+
+m l Month_August =
+  case l of
+    English -> "august"
+    French  -> "août"
+
+m l Month_September =
+  case l of
+    English -> "september"
+    French  -> "septembre"
+
+m l Month_October =
+  case l of
+    English -> "october"
+    French  -> "octobre"
+
+m l Month_November =
+  case l of
+    English -> "november"
+    French  -> "novembre"
+
+m l Month_December =
+  case l of
+    English -> "december"
+    French  -> "décembre"
+
+m l PageNotFound_Title =
+  case l of
+    English -> "Page not found"
+    French  -> "Page introuvable"
+
+m l Payment_Add =
+  case l of
+    English -> "Add a payment"
+    French  -> "Ajouter un paiement"
+
+m l Payment_Balanced =
+  case l of
+    English -> "Payments are balanced."
+    French  -> "Les paiements sont équilibrés."
+
+m l Payment_Category =
+  case l of
+    English -> "Category"
+    French  -> "Catégorie"
+
+m l Payment_CloneLong =
+  case l of
+    English -> "Clone a payment"
+    French  -> "Cloner un paiement"
+
+m l Payment_CloneShort =
+  case l of
+    English -> "Clone"
+    French  -> "Cloner"
+
+m l Payment_Cost =
+  case l of
+    English -> "Cost"
+    French  -> "Coût"
+
+m l Payment_Date =
+  case l of
+    English -> "Date"
+    French  -> "Date"
+
+m l Payment_Delete =
+  case l of
+    English -> "Delete"
+    French  -> "Supprimer"
+
+m l Payment_DeleteConfirm =
+  case l of
+    English -> "Are you sure to delete this payment ?"
+    French  -> "Voulez-vous vraiment supprimer ce paiement ?"
+
+m l Payment_EditLong =
+  case l of
+    English -> "Edit a payment"
+    French  -> "Modifier un paiement"
+
+m l Payment_EditShort =
+  case l of
+    English -> "Edit"
+    French  -> "Modifier"
+
+m l Payment_Empty =
+  case l of
+    English -> "No payment found from your search criteria."
+    French  -> "Aucun paiement ne correspond à vos critères de recherches."
+
+m l Payment_Frequency =
+  case l of
+    English -> "Frequency"
+    French  -> "Fréquence"
+
+m l Payment_InvalidFrequency =
+  case l of
+    English -> "Invalid frequency"
+    French  -> "Fréquence invalide"
+
+m l Payment_Many =
+  case l of
+    English -> "payments"
+    French  -> "paiements"
+
+m l Payment_MonthlyFemale =
+  case l of
+    English -> "Monthly"
+    French  -> "Mensuelle"
+
+m l Payment_MonthlyMale =
+  case l of
+    English -> "Monthly"
+    French  -> "Mensuel"
+
+m l Payment_Name =
+  case l of
+    English -> "Name"
+    French  -> "Nom"
+
+m l Payment_NotDeleted =
+  case l of
+    English -> "The payment could not have been deleted."
+    French  -> "Le paiement n’a pas pu être supprimé."
+
+m l Payment_One =
+  case l of
+    English -> "payment"
+    French  -> "paiement"
+
+m l Payment_PunctualFemale =
+  case l of
+    English -> "Punctual"
+    French  -> "Ponctuelle"
+
+m l Payment_PunctualMale =
+  case l of
+    English -> "Punctual"
+    French  -> "Ponctuel"
+
+m l Payment_Title =
+  case l of
+    English -> "Payments"
+    French -> "Paiements"
+
+m l Payment_User =
+  case l of
+    English -> "Payer"
+    French  -> "Payeur"
+
+m l (Payment_Worth subject amount) =
+  case l of
+    English -> T.concat [ subject, " worth ", amount ]
+    French -> T.concat [ subject, " comptabilisant ", amount ]
+
+m l Search_Monthly =
+  case l of
+    English -> "Monthly"
+    French  -> "Mensuel"
+
+m l Search_Name =
+  case l of
+    English -> "Search"
+    French  -> "Recherche"
+
+m l Search_Punctual =
+  case l of
+    English -> "Punctual"
+    French  -> "Ponctuel"
+
+m l Secure_Unauthorized =
+  case l of
+    English -> "You are not authorized to sign in."
+    French  -> "Tu n’es pas autorisé à te connecter."
+
+m l Secure_Forbidden =
+  case l of
+    English -> "You need to be logged in to perform this action"
+    French  -> "Tu dois te connecter pour effectuer cette action"
+
+m l SignIn_Button =
+  case l of
+    English -> "Sign in"
+    French  -> "Connexion"
+
+m l SignIn_DisconnectSuccess =
+  case l of
+    English -> "You have successfully disconnected"
+    French  -> "Vous êtes à présent déconnecté."
+
+m l SignIn_EmailInvalid =
+  case l of
+    English -> "Your email is not valid."
+    French  -> "Votre courriel n’est pas valide."
+
+m l SignIn_EmailPlaceholder =
+  case l of
+    English -> "Email"
+    French -> "Courriel"
+
+m l SignIn_EmailSendFail =
+  case l of
+    English -> "You are authorized to sign in, but we failed to send you the sign up email."
+    French  -> "Tu es autorisé à te connecter, mais nous n’avons pas pu t’envoyer le courriel de connexion."
+
+m l SignIn_EmailSent =
+  case l of
+    English -> "We sent you an email with a connexion link."
+    French  -> "Nous t’avons envoyé un courriel avec un lien pour te connecter."
+
+m l SignIn_LinkExpired =
+  case l of
+    English -> "The link expired, please sign in again."
+    French  -> "Le lien sur lequel tu as cliqué a expiré, connecte-toi à nouveau."
+
+m l SignIn_LinkInvalid =
+  case l of
+    English -> "The link is invalid, please sign in again."
+    French  -> "Le lien sur lequel tu as cliqué est invalide, connecte-toi à nouveau."
+
+m l SignIn_LinkUsed =
+  case l of
+    English -> "You already used this link, please sign in again."
+    French  -> "Tu as déjà utilisé ce lien, connecte-toi à nouveau."
+
+m l SignIn_MailTitle =
+  case l of
+    English -> T.concat [ "Sign in to ", m l App_Title ]
+    French  -> T.concat [ "Connexion à ", m l App_Title ]
+
+m l (SignIn_MailBody name url) =
+  T.intercalate
+    "\n"
+    ( case l of
+        English ->
+          [ T.concat [ "Hi ", name, "," ]
+          , ""
+          , T.concat
+              [ "Click to the following link in order to sign in to Shared Cost:"
+              , m l App_Title
+              , ":"
+              ]
+          , url
+          , ""
+          , "See you soon!"
+          ]
+        French  ->
+          [ T.concat [ "Salut ", name, "," ]
+          , ""
+          , T.concat
+              [ "Clique sur le lien suivant pour te connecter à "
+              , m l App_Title
+              , ":"
+              ]
+          , url
+          , ""
+          , "À très vite !"
+          ]
+    )
+
+m l SignIn_ParseError =
+  case l of
+    English -> "Error while reading initial data."
+    French  -> "Erreur lors de la lecture des données initiales."
+
+m l (Statistic_By key value) =
+  case l of
+    English -> T.concat [ key, ": ", value ]
+    French  -> T.concat [ key, " : ", value ]
+
+m l (Statistic_ByMonthsAndMean amount) =
+  case l of
+    English ->
+      T.concat [ "Payments by category by month months (", amount, "on average)" ]
+    French  ->
+      T.concat [ "Paiements par catégorie par mois (en moyenne ", amount, ")" ]
+
+m l Statistic_Title =
+  case l of
+    English -> "Statistics"
+    French  -> "Statistiques"
+
+m l Statistic_Total =
+  case l of
+    English -> "Total"
+    French  -> "Total"
+
+m l WeeklyReport_Empty =
+  case l of
+    English -> "No activity the previous week."
+    French  -> "Pas d’activité la semaine passée."
+
+m l (WeeklyReport_IncomesCreated count) =
+  case l of
+    English -> T.concat [ T.pack . show $ count, " incomes created:" ]
+    French  -> T.concat [ T.pack . show $ count, " revenus créés :" ]
+
+m l (WeeklyReport_IncomesDeleted count) =
+  case l of
+    English -> T.concat [ T.pack . show $ count, " incomes deleted:" ]
+    French  -> T.concat [ T.pack . show $ count, " revenus supprimés :" ]
+
+m l (WeeklyReport_IncomesEdited count) =
+  case l of
+    English -> T.concat [ T.pack . show $ count, " incomes edited:" ]
+    French  -> T.concat [ T.pack . show $ count, " revenus modifiés :" ]
+
+m l (WeeklyReport_IncomeCreated count) =
+  case l of
+    English -> T.concat [ T.pack . show $ count, " income created:" ]
+    French  -> T.concat [ T.pack . show $ count, " revenu créé :" ]
+
+m l (WeeklyReport_IncomeDeleted count) =
+  case l of
+    English -> T.concat [ T.pack . show $ count, " income deleted:" ]
+    French  -> T.concat [ T.pack . show $ count, " revenu supprimé :" ]
+
+m l (WeeklyReport_IncomeEdited count) =
+  case l of
+    English -> T.concat [ T.pack . show $ count, " income edited:" ]
+    French  -> T.concat [ T.pack . show $ count, " revenu modifié :" ]
+
+m l (WeeklyReport_PayedFor name amount for at) =
+  case l of
+    English -> T.concat [ T.pack . show $ name, " payed ", amount, " for “", for, "” at ", at ]
+    French  -> T.concat [ T.pack . show $ name, " a payé ", amount, " concernant « ", for, " » le ", at ]
+
+m l (WeeklyReport_PayedForNot name amount for at) =
+  case l of
+    English -> T.concat [ T.pack . show $ name, " didn’t pay ", amount, " for “", for, "” at ", at ]
+    French  -> T.concat [ T.pack . show $ name, " n’a pas payé ", amount, " concernant « ", for, " » le ", at ]
+
+m l (WeeklyReport_PayedFrom name amount for) =
+  case l of
+    English -> T.concat [ T.pack . show $ name, " is payed ", amount, " of net monthly income from ", for ]
+    French  -> T.concat [ T.pack . show $ name, " est payé ", amount, " net par mois à partir du ", for ]
+
+m l (WeeklyReport_PayedFromNot name amount for) =
+  case l of
+    English -> T.concat [ T.pack . show $ name, " isn’t payed ", amount, " of net monthly income from ", for ]
+    French  -> T.concat [ T.pack . show $ name, " n’est pas payé ", amount, " net par mois à partir du ", for ]
+
+m l (WeeklyReport_PaymentsCreated count) =
+  case l of
+    English -> T.concat [ T.pack . show $ count, " payments created:" ]
+    French  -> T.concat [ T.pack . show $ count, " paiements créés :" ]
+
+m l (WeeklyReport_PaymentsDeleted count) =
+  case l of
+    English -> T.concat [ T.pack . show $ count, " payments deleted:" ]
+    French  -> T.concat [ T.pack . show $ count, " paiements supprimés :" ]
+
+m l (WeeklyReport_PaymentsEdited count) =
+  case l of
+    English -> T.concat [ T.pack . show $ count, " payments edited:" ]
+    French  -> T.concat [ T.pack . show $ count, " paiements modifiés :" ]
+
+m l (WeeklyReport_PaymentCreated count) =
+  case l of
+    English -> T.concat [ T.pack . show $ count, " payment created:" ]
+    French  -> T.concat [ T.pack . show $ count, " paiement créé :" ]
+
+m l (WeeklyReport_PaymentDeleted count) =
+  case l of
+    English -> T.concat [ T.pack . show $ count, " payment deleted:" ]
+    French  -> T.concat [ T.pack . show $ count, " paiement supprimé :" ]
+
+m l (WeeklyReport_PaymentEdited count) =
+  case l of
+    English -> T.concat [ T.pack . show $ count, " payment edited:" ]
+    French  -> T.concat [ T.pack . show $ count, " paiement modifié :" ]
+
+m l WeeklyReport_Title =
+  case l of
+    English -> "Weekly report"
+    French  -> "Rapport hebdomadaire"
-- 
cgit v1.2.3


From 5a63f7be9375e3ab888e4232dd7ef72c2f1ffae1 Mon Sep 17 00:00:00 2001
From: Joris
Date: Mon, 13 Nov 2017 23:56:40 +0100
Subject: Setup stylish-haskell

---
 common/src/Common/Message/Translation.hs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'common/src/Common/Message/Translation.hs')

diff --git a/common/src/Common/Message/Translation.hs b/common/src/Common/Message/Translation.hs
index 900a9e9..16a56dd 100644
--- a/common/src/Common/Message/Translation.hs
+++ b/common/src/Common/Message/Translation.hs
@@ -4,11 +4,11 @@ module Common.Message.Translation
   ( get
   ) where
 
-import Data.Text (Text)
-import qualified Data.Text as T
+import           Data.Text           (Text)
+import qualified Data.Text           as T
 
-import Common.Message.Key
-import Common.Message.Lang (Lang(..))
+import           Common.Message.Key
+import           Common.Message.Lang (Lang (..))
 
 get :: Lang -> Key -> Text
 get = m
@@ -162,7 +162,7 @@ m l Form_AlreadyExists =
 m l Form_CostMustNotBeNull =
   case l of
     English -> "Cost must not be zero"
-    French -> "Le coût ne doît pas être nul"
+    French  -> "Le coût ne doît pas être nul"
 
 m l Form_Empty =
   case l of
@@ -462,7 +462,7 @@ m l Payment_PunctualMale =
 m l Payment_Title =
   case l of
     English -> "Payments"
-    French -> "Paiements"
+    French  -> "Paiements"
 
 m l Payment_User =
   case l of
@@ -472,7 +472,7 @@ m l Payment_User =
 m l (Payment_Worth subject amount) =
   case l of
     English -> T.concat [ subject, " worth ", amount ]
-    French -> T.concat [ subject, " comptabilisant ", amount ]
+    French  -> T.concat [ subject, " comptabilisant ", amount ]
 
 m l Search_Monthly =
   case l of
@@ -517,7 +517,7 @@ m l SignIn_EmailInvalid =
 m l SignIn_EmailPlaceholder =
   case l of
     English -> "Email"
-    French -> "Courriel"
+    French  -> "Courriel"
 
 m l SignIn_EmailSendFail =
   case l of
-- 
cgit v1.2.3


From 7194cddb28656c721342c2ef604f9f9fb0692960 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 19 Nov 2017 00:20:25 +0100
Subject: Show payment count and partition

- Also fixes exceedingPayer in back by using only punctual payments
---
 common/src/Common/Message/Translation.hs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'common/src/Common/Message/Translation.hs')

diff --git a/common/src/Common/Message/Translation.hs b/common/src/Common/Message/Translation.hs
index 16a56dd..0a6084d 100644
--- a/common/src/Common/Message/Translation.hs
+++ b/common/src/Common/Message/Translation.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE OverloadedStrings #-}
-
 module Common.Message.Translation
   ( get
   ) where
@@ -359,6 +357,11 @@ m l Payment_Balanced =
     English -> "Payments are balanced."
     French  -> "Les paiements sont équilibrés."
 
+m l (Payment_By key value) =
+  case l of
+    English -> T.concat [ key, ": ", value ]
+    French  -> T.concat [ key, " : ", value ]
+
 m l Payment_Category =
   case l of
     English -> "Category"
@@ -584,11 +587,6 @@ m l SignIn_ParseError =
     English -> "Error while reading initial data."
     French  -> "Erreur lors de la lecture des données initiales."
 
-m l (Statistic_By key value) =
-  case l of
-    English -> T.concat [ key, ": ", value ]
-    French  -> T.concat [ key, " : ", value ]
-
 m l (Statistic_ByMonthsAndMean amount) =
   case l of
     English ->
-- 
cgit v1.2.3


From 49426740e8e0c59040f4f3721a658f225572582b Mon Sep 17 00:00:00 2001
From: Joris
Date: Tue, 28 Nov 2017 09:11:19 +0100
Subject: Add search for payments

---
 common/src/Common/Message/Translation.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'common/src/Common/Message/Translation.hs')

diff --git a/common/src/Common/Message/Translation.hs b/common/src/Common/Message/Translation.hs
index 0a6084d..13ced15 100644
--- a/common/src/Common/Message/Translation.hs
+++ b/common/src/Common/Message/Translation.hs
@@ -517,7 +517,7 @@ m l SignIn_EmailInvalid =
     English -> "Your email is not valid."
     French  -> "Votre courriel n’est pas valide."
 
-m l SignIn_EmailPlaceholder =
+m l SignIn_EmailLabel =
   case l of
     English -> "Email"
     French  -> "Courriel"
-- 
cgit v1.2.3


From 17d6a05756479388c91bc2e50f721fcea8a82d38 Mon Sep 17 00:00:00 2001
From: Joris
Date: Wed, 3 Jan 2018 17:36:23 +0100
Subject: Remove quotes around names in weekly report

---
 common/src/Common/Message/Translation.hs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'common/src/Common/Message/Translation.hs')

diff --git a/common/src/Common/Message/Translation.hs b/common/src/Common/Message/Translation.hs
index 13ced15..5ea12ad 100644
--- a/common/src/Common/Message/Translation.hs
+++ b/common/src/Common/Message/Translation.hs
@@ -641,23 +641,23 @@ m l (WeeklyReport_IncomeEdited count) =
 
 m l (WeeklyReport_PayedFor name amount for at) =
   case l of
-    English -> T.concat [ T.pack . show $ name, " payed ", amount, " for “", for, "” at ", at ]
-    French  -> T.concat [ T.pack . show $ name, " a payé ", amount, " concernant « ", for, " » le ", at ]
+    English -> T.concat [ name, " payed ", amount, " for “", for, "” at ", at ]
+    French  -> T.concat [ name, " a payé ", amount, " concernant « ", for, " » le ", at ]
 
 m l (WeeklyReport_PayedForNot name amount for at) =
   case l of
-    English -> T.concat [ T.pack . show $ name, " didn’t pay ", amount, " for “", for, "” at ", at ]
-    French  -> T.concat [ T.pack . show $ name, " n’a pas payé ", amount, " concernant « ", for, " » le ", at ]
+    English -> T.concat [ name, " didn’t pay ", amount, " for “", for, "” at ", at ]
+    French  -> T.concat [ name, " n’a pas payé ", amount, " concernant « ", for, " » le ", at ]
 
 m l (WeeklyReport_PayedFrom name amount for) =
   case l of
-    English -> T.concat [ T.pack . show $ name, " is payed ", amount, " of net monthly income from ", for ]
-    French  -> T.concat [ T.pack . show $ name, " est payé ", amount, " net par mois à partir du ", for ]
+    English -> T.concat [ name, " is payed ", amount, " of net monthly income from ", for ]
+    French  -> T.concat [ name, " est payé ", amount, " net par mois à partir du ", for ]
 
 m l (WeeklyReport_PayedFromNot name amount for) =
   case l of
-    English -> T.concat [ T.pack . show $ name, " isn’t payed ", amount, " of net monthly income from ", for ]
-    French  -> T.concat [ T.pack . show $ name, " n’est pas payé ", amount, " net par mois à partir du ", for ]
+    English -> T.concat [ name, " isn’t payed ", amount, " of net monthly income from ", for ]
+    French  -> T.concat [ name, " n’est pas payé ", amount, " net par mois à partir du ", for ]
 
 m l (WeeklyReport_PaymentsCreated count) =
   case l of
-- 
cgit v1.2.3


From 40b4994797a797b1fa86cafda789a5c488730c6d Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 28 Oct 2018 17:57:58 +0100
Subject: Delete payment

---
 common/src/Common/Message/Translation.hs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'common/src/Common/Message/Translation.hs')

diff --git a/common/src/Common/Message/Translation.hs b/common/src/Common/Message/Translation.hs
index 5ea12ad..70eb978 100644
--- a/common/src/Common/Message/Translation.hs
+++ b/common/src/Common/Message/Translation.hs
@@ -157,16 +157,16 @@ m l Form_AlreadyExists =
     English -> "Dupplicate field"
     French  -> "Doublon"
 
-m l Form_CostMustNotBeNull =
-  case l of
-    English -> "Cost must not be zero"
-    French  -> "Le coût ne doît pas être nul"
-
-m l Form_Empty =
+m l Form_NonEmpty =
   case l of
     English -> "Required field"
     French  -> "Champ requis"
 
+m l Form_NonNullNumber =
+  case l of
+    English -> "Number must not be null"
+    French  -> "Le nombre ne doit pas être nul"
+
 m l (Form_GreaterIntThan number) =
   case l of
     English -> T.concat [ "Integer smaller than ", T.pack . show $ number, " or equal required" ]
-- 
cgit v1.2.3


From 2741f47ef7b87255203bc2f7f7b2b9140c70b8f0 Mon Sep 17 00:00:00 2001
From: Joris
Date: Thu, 1 Nov 2018 13:14:25 +0100
Subject: Implementing client side validation

---
 common/src/Common/Message/Translation.hs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'common/src/Common/Message/Translation.hs')

diff --git a/common/src/Common/Message/Translation.hs b/common/src/Common/Message/Translation.hs
index 70eb978..e95fa74 100644
--- a/common/src/Common/Message/Translation.hs
+++ b/common/src/Common/Message/Translation.hs
@@ -162,6 +162,11 @@ m l Form_NonEmpty =
     English -> "Required field"
     French  -> "Champ requis"
 
+m l (Form_MinChars number) =
+  case l of
+    English -> T.concat [ "This field must contains at least ", T.pack . show $ number, " characters" ]
+    French  -> T.concat [ "Ce champ doit contenir au moins ", T.pack . show $ number, " caractères" ]
+
 m l Form_NonNullNumber =
   case l of
     English -> "Number must not be null"
@@ -184,8 +189,8 @@ m l Form_InvalidColor =
 
 m l Form_InvalidDate =
   case l of
-    English -> "day/month/year required"
-    French  -> "jour/mois/année requis"
+    English -> "DD/MM/YYYY required"
+    French  -> "JJ/MM/AAAA requis"
 
 m l Form_InvalidInt =
   case l of
-- 
cgit v1.2.3


From 7c77e52faa71e43324087903c905f9d493b1dfb7 Mon Sep 17 00:00:00 2001
From: Joris
Date: Thu, 8 Aug 2019 21:28:22 +0200
Subject: Finish payment add modal

---
 common/src/Common/Message/Translation.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'common/src/Common/Message/Translation.hs')

diff --git a/common/src/Common/Message/Translation.hs b/common/src/Common/Message/Translation.hs
index e95fa74..4eb0523 100644
--- a/common/src/Common/Message/Translation.hs
+++ b/common/src/Common/Message/Translation.hs
@@ -189,8 +189,8 @@ m l Form_InvalidColor =
 
 m l Form_InvalidDate =
   case l of
-    English -> "DD/MM/YYYY required"
-    French  -> "JJ/MM/AAAA requis"
+    English -> "Date required"
+    French  -> "Date requise"
 
 m l Form_InvalidInt =
   case l of
-- 
cgit v1.2.3


From fb8f0fe577e28dae69903413b761da50586e0099 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sat, 10 Aug 2019 14:53:41 +0200
Subject: Remove payment category if unused after a payment is deleted

---
 common/src/Common/Message/Translation.hs | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'common/src/Common/Message/Translation.hs')

diff --git a/common/src/Common/Message/Translation.hs b/common/src/Common/Message/Translation.hs
index 4eb0523..6b9e7be 100644
--- a/common/src/Common/Message/Translation.hs
+++ b/common/src/Common/Message/Translation.hs
@@ -277,11 +277,6 @@ m l Income_MonthlyNet =
     English -> "Net monthly incomes"
     French  -> "Revenus mensuels nets"
 
-m l Income_NotDeleted =
-  case l of
-    English -> "The income could not have been deleted."
-    French  -> "Le revenu n’a pas pu être supprimé."
-
 m l Income_Title =
   case l of
     English -> "Income"
-- 
cgit v1.2.3


From 52331eeadce8d250564851c25fc965172640bc55 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sat, 12 Oct 2019 11:23:10 +0200
Subject: Implement client routing

---
 common/src/Common/Message/Translation.hs | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'common/src/Common/Message/Translation.hs')

diff --git a/common/src/Common/Message/Translation.hs b/common/src/Common/Message/Translation.hs
index 6b9e7be..3173561 100644
--- a/common/src/Common/Message/Translation.hs
+++ b/common/src/Common/Message/Translation.hs
@@ -693,3 +693,13 @@ m l WeeklyReport_Title =
   case l of
     English -> "Weekly report"
     French  -> "Rapport hebdomadaire"
+
+m l NotFound_Message =
+  case l of
+    English -> "There is nothing here!"
+    French  -> "Vous vous êtes perdu."
+
+m l NotFound_LinkMessage =
+  case l of
+    English -> "Go back to the home page."
+    French  -> "Retour à l’accueil."
-- 
cgit v1.2.3


From 04c59f08f100ba6a0658d1f2b357f7d8b1e14218 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 13 Oct 2019 22:38:35 +0200
Subject: Show income table

---
 common/src/Common/Message/Translation.hs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'common/src/Common/Message/Translation.hs')

diff --git a/common/src/Common/Message/Translation.hs b/common/src/Common/Message/Translation.hs
index 3173561..25e9f4b 100644
--- a/common/src/Common/Message/Translation.hs
+++ b/common/src/Common/Message/Translation.hs
@@ -237,10 +237,15 @@ m l Income_AddShort =
     English -> "Add"
     French  -> "Ajouter"
 
+m l Income_Name =
+  case l of
+    English -> "Name"
+    French  -> "Nom"
+
 m l Income_Amount =
   case l of
-    English -> "Amount"
-    French  -> "Montant"
+    English -> "Income"
+    French  -> "Revenu"
 
 m l Income_Clone =
   case l of
-- 
cgit v1.2.3


From c0ea63f8c1a8c7123b78798cec99726b113fb1f3 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 17 Nov 2019 18:08:28 +0100
Subject: Optimize and refactor payments

---
 common/src/Common/Message/Translation.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'common/src/Common/Message/Translation.hs')

diff --git a/common/src/Common/Message/Translation.hs b/common/src/Common/Message/Translation.hs
index 25e9f4b..a86a371 100644
--- a/common/src/Common/Message/Translation.hs
+++ b/common/src/Common/Message/Translation.hs
@@ -702,7 +702,7 @@ m l WeeklyReport_Title =
 m l NotFound_Message =
   case l of
     English -> "There is nothing here!"
-    French  -> "Vous vous êtes perdu."
+    French  -> "Il n’y a rien à voir ici."
 
 m l NotFound_LinkMessage =
   case l of
-- 
cgit v1.2.3


From af8353c6164aaaaa836bfed181f883ac86bb76a5 Mon Sep 17 00:00:00 2001
From: Joris
Date: Sun, 19 Jan 2020 14:03:31 +0100
Subject: Sign in with email and password

---
 common/src/Common/Message/Translation.hs | 74 +++-----------------------------
 1 file changed, 7 insertions(+), 67 deletions(-)

(limited to 'common/src/Common/Message/Translation.hs')

diff --git a/common/src/Common/Message/Translation.hs b/common/src/Common/Message/Translation.hs
index a86a371..e74c801 100644
--- a/common/src/Common/Message/Translation.hs
+++ b/common/src/Common/Message/Translation.hs
@@ -517,80 +517,20 @@ m l SignIn_DisconnectSuccess =
     English -> "You have successfully disconnected"
     French  -> "Vous êtes à présent déconnecté."
 
-m l SignIn_EmailInvalid =
+m l SignIn_InvalidCredentials =
   case l of
-    English -> "Your email is not valid."
-    French  -> "Votre courriel n’est pas valide."
+    English -> "Your credentials are not valid."
+    French  -> "Vos identifiants de connexion ne sont pas valides."
 
 m l SignIn_EmailLabel =
   case l of
     English -> "Email"
     French  -> "Courriel"
 
-m l SignIn_EmailSendFail =
-  case l of
-    English -> "You are authorized to sign in, but we failed to send you the sign up email."
-    French  -> "Tu es autorisé à te connecter, mais nous n’avons pas pu t’envoyer le courriel de connexion."
-
-m l SignIn_EmailSent =
-  case l of
-    English -> "We sent you an email with a connexion link."
-    French  -> "Nous t’avons envoyé un courriel avec un lien pour te connecter."
-
-m l SignIn_LinkExpired =
-  case l of
-    English -> "The link expired, please sign in again."
-    French  -> "Le lien sur lequel tu as cliqué a expiré, connecte-toi à nouveau."
-
-m l SignIn_LinkInvalid =
-  case l of
-    English -> "The link is invalid, please sign in again."
-    French  -> "Le lien sur lequel tu as cliqué est invalide, connecte-toi à nouveau."
-
-m l SignIn_LinkUsed =
-  case l of
-    English -> "You already used this link, please sign in again."
-    French  -> "Tu as déjà utilisé ce lien, connecte-toi à nouveau."
-
-m l SignIn_MailTitle =
-  case l of
-    English -> T.concat [ "Sign in to ", m l App_Title ]
-    French  -> T.concat [ "Connexion à ", m l App_Title ]
-
-m l (SignIn_MailBody name url) =
-  T.intercalate
-    "\n"
-    ( case l of
-        English ->
-          [ T.concat [ "Hi ", name, "," ]
-          , ""
-          , T.concat
-              [ "Click to the following link in order to sign in to Shared Cost:"
-              , m l App_Title
-              , ":"
-              ]
-          , url
-          , ""
-          , "See you soon!"
-          ]
-        French  ->
-          [ T.concat [ "Salut ", name, "," ]
-          , ""
-          , T.concat
-              [ "Clique sur le lien suivant pour te connecter à "
-              , m l App_Title
-              , ":"
-              ]
-          , url
-          , ""
-          , "À très vite !"
-          ]
-    )
-
-m l SignIn_ParseError =
-  case l of
-    English -> "Error while reading initial data."
-    French  -> "Erreur lors de la lecture des données initiales."
+m l SignIn_PasswordLabel =
+  case l of
+    English -> "Password"
+    French  -> "Mot de passe"
 
 m l (Statistic_ByMonthsAndMean amount) =
   case l of
-- 
cgit v1.2.3


From 47c2a4d6b68c54eed5f7b45671b1ccaf8c0db200 Mon Sep 17 00:00:00 2001
From: Joris
Date: Mon, 20 Jan 2020 19:47:23 +0100
Subject: Show payment stats

---
 common/src/Common/Message/Translation.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'common/src/Common/Message/Translation.hs')

diff --git a/common/src/Common/Message/Translation.hs b/common/src/Common/Message/Translation.hs
index e74c801..2640da3 100644
--- a/common/src/Common/Message/Translation.hs
+++ b/common/src/Common/Message/Translation.hs
@@ -532,19 +532,19 @@ m l SignIn_PasswordLabel =
     English -> "Password"
     French  -> "Mot de passe"
 
-m l (Statistic_ByMonthsAndMean amount) =
+m l (Statistics_ByMonthsAndMean amount) =
   case l of
     English ->
       T.concat [ "Payments by category by month months (", amount, "on average)" ]
     French  ->
       T.concat [ "Paiements par catégorie par mois (en moyenne ", amount, ")" ]
 
-m l Statistic_Title =
+m l Statistics_Title =
   case l of
     English -> "Statistics"
     French  -> "Statistiques"
 
-m l Statistic_Total =
+m l Statistics_Total =
   case l of
     English -> "Total"
     French  -> "Total"
-- 
cgit v1.2.3


From 79e1d8b0099d61b580a499311f1714b1b7eb07b5 Mon Sep 17 00:00:00 2001
From: Joris
Date: Mon, 27 Jan 2020 22:07:18 +0100
Subject: Show total incom by month in statistics

---
 common/src/Common/Message/Translation.hs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'common/src/Common/Message/Translation.hs')

diff --git a/common/src/Common/Message/Translation.hs b/common/src/Common/Message/Translation.hs
index 2640da3..4ba9ffc 100644
--- a/common/src/Common/Message/Translation.hs
+++ b/common/src/Common/Message/Translation.hs
@@ -532,22 +532,27 @@ m l SignIn_PasswordLabel =
     English -> "Password"
     French  -> "Mot de passe"
 
-m l (Statistics_ByMonthsAndMean amount) =
+m l (Statistics_ByMonthsAndMean paymentMean incomeMean ) =
   case l of
     English ->
-      T.concat [ "Payments by category by month months (", amount, "on average)" ]
+      T.concat [ "Payments by category (mean ", paymentMean, ") and income (mean ", incomeMean, ") by month" ]
     French  ->
-      T.concat [ "Paiements par catégorie par mois (en moyenne ", amount, ")" ]
+      T.concat [ "Paiements par catégorie (moy. ", paymentMean, ") et revenu (moy. ", incomeMean, ") par mois" ]
 
 m l Statistics_Title =
   case l of
     English -> "Statistics"
     French  -> "Statistiques"
 
-m l Statistics_Total =
+m l Statistics_TotalPayments =
   case l of
-    English -> "Total"
-    French  -> "Total"
+    English -> "Payment total"
+    French  -> "Total des payment"
+
+m l Statistics_TotalIncomes =
+  case l of
+    English -> "Income total"
+    French  -> "Total des revenus"
 
 m l WeeklyReport_Empty =
   case l of
-- 
cgit v1.2.3


From 6a04e640955051616c3ad0874605830c448f2d75 Mon Sep 17 00:00:00 2001
From: Joris
Date: Mon, 27 Jan 2020 22:33:07 +0100
Subject: Fix translation typo

---
 common/src/Common/Message/Translation.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'common/src/Common/Message/Translation.hs')

diff --git a/common/src/Common/Message/Translation.hs b/common/src/Common/Message/Translation.hs
index 4ba9ffc..222e669 100644
--- a/common/src/Common/Message/Translation.hs
+++ b/common/src/Common/Message/Translation.hs
@@ -547,7 +547,7 @@ m l Statistics_Title =
 m l Statistics_TotalPayments =
   case l of
     English -> "Payment total"
-    French  -> "Total des payment"
+    French  -> "Total des paiements"
 
 m l Statistics_TotalIncomes =
   case l of
-- 
cgit v1.2.3