.version

@@ -1 +1 @@
-1.27.1
+1.27

hledger-install/hledger-install.sh

@@ -46,7 +46,7 @@ HERE
 HLEDGER_INSTALL_TOOL=hledger-install.sh
 
 # this script's version
-HLEDGER_INSTALL_VERSION=20220918
+HLEDGER_INSTALL_VERSION=20220901
 
 # stackage snapshot to use when installing with stack.
 # You can try specifying a different stackage version here, or 
@@ -70,10 +70,10 @@ hledger-stockquotes \
 
 # Latest hledger package versions.
 # Don't forget to also bump HLEDGER_INSTALL_VERSION above.
-HLEDGER_LIB_VERSION=1.27.1
+HLEDGER_LIB_VERSION=1.27
-HLEDGER_VERSION=1.27.1
+HLEDGER_VERSION=1.27
-HLEDGER_UI_VERSION=1.27.1
+HLEDGER_UI_VERSION=1.27
-HLEDGER_WEB_VERSION=1.27.1
+HLEDGER_WEB_VERSION=1.27
 # addons:
 HLEDGER_IADD_VERSION=1.3.17
 HLEDGER_INTEREST_VERSION=1.6.4

hledger-lib/.version

@@ -1 +1 @@
-1.27.1
+1.27

hledger-lib/.version.m4

@@ -1,2 +1,2 @@
 m4_dnl Version number to show in manuals. Updated by "Shake setversion"
-m4_define({{_version_}}, {{1.27.1}})m4_dnl
+m4_define({{_version_}}, {{1.27}})m4_dnl

hledger-lib/Hledger/Reports/ReportTypes.hs

@@ -89,7 +89,7 @@ data PeriodicReport a b =
   } deriving (Show, Functor, Generic, ToJSON)
 
 instance Bifunctor PeriodicReport where
-  bimap f g pr = pr{prRows = map (bimap f g) $ prRows pr, prTotals = g <$> prTotals pr}
+  bimap f g pr = pr{prRows = map (bimap f g) $ prRows pr, prTotals = fmap g $ prTotals pr}
 
 data PeriodicReportRow a b =
   PeriodicReportRow

hledger-lib/hledger-lib.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           hledger-lib
-version:        1.27.1
+version:        1.27
 synopsis:       A reusable library providing the core functionality of hledger
 description:    A reusable library containing hledger's core functionality.
                 This is used by most hledger* packages so that they support the same

hledger-lib/package.yaml

@@ -1,5 +1,5 @@
 name: hledger-lib
-version: 1.27.1
+version: 1.27
 synopsis: A reusable library providing the core functionality of hledger
 description: |
   A reusable library containing hledger's core functionality.

hledger-ui/.version

@@ -1 +1 @@
-1.27.1
+1.27

hledger-ui/.version.m4

@@ -1,2 +1,2 @@
 m4_dnl Version number to show in manuals. Updated by "Shake setversion"
-m4_define({{_version_}}, {{1.27.1}})m4_dnl
+m4_define({{_version_}}, {{1.27}})m4_dnl

hledger-ui/hledger-ui.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           hledger-ui
-version:        1.27.1
+version:        1.27
 synopsis:       Curses-style terminal interface for the hledger accounting system
 description:    A simple curses-style terminal user interface for the hledger accounting system.
                 It can be a more convenient way to browse your accounts than the CLI.
@@ -63,7 +63,7 @@ executable hledger-ui
   hs-source-dirs:
       ./
   ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind
-  cpp-options: -DVERSION="1.27.1"
+  cpp-options: -DVERSION="1.27"
   build-depends:
       ansi-terminal >=0.9
     , async
@@ -78,8 +78,8 @@ executable hledger-ui
     , extra >=1.6.3
     , filepath
     , fsnotify >=0.2.1.2 && <0.4
-    , hledger >=1.27.1 && <1.28
+    , hledger ==1.27.*
-    , hledger-lib >=1.27.1 && <1.28
+    , hledger-lib ==1.27.*
     , megaparsec >=7.0.0 && <9.3
     , microlens >=0.4
     , microlens-platform >=0.2.3.1

hledger-ui/package.yaml

@@ -1,5 +1,5 @@
 name        : hledger-ui
-version     : 1.27.1
+version     : 1.27
 synopsis    : Curses-style terminal interface for the hledger accounting system
 description : |
   A simple curses-style terminal user interface for the hledger accounting system.
@@ -38,7 +38,7 @@ flags:
     manual: false
     default: true
 
-cpp-options: -DVERSION="1.27.1"
+cpp-options: -DVERSION="1.27"
 
 ghc-options:
 - -Wall
@@ -50,8 +50,8 @@ ghc-options:
 
 dependencies:
 - base >=4.14 && <4.17
-- hledger-lib >=1.27.1 && <1.28
+- hledger-lib >=1.27 && <1.28
-- hledger >=1.27.1 && <1.28
+- hledger >=1.27 && <1.28
 - ansi-terminal >=0.9
 - async
 - breakpoint

hledger-web/.version

@@ -1 +1 @@
-1.27.1
+1.27

hledger-web/.version.m4

@@ -1,2 +1,2 @@
 m4_dnl Version number to show in manuals. Updated by "Shake setversion"
-m4_define({{_version_}}, {{1.27.1}})m4_dnl
+m4_define({{_version_}}, {{1.27}})m4_dnl

hledger-web/Hledger/Web/Foundation.hs

@@ -154,7 +154,6 @@ instance Yesod App where
       |]
       addScript $ StaticR js_bootstrap_min_js
       addScript $ StaticR js_bootstrap_datepicker_min_js
-      addScript $ StaticR js_locales_bootstrap_datepicker_fi_min_js
       addScript $ StaticR js_jquery_url_js
       addScript $ StaticR js_jquery_cookie_js
       addScript $ StaticR js_jquery_hotkeys_js

hledger-web/Hledger/Web/Handler/AddR.hs

@@ -31,7 +31,7 @@ postAddR :: Handler ()
 postAddR = do
   checkServerSideUiEnabled
   VD{caps, j, today} <- getViewData
-  when (CapAdd `notElem` caps) (permissionDenied "Ei oikeutta lisätä kirjauksia ('add')")
+  when (CapAdd `notElem` caps) (permissionDenied "Missing the 'add' capability")
 
   ((res, view), enctype) <- runFormPost $ addForm j today
   case res of
