slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib: "decimal point" -> "decimal separator" in error message

Browse Source
This commit is contained in:
Simon Michael 2018-08-17 07:37:26 +01:00
parent e35dd19cc8
commit 13436637c6
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hledger-lib/Hledger/Read/JournalReader.hs
View File

@ -309,7 +309,7 @@ commoditydirectiveonelinep = do
else modify' (\j -> j{jcommodities=M.insert acommodity comm $ jcommodities j}) else modify' (\j -> j{jcommodities=M.insert acommodity comm $ jcommodities j})
pleaseincludedecimalpoint :: String pleaseincludedecimalpoint :: String
pleaseincludedecimalpoint = "to avoid ambiguity, please include a decimal point in commodity directives" pleaseincludedecimalpoint = "to avoid ambiguity, please include a decimal separator in commodity directives"
-- | Parse a multi-line commodity directive, containing 0 or more format subdirectives. -- | Parse a multi-line commodity directive, containing 0 or more format subdirectives.
-- --
@ -470,7 +470,6 @@ commodityconversiondirectivep = do
--- ** transactions --- ** transactions
-- TODO transactionmodifierp ? transactionrewritep ?
transactionmodifierp :: JournalParser m TransactionModifier transactionmodifierp :: JournalParser m TransactionModifier
transactionmodifierp = do transactionmodifierp = do
char '=' <?> "modifier transaction" char '=' <?> "modifier transaction"

4
tests/journal/amounts-and-commodities.test
View File

@ -123,7 +123,7 @@ $ hledger -f- bal -V -N
$ hledger -f- reg amt:1 $ hledger -f- reg amt:1
# 10. This commodity directive should complain about a missing decimal point, # 10. This commodity directive should complain about a missing decimal separator,
# which we now require. # which we now require.
< <
commodity 1 000 USD commodity 1 000 USD
@ -132,7 +132,7 @@ commodity 1 000 USD
(a) USD1 000 (a) USD1 000
$ hledger -f- bal $ hledger -f- bal
>2 /decimal point/ >2 /decimal separator/
>=1 >=1
# 11. After a space-grouped amount, a posting comment should parse. # 11. After a space-grouped amount, a posting comment should parse.

4
tests/journal/numbers.test
View File

@ -126,11 +126,11 @@ commodity €1,000.00
>>>2 >>>2
>>>=0 >>>=0
# 11. Commodity directive requires a decimal point # 11. Commodity directive requires a decimal separator
hledger bal -f - hledger bal -f -
<<< <<<
commodity 1000 EUR commodity 1000 EUR
>>>2 /please include a decimal point/ >>>2 /please include a decimal separator/
>>>=1 >>>=1
# 12. Commodity directive with zero precision # 12. Commodity directive with zero precision