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/server | |
| parent | b886ef9b847b63528a40c41b333937007b8f57c5 (diff) | |
Set currency in conf instead of in messages
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/Config.hs | 4 | ||||
| -rw-r--r-- | src/server/Model/Message/Key.hs | 1 | ||||
| -rw-r--r-- | src/server/Model/Message/Translations.hs | 5 |
3 files changed, 2 insertions, 8 deletions
diff --git a/src/server/Config.hs b/src/server/Config.hs index deb2e68..bd7f325 100644 --- a/src/server/Config.hs +++ b/src/server/Config.hs @@ -19,7 +19,7 @@ data Config = Config { hostname :: Text , port :: Int , signInExpirationMn :: Int - , currency :: Char + , currency :: Text } deriving (Read, Eq, Show) getConfig :: FilePath -> IO (Either Text Config) @@ -30,5 +30,5 @@ getConfig filePath = (T.pack <$> get cp "DEFAULT" "hostname") <*> (get cp "DEFAULT" "port") <*> (get cp "DEFAULT" "sign-in-expiration-mn") <*> - (get cp "DEFAULT" "currency") + (T.pack <$> get cp "DEFAULT" "currency") ) diff --git a/src/server/Model/Message/Key.hs b/src/server/Model/Message/Key.hs index c4ff738..e9f8ef6 100644 --- a/src/server/Model/Message/Key.hs +++ b/src/server/Model/Message/Key.hs @@ -53,7 +53,6 @@ data Key = | Add | PaymentNotDeleted - | MoneySymbol | Punctual | Monthly | SingularMonthlyCount diff --git a/src/server/Model/Message/Translations.hs b/src/server/Model/Message/Translations.hs index f34cbd2..a2e9a30 100644 --- a/src/server/Model/Message/Translations.hs +++ b/src/server/Model/Message/Translations.hs @@ -220,11 +220,6 @@ m l PaymentNotDeleted = English -> "The payment could not have been deleted." French -> "Le paiement n'a pas pu être supprimé." -m l MoneySymbol = - case l of - English -> "$" - French -> "€" - m l Punctual = case l of English -> "Punctual" |