@@ -40,7 +40,7 @@ postAddR = do
       liftIO $ do
         ensureJournalFileExists f
         appendToJournalFileOrStdout f (showTransaction t')
-      setMessage "Kirjaus lisätty."
+      setMessage "Transaction added."
       redirect JournalR
     FormMissing -> showForm view enctype
     FormFailure errs -> do
@@ -49,7 +49,7 @@ postAddR = do
   where
     showForm view enctype =
       sendResponse =<< defaultLayout [whamlet|
-        <h2>Uusi kirjaus
+        <h2>Add transaction
         <div .row style="margin-top:1em">
           <form#addform.form.col-xs-12.col-sm-11 method=post enctype=#{enctype}>
             ^{view}
@@ -60,7 +60,7 @@ postAddR = do
 putAddR :: Handler RepJson
 putAddR = do
   VD{caps, j, opts} <- getViewData
-  when (CapAdd `notElem` caps) (permissionDenied "Ei oikeutta lisätä kirjauksia ('add')")
+  when (CapAdd `notElem` caps) (permissionDenied "Missing the 'add' capability")
 
   (r :: Result Transaction) <- parseCheckJsonBody
   case r of

hledger-web/Hledger/Web/Handler/EditR.hs

@@ -32,20 +32,20 @@ postEditR :: FilePath -> Handler ()
 postEditR f = do
   checkServerSideUiEnabled
   VD {caps, j} <- getViewData
-  when (CapManage `notElem` caps) (permissionDenied "Ei oikeutta muokata kirjanpitoa ('manage')")
+  when (CapManage `notElem` caps) (permissionDenied "Missing the 'manage' capability")
 
   (f', txt) <- journalFile404 f j
   ((res, view), enctype) <- runFormPost (editForm f' txt)
   newtxt <- fromFormSuccess (showForm view enctype) res
   runExceptT (writeJournalTextIfValidAndChanged f newtxt) >>= \case
     Left e -> do
-      setMessage $ "Kirjanpidon lataaminen epäonnistui: " <> toHtml e
+      setMessage $ "Failed to load journal: " <> toHtml e
       showForm view enctype
     Right () -> do
-      setMessage $ "Kirjanpito tallennettu tiedostoon " <> toHtml f <> "\n"
+      setMessage $ "Saved journal " <> toHtml f <> "\n"
       redirect JournalR
   where
     showForm view enctype =
       sendResponse <=< defaultLayout $ do
-        setTitle "Muokkaa kirjanpitoa"
+        setTitle "Edit journal"
         [whamlet|<form method=post enctype=#{enctype}>^{view}|]

hledger-web/Hledger/Web/Handler/JournalR.hs

@@ -21,16 +21,16 @@ getJournalR :: Handler Html
 getJournalR = do
   checkServerSideUiEnabled
   VD{caps, j, m, opts, q, qopts, today} <- getViewData
-  when (CapView `notElem` caps) (permissionDenied "Ei oikeutta katsella kirjanpitoa ('view')")
+  when (CapView `notElem` caps) (permissionDenied "Missing the 'view' capability")
   let title = case inAccount qopts of
-        Nothing -> "Kaikki kirjaukset"
+        Nothing -> "General Journal"
-        Just (a, inclsubs) -> "Tapahtumat tilillä " <> a <> if inclsubs then "" else " (poislukien alatilit)"
+        Just (a, inclsubs) -> "Transactions in " <> a <> if inclsubs then "" else " (excluding subaccounts)"
-      title' = title <> if m /= Any then ", suodatettu" else ""
+      title' = title <> if m /= Any then ", filtered" else ""
       acctlink a = (RegisterR, [("q", replaceInacct q $ accountQuery a)])
       rspec = (reportspec_ $ cliopts_ opts){_rsQuery = m}
       items = reverse $ entriesReport rspec j
       transactionFrag = transactionFragment j
 
   defaultLayout $ do
-    setTitle "päiväkirja - hledger-web"
+    setTitle "journal - hledger-web"
     $(widgetFile "journal")

hledger-web/Hledger/Web/Handler/MiscR.hs

@@ -39,16 +39,16 @@ getManageR :: Handler Html
 getManageR = do
   checkServerSideUiEnabled
   VD{caps, j} <- getViewData
-  when (CapManage `notElem` caps) (permissionDenied "Ei oikeutta muokata kirjanpitoa ('manage')")
+  when (CapManage `notElem` caps) (permissionDenied "Missing the 'manage' capability")
   defaultLayout $ do
-    setTitle "Muokkaa kirjanpitoa"
+    setTitle "Manage journal"
     $(widgetFile "manage")
 
 getDownloadR :: FilePath -> Handler TypedContent
 getDownloadR f = do
   checkServerSideUiEnabled
   VD{caps, j} <- getViewData
-  when (CapManage `notElem` caps) (permissionDenied "Ei oikeutta muokata kirjanpitoa ('manage')")
+  when (CapManage `notElem` caps) (permissionDenied "Missing the 'manage' capability")
   (f', txt) <- journalFile404 f j
   addHeader "Content-Disposition" ("attachment; filename=\"" <> T.pack f' <> "\"")
   sendResponse ("text/plain" :: ByteString, toContent txt)
@@ -58,49 +58,49 @@ getDownloadR f = do
 getVersionR :: Handler TypedContent
 getVersionR = do
   VD{caps} <- getViewData
-  when (CapView `notElem` caps) (permissionDenied "Ei oikeutta katsella kirjanpitoa ('view')")
+  when (CapView `notElem` caps) (permissionDenied "Missing the 'view' capability")
   selectRep $ do
     provideJson $ packageversion
 
 getAccountnamesR :: Handler TypedContent
 getAccountnamesR = do
   VD{caps, j} <- getViewData
-  when (CapView `notElem` caps) (permissionDenied "Ei oikeutta katsella kirjanpitoa ('view')")
+  when (CapView `notElem` caps) (permissionDenied "Missing the 'view' capability")
   selectRep $ do
     provideJson $ journalAccountNames j
 
 getTransactionsR :: Handler TypedContent
 getTransactionsR = do
   VD{caps, j} <- getViewData
-  when (CapView `notElem` caps) (permissionDenied "Ei oikeutta katsella kirjanpitoa ('view')")
+  when (CapView `notElem` caps) (permissionDenied "Missing the 'view' capability")
   selectRep $ do
     provideJson $ jtxns j
 
 getPricesR :: Handler TypedContent
 getPricesR = do
   VD{caps, j} <- getViewData
-  when (CapView `notElem` caps) (permissionDenied "Ei oikeutta katsella kirjanpitoa ('view')")
+  when (CapView `notElem` caps) (permissionDenied "Missing the 'view' capability")
   selectRep $ do
     provideJson $ map priceDirectiveToMarketPrice $ jpricedirectives j
 
 getCommoditiesR :: Handler TypedContent
 getCommoditiesR = do
   VD{caps, j} <- getViewData
-  when (CapView `notElem` caps) (permissionDenied "Ei oikeutta katsella kirjanpitoa ('view')")
+  when (CapView `notElem` caps) (permissionDenied "Missing the 'view' capability")
   selectRep $ do
     provideJson $ (M.keys . jinferredcommodities) j
 
 getAccountsR :: Handler TypedContent
 getAccountsR = do
   VD{caps, j} <- getViewData
-  when (CapView `notElem` caps) (permissionDenied "Ei oikeutta katsella kirjanpitoa ('view')")
+  when (CapView `notElem` caps) (permissionDenied "Missing the 'view' capability")
   selectRep $ do
     provideJson $ laccounts $ ledgerFromJournal Any j
 
 getAccounttransactionsR :: Text -> Handler TypedContent
 getAccounttransactionsR a = do
   VD{caps, j} <- getViewData
-  when (CapView `notElem` caps) (permissionDenied "Ei oikeutta katsella kirjanpitoa ('view')")
+  when (CapView `notElem` caps) (permissionDenied "Missing the 'view' capability")
   let
     rspec = defreportspec
     thisacctq = Acct $ accountNameToAccountRegex a -- includes subs

hledger-web/Hledger/Web/Handler/RegisterR.hs

@@ -27,11 +27,11 @@ getRegisterR :: Handler Html
 getRegisterR = do
   checkServerSideUiEnabled
   VD{caps, j, m, opts, q, qopts, today} <- getViewData
-  when (CapView `notElem` caps) (permissionDenied "Ei oikeutta katsella kirjanpitoa ('view')")
+  when (CapView `notElem` caps) (permissionDenied "Missing the 'view' capability")
 
-  let (a,inclsubs) = fromMaybe ("kaikki tilit",True) $ inAccount qopts
+  let (a,inclsubs) = fromMaybe ("all accounts",True) $ inAccount qopts
-      s1 = if inclsubs then "" else " (poislukien alitilit)"
+      s1 = if inclsubs then "" else " (excluding subaccounts)"
-      s2 = if m /= Any then ", suodatettu" else ""
+      s2 = if m /= Any then ", filtered" else ""
       header = a <> s1 <> s2
 
   let rspec = reportspec_ (cliopts_ opts)
@@ -47,12 +47,12 @@ getRegisterR = do
           tail $ (", "<$xs) ++ [""]
       items = accountTransactionsReport rspec{_rsQuery=m} j acctQuery
       balancelabel
-        | isJust (inAccount qopts), balanceaccum_ (_rsReportOpts rspec) == Historical = "Historiallinen saldo"
+        | isJust (inAccount qopts), balanceaccum_ (_rsReportOpts rspec) == Historical = "Historical Total"
-        | isJust (inAccount qopts) = "Kauden saldo"
+        | isJust (inAccount qopts) = "Period Total"
-        | otherwise                = "Saldo"
+        | otherwise                = "Total"
       transactionFrag = transactionFragment j
   defaultLayout $ do
-    setTitle "kirjaukset - hledger-web"
+    setTitle "register - hledger-web"
     $(widgetFile "register")
 
 -- cf. Hledger.Reports.AccountTransactionsReport.accountTransactionsReportItems

hledger-web/Hledger/Web/Handler/UploadR.hs

@@ -36,7 +36,7 @@ postUploadR :: FilePath -> Handler ()
 postUploadR f = do
   checkServerSideUiEnabled
   VD {caps, j} <- getViewData
-  when (CapManage `notElem` caps) (permissionDenied "Ei oikeutta muokata kirjanpitoa ('manage')")
+  when (CapManage `notElem` caps) (permissionDenied "Missing the 'manage' capability")
 
   (f', _) <- journalFile404 f j
   ((res, view), enctype) <- runFormPost (uploadForm f')
@@ -48,20 +48,20 @@ postUploadR f = do
   newtxt <- case TE.decodeUtf8' lbs of
     Left e -> do
       setMessage $
-        "Merkistövirhe: '" <> toHtml (show e) <> "'. " <>
+        "Encoding error: '" <> toHtml (show e) <> "'. " <>
-        "Jos tiedostosi ei käytä UTF-8 merkistöä, kokeile 'muokkaa'-sivua," <>
+        "If your file is not UTF-8 encoded, try the 'edit form', " <>
-        "jolla selaimesi pitäisi huolehtia merkistön muuntamisesta puolestasi."
+        "where the transcoding should be handled by the browser."
       showForm view enctype
     Right newtxt -> return newtxt
   runExceptT (writeJournalTextIfValidAndChanged f newtxt) >>= \case
     Left e -> do
-      setMessage $ "Kirjanpidon lataaminen epäonnistui: " <> toHtml e
+      setMessage $ "Failed to load journal: " <> toHtml e
       showForm view enctype
     Right () -> do
-      setMessage $ "Tiedoston " <> toHtml f <> " lataaminen onnistui!"
+      setMessage $ "File " <> toHtml f <> " uploaded successfully"
       redirect JournalR
   where
     showForm view enctype =
       sendResponse <=< defaultLayout $ do
-        setTitle "Korvaa tiedosto"
+        setTitle "Upload journal"
         [whamlet|<form method=post enctype=#{enctype}>^{view}|]

hledger-web/Hledger/Web/Widget/AddForm.hs

@@ -38,7 +38,7 @@ addModal addR j today = do
     <div .modal-content>
       <div .modal-header>
         <button type="button" .close data-dismiss="modal" aria-hidden="true">&times;
-        <h3 .modal-title #addLabel>Uusi kirjaus
+        <h3 .modal-title #addLabel>Add a transaction
       <div .modal-body>
         <form#addform.form action=@{addR} method=POST enctype=#{addEnctype}>
           ^{addView}
@@ -80,8 +80,8 @@ addForm j today = identifyForm "add" $ \extra -> do
           | f `elem` fs = Right f
           | otherwise = Left $ MsgInputNotFound $ T.pack f
     -- field settings
-    dateSettings = FieldSettings "date" Nothing Nothing (Just "date") [("class", "form-control input-lg"), ("placeholder", "Päiväys")]
+    dateSettings = FieldSettings "date" Nothing Nothing (Just "date") [("class", "form-control input-lg"), ("placeholder", "Date")]
-    descSettings = FieldSettings "desc" Nothing Nothing (Just "description") [("class", "form-control input-lg typeahead"), ("placeholder", "Selite"), ("size", "40")]
+    descSettings = FieldSettings "desc" Nothing Nothing (Just "description") [("class", "form-control input-lg typeahead"), ("placeholder", "Description"), ("size", "40")]
     acctSettings = FieldSettings "account" Nothing Nothing (Just "account") []
     amtSettings  = FieldSettings "amount" Nothing Nothing (Just "amount") []
     fileSettings = FieldSettings "file" Nothing Nothing (Just "file") [("class", "form-control input-lg")]
@@ -190,8 +190,7 @@ toBloodhoundJson ts =
     "]"
     ]
   where
-    -- decodeBase64EncodedText is defined in add-form.hamlet
+    b64wrap = ("atob(\""<>) . (<>"\")") . encodeBase64
-    b64wrap = ("decodeBase64EncodedText(\""<>) . (<>"\")") . encodeBase64
 
 zipDefault :: a -> [a] -> [a] -> [(a, a)]
 zipDefault def (b:bs) (c:cs) = (b, c):(zipDefault def bs cs)

hledger-web/hledger-web.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           hledger-web
-version:        1.27.1
+version:        1.27
 synopsis:       Web-based user interface for the hledger accounting system
 description:    A simple web-based user interface for the hledger accounting system,
                 providing a more modern UI than the command-line or terminal interfaces.
@@ -92,7 +92,6 @@ extra-source-files:
     static/js/jquery.js
     static/js/jquery.min.js
     static/js/jquery.url.js
-    static/js/locales/bootstrap-datepicker.fi.min.js
     static/js/typeahead.bundle.js
     static/js/typeahead.bundle.min.js
     templates/add-form.hamlet
@@ -152,7 +151,7 @@ library
   hs-source-dirs:
       ./
   ghc-options: -Wall -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns
-  cpp-options: -DVERSION="1.27.1"
+  cpp-options: -DVERSION="1.27"
   build-depends:
       Decimal >=0.5.1
     , aeson >=1
@@ -173,8 +172,8 @@ library
     , extra >=1.6.3
     , filepath
     , hjsmin
-    , hledger >=1.27.1 && <1.28
+    , hledger ==1.27.*
-    , hledger-lib >=1.27.1 && <1.28
+    , hledger-lib ==1.27.*
     , hspec
     , http-client
     , http-conduit
@@ -214,7 +213,7 @@ executable hledger-web
   hs-source-dirs:
       app
   ghc-options: -Wall -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns
-  cpp-options: -DVERSION="1.27.1"
+  cpp-options: -DVERSION="1.27"
   build-depends:
       base >=4.14 && <4.17
     , breakpoint
@@ -235,7 +234,7 @@ test-suite test
   hs-source-dirs:
       test
   ghc-options: -Wall -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns
-  cpp-options: -DVERSION="1.27.1"
+  cpp-options: -DVERSION="1.27"
   build-depends:
       base >=4.14 && <4.17
     , breakpoint

hledger-web/package.yaml

@@ -1,5 +1,5 @@
 name: hledger-web
-version: 1.27.1
+version: 1.27
 synopsis: Web-based user interface for the hledger accounting system
 description: |
   A simple web-based user interface for the hledger accounting system,
@@ -83,7 +83,7 @@ dependencies:
 
 library:
   source-dirs: .
-  cpp-options: -DVERSION="1.27.1"
+  cpp-options: -DVERSION="1.27"
   exposed-modules:
   - Hledger.Web
   - Hledger.Web.Application
@@ -103,8 +103,8 @@ library:
   - Hledger.Web.Widget.AddForm
   - Hledger.Web.Widget.Common
   dependencies:
-  - hledger-lib >=1.27.1 && <1.28
+  - hledger-lib >=1.27 && <1.28
-  - hledger >=1.27.1 && <1.28
+  - hledger >=1.27 && <1.28
   - aeson >=1
   - base64
   - blaze-html
@@ -153,7 +153,7 @@ executables:
   hledger-web:
     source-dirs: app
     main: main.hs
-    cpp-options: -DVERSION="1.27.1"
+    cpp-options: -DVERSION="1.27"
     dependencies:
     - hledger-web
     when:
@@ -167,7 +167,7 @@ tests:
     source-dirs: test
     main: test.hs
     other-modules: []  # prevent double compilation, https://github.com/sol/hpack/issues/188
-    cpp-options: -DVERSION="1.27.1"
+    cpp-options: -DVERSION="1.27"
     dependencies:
     - hledger-lib
     - hledger

hledger-web/static/hledger.js

@@ -14,7 +14,6 @@ $(document).ready(function() {
     autoclose: true,
     format: 'yyyy-mm-dd',
     todayHighlight: true,
-    language: 'fi',
     weekStart: 1 // Monday
   });;
 
@@ -110,11 +109,11 @@ function registerChart($container, series) {
       /* https://github.com/krzysu/flot.tooltip */
       tooltip: true,
       tooltipOpts: {
-        xDateFormat: "%d.%m.%Y",
+        xDateFormat: "%Y/%m/%d",
         content:
           function(label, x, y, flotitem) {
             var data = flotitem.series.data[flotitem.dataIndex];
-            return data[3]+" saldoa %x sen jälkeen, kun siirrettiin "+data[2]+" kirjauksella: <pre>"+data[4]+"</pre>";
+            return data[3]+" balance on %x after "+data[2]+" posted by transaction:<pre>"+data[4]+"</pre>";
           },
         onHover: function(flotitem, $tooltipel) {
           $tooltipel.css('border-color',flotitem.series.color);
@@ -194,8 +193,8 @@ function addformAddPosting() {
   $('#addform .account-postings').append( $('#addform .account-group:last').clone().addClass('added-row') );
   // renumber and clear the new last account and amount fields
   var n = $('#addform .account-group').length;
-  $('.account-input:last').prop('placeholder', 'Tili '+n).val('');
+  $('.account-input:last').prop('placeholder', 'Account '+n).val('');
-  $('.amount-input:last').prop('placeholder','Summa '+n).val('');  // XXX Enable typehead on dynamically created inputs
+  $('.amount-input:last').prop('placeholder','Amount '+n).val('');  // XXX Enable typehead on dynamically created inputs
   // and move the keypress handler to the new last amount field
   addformLastAmountBindKey();
 }

hledger-web/static/js/locales/bootstrap-datepicker.fi.min.js

@@ -1 +0,0 @@
-!function(a){a.fn.datepicker.dates.fi={days:["sunnuntai","maanantai","tiistai","keskiviikko","torstai","perjantai","lauantai"],daysShort:["sun","maa","tii","kes","tor","per","lau"],daysMin:["su","ma","ti","ke","to","pe","la"],months:["tammikuu","helmikuu","maaliskuu","huhtikuu","toukokuu","kesäkuu","heinäkuu","elokuu","syyskuu","lokakuu","marraskuu","joulukuu"],monthsShort:["tam","hel","maa","huh","tou","kes","hei","elo","syy","lok","mar","jou"],today:"tänään",clear:"Tyhjennä",weekStart:1,format:"d.m.yyyy"}}(jQuery);

hledger-web/templates/add-form.hamlet

@@ -19,17 +19,6 @@
     jQuery('input[name=description]').typeahead({ highlight: true }, { source: descriptionsSuggester.ttAdapter() });
     jQuery('input[name=account]').typeahead({ highlight: true }, { source: accountsSuggester.ttAdapter() });
   });
-
-  const utf8textdecoder = new TextDecoder();
-  function decodeBase64EncodedText(b64) {
-      const unb64 = window.atob(b64);
-      const arr = new Uint8Array(unb64.length);
-      for (let i = 0; i < arr.length; i++) {
-          arr[i] = unb64.charCodeAt(i);
-      }
-      return utf8textdecoder.decode(arr);
-  }
-
 ^{extra}
 
 <div .row>
@@ -51,23 +40,23 @@
     <div .form-group .row .account-group style="padding-left:1em;">
       <div .col-sm-9.col-xs-9 :isJust accE:.has-error>
         <input .account-input.form-control.input-lg.typeahead type=text
-          name=account placeholder="Tili #{n}" value="#{acc}">
+          name=account placeholder="Account #{n}" value="#{acc}">
         $maybe err <- accE
           <span .help-block .error-block>_{err}
       <div .col-sm-3.col-xs-3 :isJust amtE:.has-error>
         <input .amount-input.form-control.input-lg type=text
-          name=amount placeholder="Summa #{n}" value="#{amt}">
+          name=amount placeholder="Amount #{n}" value="#{amt}">
         $maybe err <- amtE
           <span .help-block .error-block>_{err}
 
 <div .row>
   <div .col-sm-9.col-xs-9>
     $if length files > 1
-      Kirjaa tiedostoon:
+      Add to:
       &nbsp;
       <div style="display:inline-block; width:auto;" .form-group :isJust (fvErrors fileView):.has-error>
         ^{fvInput fileView}
         $maybe err <- fvErrors fileView
           <span .help-block .error-block>#{err}
   <div .col-sm-3.col-xs-3 style="text-align:right;">
-    <button type=submit .btn .btn-default .btn-lg name=submit style="font-weight:bold;">Tallenna
+    <button type=submit .btn .btn-default .btn-lg name=submit style="font-weight:bold;">Save

hledger-web/templates/balance-report.hamlet

@@ -1,8 +1,8 @@
 <tr :here == journalR:.inacct>
   <td .top .acct>
     <a href=@{journalR} :here == journalR:.inacct
-       title="Näytä päiväkirjan kirjaukset uusimmasta vanhimpaan">
+       title="Show general journal entries, most recent first">
-      Kirjanpito
+      Journal
   <td .top>
 $forall (acct, adisplay, aindent, abal) <- items
   <tr
@@ -12,11 +12,11 @@ $forall (acct, adisplay, aindent, abal) <- items
       <div .ff-wrapper>
         \#{indent aindent}
         <a.acct-name href="@?{(registerR, [("q", replaceInacct q $ accountQuery acct)])}"
-           title="Näytä tähän tiliin ja sen alitileihin vaikuttavat kirjaukset">
+           title="Show transactions affecting this account and subaccounts">
           #{adisplay}
         $if hasSubAccounts acct
           <a href="@?{(registerR, [("q", replaceInacct q $ accountOnlyQuery acct)])}" .only.hidden-sm.hidden-xs
-             title="Näytä vain juuri tähän tiliin vaikuttavat kirjaukset">only
+             title="Show transactions affecting this account but not subaccounts">only
     <td>
       ^{mixedAmountAsHtml abal}
 <tr .total>

hledger-web/templates/default-layout.hamlet

@@ -17,19 +17,19 @@ $if elem CapView caps
     <div #message .alert.alert-info>#{m}
   $if elem CapView caps
     <form#searchform.input-group method=GET>
-      <input .form-control name=q value=#{q} placeholder="Hae"
+      <input .form-control name=q value=#{q} placeholder="Search"
-        title="Syötä hakuehtoja rajataksesi alla olevaa dataa">
+        title="Enter hledger search patterns to filter the data below">
       <div .input-group-btn>
         $if not (T.null q)
-          <a href=@{here} .btn .btn-default title="Tyhjennä hakuehdot">
+          <a href=@{here} .btn .btn-default title="Clear search terms">
             <span .glyphicon .glyphicon-remove-circle>
-        <button .btn .btn-default type=submit title="Hae">
+        <button .btn .btn-default type=submit title="Apply search terms">
           <span .glyphicon .glyphicon-search>
         $if elem CapManage caps
-          <a href="@{ManageR}" .btn.btn-default title="Hallinnoi kirjanpidon tiedostoja">
+          <a href="@{ManageR}" .btn.btn-default title="Manage journal files">
             <span .glyphicon .glyphicon-wrench>
         <button .btn .btn-default type=button data-toggle="modal" data-target="#helpmodal"
-           title="Näytä käyttöohjeita">
+           title="Show search and general help">
           <span .glyphicon .glyphicon-question-sign>
   ^{widget}
 
@@ -38,43 +38,43 @@ $if elem CapView caps
     <div .modal-content>
       <div .modal-header>
         <button type="button" .close data-dismiss="modal" aria-hidden="true">&times;
-        <h3 .modal-title #helpLabel>Ohjeet
+        <h3 .modal-title #helpLabel>Help
       <div .modal-body>
         <div .row>
           <div .col-xs-6>
             <p>
-              <b>Pikanäppäimet
+              <b>Keyboard shortcuts
               <ul>
-                <li> <code>h</code> tai (selaimesta riippuen) myös <code>?</code> - näytä nämä ohjeet (paina <code>esc</code> tai klikkaa ruksia poistuaksesi)
+                <li> <code>h</code> or maybe <code>?</code> - view this help (escape or click to exit)
-                <li> <code>j</code> - siirry päiväkirjanäkymään (etusivulle)
+                <li> <code>j</code> - go to the Journal view (home)
-                <li> <code>a</code> - lisää uusi kirjaus (paina <code>esc</code> peruaksesi)
+                <li> <code>a</code> - add a transaction (escape to cancel)
-                <li> <code>s</code> - vaihda sivupalkki näkyviin/piilotetuksi
+                <li> <code>s</code> - toggle sidebar
-                <li> <code>f</code> - kohdista hakukenttään
+                <li> <code>f</code> - focus search form ("find")
-                <li> <code>e</code> - piilota nollasaldoiset tilit sivupalkista
+                <li> <code>e</code> - hide empty accounts in sidebar
             <p>
-              <b>Yleistä
+              <b>General
               <ul>
-                <li> Pääkirja näytää kirjauksia, jotka esittävät rahan (tai muun hyödykkeen) täydellisiä siirtoja tilien välillä. Siirron täydellisyydellä tarkoitetaan sitä, ettei siitä ole jätetty mitään osaa kirjaamatta, jolloin hyödykettä ei katoa eikä synny tyhjästä.
+                <li> The Journal view shows general journal entries, representing zero-sum movements of money (or other commodity) between hierarchical accounts
-                <li> Sivupalkki näyttää käytetyt tilit ja niiden loppusaldot
+                <li> The sidebar shows the resulting accounts and their final balances
-                <li> Ylätilien saldot sisältävät niiden alatilien saldot
+                <li> Parent account balances include subaccount balances
-                <li> Eri valuutat esitetään saldoissa päällekkäin
+                <li> Multiple currencies in balances are displayed one above the other
-                <li> Klikkaamalla tilin nimeä näet siihen vaikuttavat kirjaukset ja saldon joka siirron jälkeen
+                <li> Click account name links to see transactions affecting that account, with running balance
-                <li> Klikkaamalla päiväystä näet silloin kirjatut tapahtumat
+                <li> Click date links to see journal entries on that date
           <div .col-xs-6>
             <p>
-              <b>Haku
+              <b>Search
               <ul>
-                <li> <code>acct:REGEXP</code> - suodata tilin nimellä
+                <li> <code>acct:REGEXP</code> - filter on to/from account
-                <li> <code>desc:REGEXP</code> - suodata selitteellä
+                <li> <code>desc:REGEXP</code> - filter on description
-                <li> <code>date:AIKAVÄLI</code>, <code>date2:AIKAVÄLI</code> - suodata päiväyksen tai toissijaisen päiväkysen perusteella.
+                <li> <code>date:PERIODEXP</code>, <code>date2:PERIODEXP</code> - filter on date or secondary date
-                <li> <code>code:REGEXP</code> - suodata kirjauksen numerolla (esim. tilisiirron viitenumero)
+                <li> <code>code:REGEXP</code> - filter on transaction's code (eg check number)
-                <li> <code>status:*</code>, <code>status:!</code>, <code>status:</code> - suodata kirjauksen tilan perusteella (valmis, kesken, tarkistamaton)
+                <li> <code>status:*</code>, <code>status:!</code>, <code>status:</code> - filter on transaction's cleared status (cleared, pending, uncleared)
-                <!-- <li> <code>empty:BOOL</code> - suodata sen perusteella, onko tilin saldo nolla -->
+                <!-- <li> <code>empty:BOOL</code> - filter on whether amount is zero -->
-                <li> <code>amt:N</code>, <code>amt:&lt;N</code>, <code>amt:&gt;N</code> - suodata summan (itseisarvon) suuruuden perusteella. Etumerkin + tai &minus; lisääminen luvun <code>N</code> eteen rajoittaa suodatuksen vain sen merkkisiin summiin. (ei yhdistä eri valuuttojen määriä)
+                <li> <code>amt:N</code>, <code>amt:&lt;N</code>, <code>amt:&gt;N</code> - filter on the unsigned amount magnitude. Or with a sign before N, filter on the signed value. (Single-commodity amounts only.)
-                <li> <code>cur:REGEXP</code> - suodata valuutan/hyödykkeen tunnuksella. (koko tunnuksen täytyy täsmätä)
+                <li> <code>cur:REGEXP</code> - filter on the currency/commodity symbol (must match all of it). Dollar sign must be written as <code>\$</code>
-                <li> <code>tag:NIMI</code>, <code>tag:NIMI=REGEX</code> - suodata tunnisteen nimellä tai nimellä ja arvolla
+                <li> <code>tag:NAME</code>, <code>tag:NAME=REGEX</code> - filter on tag name, or tag name and value
-                <!-- <li> <code>depth:N</code> - rajoita niihin tileihin, joilla on alle <code>N</code> ylätiliä -->
+                <!-- <li> <code>depth:N</code> - filter out accounts below this depth -->
-                <li> <code>real:BOOL</code> - suodata siirtojen todellisuuden/näennäisyyden perusteella. Näennäissiirtojen summa ei välttämättä ole nolla, eli ne voivat hävittää kirjanpidosta rahaa tai tuoda sitä sinne tyhjästä.
+                <li> <code>real:BOOL</code> - filter on postings' real/virtual-ness
-                <li> Hakuehdot erotellaan välilyönneillä. Välilyönnin voi sisällyttää hakuehtoon ympäröimällä ehdon yksin- tai kaksinkertaisilla suorilla lainausmerkeillä (<code>"</code> tai <code>'</code>)
+                <li> Enclose search patterns containing spaces in single or double quotes
-                <li> Lisää ehdon alkuun <code>not:</code> valitaksesi ne tapahtumat, jotka eivät toteuta ehtoa
+                <li> Prepend <code>not:</code> to negate a search term
-                <li> Selitteen, tilin nimen ja kirjauksen tilan hakuehdoista riittää toteuttaa yksi, muista ehdoista tapahtuman pitää toteuttaa kaikki tullakseen valituksi.
+                <li> Description, account, status query terms are OR'ed, others are AND'ed.

hledger-web/templates/edit-form.hamlet

@@ -1,9 +1,9 @@
 #{extra}
 <h2>
-  Muokkaa tiedostoa #
+  Edit file #
   <i>#{f}
 <div.alert.alert-danger>
-  Oletko varma? Tämä korvaa vanhan tiedoston täysin!
+  Are you sure? This will overwrite your journal!
 <table.table.table-condensed>
   <tr>
     <td colspan=2 style="border:0">
@@ -11,7 +11,7 @@
   <tr>
     <td style="border:0">
       <span.help>
-        ^{helplink "file-format" "Apua tiedostomudon kanssa (englanniksi)"}
+        ^{helplink "file-format" "File format help"}
     <td .text-right style="border:0">
-      <a.btn.btn-default href="@{ManageR}">Peruuta
+      <a.btn.btn-default href="@{ManageR}">Go back
-      <input.btn.btn-default type=submit value="Tallenna">
+      <input.btn.btn-default type=submit value="Save">

hledger-web/templates/journal.hamlet

@@ -3,16 +3,16 @@
 
 $if elem CapAdd caps
   <a #addformlink href="#" role="button" style="cursor:pointer; margin-top:1em;"
-     data-toggle="modal" data-target="#addmodal" title="Lisää uusi tapahtuma kirjanpitoon.">
+     data-toggle="modal" data-target="#addmodal" title="Add a new transaction to the journal">
-    Kirjaa tapahtuma
+    Add a transaction
 
 <div .table-responsive>
   <table .transactionsreport .table .table-condensed>
     <thead>
-      <th .date style="text-align:left;">Päiväys
+      <th .date style="text-align:left;">Date
-      <th .description style="text-align:left;">Selite
+      <th .description style="text-align:left;">Description
-      <th .account style="text-align:left;">Tili
+      <th .account style="text-align:left;">Account
-      <th .amount style="text-align:right;">Summa
+      <th .amount style="text-align:right;">Amount
 
     $forall torig <- items
       <tr .title ##{transactionFrag torig} title="#{showTransaction torig}">

hledger-web/templates/manage.hamlet

@@ -1,12 +1,12 @@
 <h2>
-  Kirjanpitosi tiedostot
+  Your journal's files
 
 <div.row>
   <div .col-md-6.col-sm-8.col-xs-12>
     <table .table.table-condensed>
       <thead>
         <th>
-          Tiedosto
+          File
         <th>
       <tbody>
         $forall (path, _) <- jfiles j
@@ -15,8 +15,8 @@
               #{path}
             <td style="text-align:right">
               <a.btn.btn-default href=@{EditR path}>
-                Muokkaa
+                Edit
               <a.btn.btn-default href=@{UploadR path}>
-                Korvaa uudella
+                Upload
               <a.btn.btn-default href=@{DownloadR path}>
-                Imuroi
+                Download

hledger-web/templates/register.hamlet

@@ -9,11 +9,11 @@
     <thead>
       <tr>
         <th style="text-align:left;">
-          Päiväys
+          Date
           <span .glyphicon.glyphicon-chevron-up>
-        <th style="text-align:left;">Kuvaus
+        <th style="text-align:left;">Description
-        <th style="text-align:left;">Tileille/Tileiltä
+        <th style="text-align:left;">To/From Account(s)
-        <th style="text-align:right; white-space:normal;">Siirretty summa
+        <th style="text-align:right; white-space:normal;">Amount Out/In
         <th style="text-align:right; white-space:normal;">
           #{balancelabel}
 

hledger-web/templates/upload-form.hamlet

@@ -1,14 +1,14 @@
 <h2>
-  Korvaa tiedosto #
+  Upload to file #
   <i>#{f}
 <div.alert.alert-danger>
-  Oletko varma? Tämä korvaa vanhan tiedoston täysin!
+  Are you sure? This will overwrite your journal!
 <div.form-group>
   <label .btn.btn-primary for="file">
     <input type=file id=file name=file style="display:none"
       onchange="\$('#file-info').html(this.files[0].name)" />
-    Valitse korvattava tiedosto
+    Select file
   <span .label.label-info id="file-info">
 <div.form-group>
-  <input .btn.btn-default type=submit value="Korvaa">
+  <input .btn.btn-default type=submit value="Upload">
 #{extra}

hledger/.version

@@ -1 +1 @@
-1.27.1
+1.27

hledger/.version.m4

@@ -1,2 +1,2 @@
 m4_dnl Version number to show in manuals. Updated by "Shake setversion"
-m4_define({{_version_}}, {{1.27.1}})m4_dnl
+m4_define({{_version_}}, {{1.27}})m4_dnl

hledger/Hledger/Cli/Commands/Balance.hs

@@ -573,20 +573,14 @@ multiBalanceReportHtmlRows ropts mbr =
 -- | Render one MultiBalanceReport heading row as a HTML table row.
 multiBalanceReportHtmlHeadRow :: ReportOpts -> [T.Text] -> Html ()
 multiBalanceReportHtmlHeadRow _ [] = mempty  -- shouldn't happen
-multiBalanceReportHtmlHeadRow ropts (acct:cells) =
+multiBalanceReportHtmlHeadRow ropts (acct:rest) =
   let
     defstyle = style_ ""
     (amts,tot,avg)
-      | row_total_ ropts && average_ ropts = (ini2,  sndlst2, lst2)
+      | row_total_ ropts && average_ ropts = (init $ init rest, [last $ init rest], [last rest])
-      | row_total_ ropts                   = (ini1,  lst1,    [])
+      | row_total_ ropts                   = (init rest,        [last rest],        [])
-      |                     average_ ropts = (ini1,  [],      lst1)
+      |                     average_ ropts = (init rest,        [],                 [last rest])
-      | otherwise                          = (cells, [],      [])
+      | otherwise                          = (rest,             [],                 [])
-      where
-        n = length cells
-        (ini1,lst1)    = splitAt (n-1) cells
-        (ini2, rest)   = splitAt (n-2) cells
-        (sndlst2,lst2) = splitAt 1 rest
-
   in
     tr_ $ mconcat $
           td_ [class_ "account"]              (toHtml acct)
@@ -597,19 +591,14 @@ multiBalanceReportHtmlHeadRow ropts (acct:cells) =
 -- | Render one MultiBalanceReport data row as a HTML table row.
 multiBalanceReportHtmlBodyRow :: ReportOpts -> [T.Text] -> Html ()
 multiBalanceReportHtmlBodyRow _ [] = mempty  -- shouldn't happen
-multiBalanceReportHtmlBodyRow ropts (label:cells) =
+multiBalanceReportHtmlBodyRow ropts (label:rest) =
   let
     defstyle = style_ "text-align:right"
     (amts,tot,avg)
-      | row_total_ ropts && average_ ropts = (ini2,  sndlst2, lst2)
+      | row_total_ ropts && average_ ropts = (init $ init rest, [last $ init rest], [last rest])
-      | row_total_ ropts                   = (ini1,  lst1,    [])
+      | row_total_ ropts                   = (init rest,        [last rest],        [])
-      |                     average_ ropts = (ini1,  [],      lst1)
+      |                     average_ ropts = (init rest,        [],                 [last rest])
-      | otherwise                          = (cells, [],      [])
+      | otherwise                          = (rest,             [],                 [])
-      where
-        n = length cells
-        (ini1,lst1)    = splitAt (n-1) cells
-        (ini2, rest)   = splitAt (n-2) cells
-        (sndlst2,lst2) = splitAt 1 rest
   in
     tr_ $ mconcat $
           td_ [class_ "account", style_ "text-align:left"]  (toHtml label)
@@ -626,19 +615,14 @@ multiBalanceReportHtmlFootRow _ropts [] = mempty
 --   : repeat nullmixedamt zeros
 --  ++ (if row_total_ ropts then [nullmixedamt] else [])
 --  ++ (if average_ ropts   then [nullmixedamt]   else [])
-multiBalanceReportHtmlFootRow ropts (acct:cells) =
+multiBalanceReportHtmlFootRow ropts (acct:rest) =
   let
     defstyle = style_ "text-align:right"
     (amts,tot,avg)
-      | row_total_ ropts && average_ ropts = (ini2,  sndlst2, lst2)
+      | row_total_ ropts && average_ ropts = (init $ init rest, [last $ init rest], [last rest])
-      | row_total_ ropts                   = (ini1,  lst1,    [])
+      | row_total_ ropts                   = (init rest,        [last rest],        [])
-      |                     average_ ropts = (ini1,  [],      lst1)
+      |                     average_ ropts = (init rest,        [],                 [last rest])
-      | otherwise                          = (cells, [],      [])
+      | otherwise                          = (rest,             [],                 [])
-      where
-        n = length cells
-        (ini1,lst1)    = splitAt (n-1) cells
-        (ini2, rest)   = splitAt (n-2) cells
-        (sndlst2,lst2) = splitAt 1 rest
   in
     tr_ $ mconcat $
           th_ [style_ "text-align:left"]             (toHtml acct)

hledger/hledger.cabal

@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           hledger
-version:        1.27.1
+version:        1.27
 synopsis:       Command-line interface for the hledger accounting system
 description:    The command-line interface for the hledger accounting system.
                 Its basic function is to read a plain text file describing
@@ -134,7 +134,7 @@ library
   other-modules:
       Paths_hledger
   ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind -optP-Wno-nonportable-include-path
-  cpp-options: -DVERSION="1.27.1"
+  cpp-options: -DVERSION="1.27"
   build-depends:
       Decimal >=0.5.1
     , Diff >=0.2
@@ -152,7 +152,7 @@ library
     , githash >=0.1.6.1
     , hashable >=1.2.4
     , haskeline >=0.6
-    , hledger-lib >=1.27.1 && <1.28
+    , hledger-lib ==1.27.*
     , lucid
     , math-functions >=0.3.3.0
     , megaparsec >=7.0.0 && <9.3
@@ -186,7 +186,7 @@ executable hledger
   hs-source-dirs:
       app
   ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind -optP-Wno-nonportable-include-path
-  cpp-options: -DVERSION="1.27.1"
+  cpp-options: -DVERSION="1.27"
   build-depends:
       Decimal >=0.5.1
     , aeson >=1
@@ -203,7 +203,7 @@ executable hledger
     , githash >=0.1.6.1
     , haskeline >=0.6
     , hledger
-    , hledger-lib >=1.27.1 && <1.28
+    , hledger-lib ==1.27.*
     , math-functions >=0.3.3.0
     , megaparsec >=7.0.0 && <9.3
     , microlens >=0.4
@@ -237,7 +237,7 @@ test-suite unittest
   hs-source-dirs:
       test
   ghc-options: -Wall -Wno-incomplete-uni-patterns -Wno-missing-signatures -Wno-orphans -Wno-type-defaults -Wno-unused-do-bind -optP-Wno-nonportable-include-path
-  cpp-options: -DVERSION="1.27.1"
+  cpp-options: -DVERSION="1.27"
   build-depends:
       Decimal >=0.5.1
     , aeson >=1
@@ -254,7 +254,7 @@ test-suite unittest
     , githash >=0.1.6.1
     , haskeline >=0.6
     , hledger
-    , hledger-lib >=1.27.1 && <1.28
+    , hledger-lib ==1.27.*
     , math-functions >=0.3.3.0
     , megaparsec >=7.0.0 && <9.3
     , microlens >=0.4
@@ -303,7 +303,7 @@ benchmark bench
     , githash >=0.1.6.1
     , haskeline >=0.6
     , hledger
-    , hledger-lib >=1.27.1 && <1.28
+    , hledger-lib ==1.27.*
     , html
     , math-functions >=0.3.3.0
     , megaparsec >=7.0.0 && <9.3

hledger/package.yaml

@@ -1,5 +1,5 @@
 name: hledger
-version: 1.27.1
+version: 1.27
 synopsis: Command-line interface for the hledger accounting system
 description: |
   The command-line interface for the hledger accounting system.
@@ -97,7 +97,7 @@ ghc-options:
 
 dependencies:
 - base >=4.14 && <4.17
-- hledger-lib >=1.27.1 && <1.28
+- hledger-lib >=1.27 && <1.28
 - aeson >=1
 - ansi-terminal >=0.9
 - breakpoint
@@ -138,7 +138,7 @@ when:
   - terminfo
 
 library:
-  cpp-options: -DVERSION="1.27.1"
+  cpp-options: -DVERSION="1.27"
   exposed-modules:
   - Hledger.Cli
   - Hledger.Cli.Main
@@ -187,7 +187,7 @@ executables:
   hledger:
     source-dirs: app
     main: hledger-cli.hs
-    cpp-options: -DVERSION="1.27.1"
+    cpp-options: -DVERSION="1.27"
     when:
     - condition: flag(threaded)
       ghc-options: -threaded
@@ -199,7 +199,7 @@ tests:
     source-dirs: test
     main: unittest.hs
     other-modules: []  # prevent double compilation, https://github.com/sol/hpack/issues/188
-    cpp-options: -DVERSION="1.27.1"
+    cpp-options: -DVERSION="1.27"
     dependencies:
     - hledger
 

hledger/test/balance/balance.test

@@ -1,5 +1,6 @@
 # 1.
-$ hledger -f sample.journal balance --tree
+hledger -f sample.journal balance --tree
+>>>
                  $-1  assets
                   $1    bank:saving
                  $-2    cash
@@ -12,18 +13,22 @@ $ hledger -f sample.journal balance --tree
                   $1  liabilities:debts
 --------------------
                    0  
+>>>=0
 
 # 2.
-$ hledger -f sample.journal balance --tree o
+hledger -f sample.journal balance --tree o
+>>>
                   $1  expenses:food
                  $-2  income
                  $-1    gifts
                  $-1    salary
 --------------------
                  $-1  
+>>>=0
 
 # 3. Period reporting works for a specific year
-<
+hledger -f - balance -b 2016 -e 2017 -N
+<<<
 2015/10/10 Client A | Invoice #1
     assets:receivables      $10,000.00
     revenue:clients:A      -$10,000.00
@@ -43,13 +48,16 @@ $ hledger -f sample.journal balance --tree o
 2016/03/01 Deposit | Invoice #2
     assets:checking             $10.00
     assets:receivables         -$10.00
-$ hledger -f - balance -b 2016 -e 2017 -N
+>>>
              $-40.00  assets:checking
               $50.00  expense:hosting
              $-10.00  revenue:clients:B
+>>>2
+>>>= 0
 
 # 4. Period reporting works for two years
-<
+hledger -f - balance --tree -b 2015 -e 2017 -N
+<<<
 2015/10/10 Client A | Invoice #1
     assets:receivables      $10,000.00
     revenue:clients:A      -$10,000.00
@@ -69,15 +77,18 @@ $ hledger -f - balance -b 2016 -e 2017 -N
 2016/03/01 Deposit | Invoice #2
     assets:checking             $10.00
     assets:receivables         -$10.00
-$ hledger -f - balance --tree -b 2015 -e 2017 -N
+>>>
            $9,960.00  assets:checking
               $50.00  expense:hosting
          $-10,010.00  revenue:clients
          $-10,000.00    A
              $-10.00    B
+>>>2
+>>>= 0
 
 # 5. Period reporting works for one month
-<
+hledger -f - balance --tree -b 2015/11 -e 2015/12 -N
+<<<
 2015/10/10 Client A | Invoice #1
     assets:receivables      $10,000.00
     revenue:clients:A      -$10,000.00
@@ -97,13 +108,16 @@ $ hledger -f - balance --tree -b 2015 -e 2017 -N
 2016/03/01 Deposit | Invoice #2
     assets:checking             $10.00
     assets:receivables         -$10.00
-$ hledger -f - balance --tree -b 2015/11 -e 2015/12 -N
+>>>
                    0  assets
           $10,000.00    checking
          $-10,000.00    receivables
+>>>2
+>>>= 0
 
 # 6. Period reporting works for one month in another year
-<
+hledger -f - balance -b 2016/10 -e 2016/11
+<<<
 2015/10/10 Client A | Invoice #1
     assets:receivables      $10,000.00
     revenue:clients:A      -$10,000.00
@@ -123,85 +137,88 @@ $ hledger -f - balance --tree -b 2015/11 -e 2015/12 -N
 2016/03/01 Deposit | Invoice #2
     assets:checking             $10.00
     assets:receivables         -$10.00
-$ hledger -f - balance -b 2016/10 -e 2016/11
+>>>
 --------------------
                    0  
+>>>2
+>>>= 0
 
 # 7. Default CSV output. 
-<
+hledger -f - balance -N --output-format=csv
+<<<
 2021-01-01 Test
     Assets:ABC   "AB.C" 1
     Assets:Cash       -$1
-$ hledger -f - balance -N --output-format=csv
+>>>
 "account","balance"
 "Assets:ABC","""AB.C"" 1"
 "Assets:Cash","$-1"
+>>>= 0
 
 # 8. CSV output always shows full account names, even in tree mode (#1565).
-<
+hledger -f - balance -N --output-format=csv --tree
+<<<
 2021-01-01 Test
     Assets:ABC   "AB.C" 1
     Assets:Cash       -$1
-$ hledger -f - balance -N --output-format=csv --tree
+>>>
 "account","balance"
 "Assets","$-1, ""AB.C"" 1"
 "Assets:ABC","""AB.C"" 1"
 "Assets:Cash","$-1"
+>>>= 0
 
 # 9. CSV output always does not show thousands separators
-<
+hledger -f - balance -N --output-format=csv
+<<<
 2021-01-01 Test
     Assets:ABC    $10 000.00
     Assets:Cash  -$10 000.00
-$ hledger -f - balance -N --output-format=csv
+>>>
 "account","balance"
 "Assets:ABC","$10000.00"
 "Assets:Cash","$-10000.00"
+>>>= 0
 
 # 10. --declared includes all declared leaf accounts, even if they have no postings.
 # They are filtered, depth-clipped, and form trees like the others.
 # (XXX Here a:ac is not declared and so not shown, even though normally a balance report clipped to depth 2 would show it. Wrong ?)
-<
+hledger -f - balance -NE --declared --tree --depth 2 a
+<<<
 account a
 account a:aa
 account a:ab
 account a:ac:aca
 account b
-$ hledger -f - balance -NE --declared --tree --depth 2 a
+>>>
                    0  a
                    0    aa
                    0    ab
+>>>= 0
 
 # 11. In list mode we can see that non-leaf declared accounts are excluded.
-<
+hledger -f - balance -NE --declared --flat
+<<<
 account a
 account a:aa
 account a:ab
 account a:ac:aca
 account b
-$ hledger -f - balance -NE --declared --flat
+>>>
                    0  a:aa
                    0  a:ab
                    0  a:ac:aca
                    0  b
+>>>= 0
 
 # 12. not:ACCT queries work with declared accounts.
-<
+hledger -f - balance -NE --declared not:a
+<<<
 account a
 account a:aa
 account a:ab
 account a:ac:aca
 account b
-$ hledger -f - balance -NE --declared not:a
+>>>
                    0  b
-
+>>>= 0
-# 13. An empty periodic report in HTML output does not break.
-<
-$ hledger -f- bal -M -O html
-> //
-
-# 14. An empty totals column in HTML output does not break (#1933).
-<
-$ hledger -f- bal -MT -O html
-> //
-

hledger/test/cli/multiple-files.test

@@ -1,5 +1,5 @@
 # 1. all data files on the command line should be read
-hledger is -f personal.journal -f business.journal
+hledger inc -f personal.journal -f business.journal
 >>>
 Income Statement 2014-01-01..2014-01-02