diff options
author | Joris | 2015-11-01 10:49:08 +0100 |
---|---|---|
committer | Joris | 2015-11-01 10:49:08 +0100 |
commit | a14af8d8f2cc9d561a8c8804a4c73b9a35ce8a97 (patch) | |
tree | f260b8a663449d30bae32b0f1cfd70bad323d8c6 /src/client | |
parent | b886ef9b847b63528a40c41b333937007b8f57c5 (diff) |
Set currency in conf instead of in messages
Diffstat (limited to 'src/client')
-rw-r--r-- | src/client/Model.elm | 3 | ||||
-rw-r--r-- | src/client/Model/Conf.elm | 7 | ||||
-rw-r--r-- | src/client/View/LoggedIn/Add.elm | 2 | ||||
-rw-r--r-- | src/client/View/LoggedIn/Table.elm | 2 | ||||
-rw-r--r-- | src/client/View/Price.elm | 2 |
5 files changed, 13 insertions, 3 deletions
diff --git a/src/client/Model.elm b/src/client/Model.elm index 72db56a..c330d86 100644 --- a/src/client/Model.elm +++ b/src/client/Model.elm @@ -8,11 +8,13 @@ import Json.Decode as Json import Model.View exposing (..) import Model.Translations exposing (..) +import Model.Conf exposing (..) type alias Model = { view : View , currentTime : Time , translations : Translations + , conf : Conf } initialModel : Time -> String -> Model @@ -23,4 +25,5 @@ initialModel initialTime translationsValue = case Json.decodeString translationsDecoder translationsValue of Ok translations -> translations Err err -> [] + , conf = { currency = "€" } } diff --git a/src/client/Model/Conf.elm b/src/client/Model/Conf.elm new file mode 100644 index 0000000..183fd68 --- /dev/null +++ b/src/client/Model/Conf.elm @@ -0,0 +1,7 @@ +module Model.Conf + ( Conf + ) where + +type alias Conf = + { currency : String + } diff --git a/src/client/View/LoggedIn/Add.elm b/src/client/View/LoggedIn/Add.elm index 52d931a..4f75822 100644 --- a/src/client/View/LoggedIn/Add.elm +++ b/src/client/View/LoggedIn/Add.elm @@ -90,7 +90,7 @@ addPaymentCost model addPayment = [] , label [ for "costInput" ] - [ text (getMessage "MoneySymbol" model.translations) ] + [ text model.conf.currency ] , case addPayment.costError of Just error -> div [ class "errorMessage" ] [ text error ] diff --git a/src/client/View/LoggedIn/Table.elm b/src/client/View/LoggedIn/Table.elm index 9d28e81..2cfc6d6 100644 --- a/src/client/View/LoggedIn/Table.elm +++ b/src/client/View/LoggedIn/Table.elm @@ -38,7 +38,7 @@ headerLine model = div [ class "header" ] [ div [ class "cell category" ] [ renderIcon "shopping-cart" ] - , div [ class "cell cost" ] [ text (getMessage "MoneySymbol" model.translations) ] + , div [ class "cell cost" ] [ text model.conf.currency ] , div [ class "cell user" ] [ renderIcon "user" ] , div [ class "cell date" ] [ renderIcon "calendar" ] , div [ class "cell" ] [] diff --git a/src/client/View/Price.elm b/src/client/View/Price.elm index cb8abd2..be665a8 100644 --- a/src/client/View/Price.elm +++ b/src/client/View/Price.elm @@ -11,7 +11,7 @@ price : Model -> Int -> String price model amount = ( formatInt amount ++ " " - ++ getMessage "MoneySymbol" model.translations + ++ model.conf.currency ) formatInt : Int -> String |