From 1e47a7754ca38bd1a6c74765d8378caf68ce4619 Mon Sep 17 00:00:00 2001 From: Joris Date: Sun, 26 Mar 2017 21:10:42 +0200 Subject: Separate client and server watch --- src/server/Main.hs | 19 +++++++------------ src/server/Model/Message/Key.hs | 1 + src/server/Model/Message/Translations.hs | 5 +++++ 3 files changed, 13 insertions(+), 12 deletions(-) (limited to 'src/server') diff --git a/src/server/Main.hs b/src/server/Main.hs index b7764c9..7ae8c1c 100644 --- a/src/server/Main.hs +++ b/src/server/Main.hs @@ -1,22 +1,17 @@ {-# LANGUAGE OverloadedStrings #-} -import Web.Scotty - import Network.Wai.Middleware.Static - -import Job.Daemon (runDaemons) - import qualified Data.Text.Lazy as LT +import Web.Scotty -import qualified Controller.Index as Index -import qualified Controller.SignIn as SignIn -import qualified Controller.Payment as Payment -import qualified Controller.Income as Income -import qualified Controller.Category as Category - +import Job.Daemon (runDaemons) import Model.Database (runMigrations) - import qualified Conf +import qualified Controller.Category as Category +import qualified Controller.Income as Income +import qualified Controller.Index as Index +import qualified Controller.Payment as Payment +import qualified Controller.SignIn as SignIn main :: IO () main = do diff --git a/src/server/Model/Message/Key.hs b/src/server/Model/Message/Key.hs index 36b3ba0..79ccf39 100644 --- a/src/server/Model/Message/Key.hs +++ b/src/server/Model/Message/Key.hs @@ -127,6 +127,7 @@ data Key = | Empty | InvalidString | InvalidDate + | CostMustNotBeNull | InvalidInt | InvalidCategory | SmallerIntThan diff --git a/src/server/Model/Message/Translations.hs b/src/server/Model/Message/Translations.hs index 6565344..16fc3fd 100644 --- a/src/server/Model/Message/Translations.hs +++ b/src/server/Model/Message/Translations.hs @@ -498,6 +498,11 @@ m l InvalidDate = English -> "day/month/year required" French -> "jour/mois/année requis" +m l CostMustNotBeNull = + case l of + English -> "Cost must not be zero" + French -> "Le coût ne doît pas être nul" + m l InvalidInt = case l of English -> "Integer required" -- cgit v1.2.3