From 892a7dd19a92fc18767984e624b8a5026dce61e4 Mon Sep 17 00:00:00 2001 From: Joris Guyonvarch Date: Tue, 11 Aug 2015 21:32:10 +0200 Subject: Showing server sides generated messages from the client --- src/server/Model/Json/MessagePart.hs | 18 ++++++++++++++++++ src/server/Model/Json/Translation.hs | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 src/server/Model/Json/MessagePart.hs (limited to 'src/server/Model/Json') diff --git a/src/server/Model/Json/MessagePart.hs b/src/server/Model/Json/MessagePart.hs new file mode 100644 index 0000000..0753d7c --- /dev/null +++ b/src/server/Model/Json/MessagePart.hs @@ -0,0 +1,18 @@ +{-# LANGUAGE DeriveGeneric #-} + +module Model.Json.MessagePart + ( MessagePart(..) + ) where + +import Data.Text (Text) + +import Data.Aeson +import GHC.Generics + +data MessagePart = + Order Int + | Str Text + deriving (Eq, Show, Generic) + +instance FromJSON MessagePart +instance ToJSON MessagePart diff --git a/src/server/Model/Json/Translation.hs b/src/server/Model/Json/Translation.hs index 7291157..9dcfe80 100644 --- a/src/server/Model/Json/Translation.hs +++ b/src/server/Model/Json/Translation.hs @@ -9,9 +9,11 @@ import GHC.Generics import Data.Aeson import Data.Text +import Model.Json.MessagePart + data Translation = Translation { key :: Text - , message :: Text + , message :: [MessagePart] } deriving (Show, Generic) instance FromJSON Translation -- cgit v1.2.3