From 35481a665b1c81fec6661bbaf9d0607c813bb702 Mon Sep 17 00:00:00 2001 From: Brian Wignall Date: Sun, 29 Dec 2019 17:27:01 -0500 Subject: [PATCH] Change Date output to yyyy-mm-dd --- hledger-lib/Hledger/Data/Dates.hs | 2 +- hledger/Hledger/Cli/Commands/Add.hs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hledger-lib/Hledger/Data/Dates.hs b/hledger-lib/Hledger/Data/Dates.hs index 7d5aa1d1a..7531f1549 100644 --- a/hledger-lib/Hledger/Data/Dates.hs +++ b/hledger-lib/Hledger/Data/Dates.hs @@ -115,7 +115,7 @@ instance Show DateSpan where -- show s = "DateSpan \"" ++ showDateSpan s ++ "\"" -- quotes to help pretty-show showDate :: Day -> String -showDate = formatTime defaultTimeLocale "%0C%y/%m/%d" +showDate = show -- | Render a datespan as a display string, abbreviating into a -- compact form if possible. diff --git a/hledger/Hledger/Cli/Commands/Add.hs b/hledger/Hledger/Cli/Commands/Add.hs index 5394b510a..fddacd83b 100644 --- a/hledger/Hledger/Cli/Commands/Add.hs +++ b/hledger/Hledger/Cli/Commands/Add.hs @@ -30,7 +30,7 @@ import Data.Maybe import Data.Text (Text) import qualified Data.Text as T import Data.Time.Calendar (Day) -import Data.Time.Format (formatTime, defaultTimeLocale) +import Data.Time.Format (formatTime, defaultTimeLocale, iso8601DateFormat) import Data.Typeable (Typeable) import Safe (headDef, headMay, atMay) import System.Console.CmdArgs.Explicit @@ -164,7 +164,8 @@ confirmedTransactionWizard prevInput es@EntryState{..} stack@(currentStage : _) { esArgs = drop 1 esArgs , esDefDate = date } - dateAndCodeString = formatTime defaultTimeLocale "%Y/%m/%d" date ++ (if T.null code then "" else " (" ++ T.unpack code ++ ")") + dateAndCodeString = formatTime defaultTimeLocale yyyymmddFormat date ++ (if T.null code then "" else " (" ++ T.unpack code ++ ")") + yyyymmddFormat = iso8601DateFormat Nothing confirmedTransactionWizard prevInput{prevDateAndCode=Just dateAndCodeString} es' (EnterDescAndComment (date, code) : stack) Nothing -> confirmedTransactionWizard prevInput es stack