From 5bfd349bedb9c395cbeb38bb888e379ba36d5d35 Mon Sep 17 00:00:00 2001 From: Joris Date: Wed, 30 Dec 2015 17:01:56 +0100 Subject: Minor design modifications --- src/server/Model/Message/Key.hs | 6 +--- src/server/Model/Message/Translations.hs | 49 ++------------------------------ 2 files changed, 3 insertions(+), 52 deletions(-) (limited to 'src/server/Model/Message') diff --git a/src/server/Model/Message/Key.hs b/src/server/Model/Message/Key.hs index 7f49ae7..1a1e944 100644 --- a/src/server/Model/Message/Key.hs +++ b/src/server/Model/Message/Key.hs @@ -8,15 +8,12 @@ data Key = NoReplyMail - -- Sign in + -- Sign | SharedCost | SignIn | InvalidEmail | Unauthorized - | SignInMailTitle - | SignInMail - | SignInEmailSent -- Dates @@ -40,7 +37,6 @@ data Key = | CategoryRequired | CostRequired - | CostMustBeNonNullNumber | IncomeRequired | IncomeMustBeNonNullNumber | IncomeMustBePositiveNumber diff --git a/src/server/Model/Message/Translations.hs b/src/server/Model/Message/Translations.hs index 29b21ea..05187aa 100644 --- a/src/server/Model/Message/Translations.hs +++ b/src/server/Model/Message/Translations.hs @@ -44,46 +44,6 @@ m l Unauthorized = English -> "You are not authorized to sign in." French -> "Tu n'es pas autorisé à te connecter." -m l SignInMailTitle = - case l of - English -> T.concat ["Sign in to ", m l SharedCost] - French -> T.concat ["Connexion à ", m l SharedCost] - -m l SignInMail = - T.intercalate - "\n" - ( case l of - English -> - [ "Hi {1}," - , "" - , T.concat - [ "Click to the following link in order to sign in to Shared Cost:" - , m l SharedCost - , ":" - ] - , "{2}" - , "" - , "See you soon!" - ] - French -> - [ "Salut {1}," - , "" - , T.concat - [ "Clique sur le lien suivant pour te connecter à " - , m l SharedCost - , ":" - ] - , "{2}" - , "" - , "À très vite !" - ] - ) - -m l SignInEmailSent = - 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." - -- Date m l January = @@ -165,13 +125,8 @@ m l CategoryRequired = m l CostRequired = case l of - English -> "Type a cost." - French -> "Entre un coût." - -m l CostMustBeNonNullNumber = - case l of - English -> "The cost must be a non-null integer." - French -> "Le coût doit être un entier non nul." + English -> "Type a positive cost." + French -> "Entre un coût positif." m l IncomeRequired = case l of -- cgit v1.2.3