From 215ef5e12daff84bf4a1b70dd712d6e59def1c47 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Wed, 1 Oct 2025 14:40:08 -1000 Subject: [PATCH] fix:check accounts: don't garble non-ascii account names in errors [#2469] This regressed in 1.27 or so. --- hledger-lib/Hledger/Data/JournalChecks.hs | 4 ++-- hledger/test/errors/accounts.j | 2 +- hledger/test/errors/accounts.test | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hledger-lib/Hledger/Data/JournalChecks.hs b/hledger-lib/Hledger/Data/JournalChecks.hs index 19c0e9fb6..16fd9a65a 100644 --- a/hledger-lib/Hledger/Data/JournalChecks.hs +++ b/hledger-lib/Hledger/Data/JournalChecks.hs @@ -63,11 +63,11 @@ journalCheckAccounts j = mapM_ checkacct (journalPostings j) "%s:%d:" ,"%s" ,"Strict account checking is enabled, and" - ,"account %s has not been declared." + ,"account \"%s\" has not been declared." ,"Consider adding an account directive. Examples:" ,"" ,"account %s" - ]) f l ex (show a) a + ]) f l ex a a where (f,l,_mcols,ex) = makePostingAccountErrorExcerpt p diff --git a/hledger/test/errors/accounts.j b/hledger/test/errors/accounts.j index f1b9931c3..4d86cea45 100755 --- a/hledger/test/errors/accounts.j +++ b/hledger/test/errors/accounts.j @@ -1,4 +1,4 @@ #!/usr/bin/env -S hledger check accounts -f 2022/1/1 - (a) 1 + (ß) 1 diff --git a/hledger/test/errors/accounts.test b/hledger/test/errors/accounts.test index da0c6ae92..07ba27c3b 100644 --- a/hledger/test/errors/accounts.test +++ b/hledger/test/errors/accounts.test @@ -1,13 +1,13 @@ $$$ hledger check accounts -f accounts.j >>>2 /Error: .*accounts.j:4: \| 2022-01-01 -4 \| \(a\) 1 +4 \| \(ß\) 1 \| \^ Strict account checking is enabled, and -account "a" has not been declared. +account "ß" has not been declared. Consider adding an account directive. Examples: -account a +account ß / >>>= 1