diff --git a/hledger-web/Hledger/Web/App.hs b/hledger-web/Hledger/Web/App.hs index 0c340c5a8..fcee2825b 100644 --- a/hledger-web/Hledger/Web/App.hs +++ b/hledger-web/Hledger/Web/App.hs @@ -175,6 +175,7 @@ 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 @@ -310,4 +311,7 @@ require :: Permission -> Handler () require p = do VD{perms} <- getViewData unless (p `elem` perms) $ permissionDenied $ - "Missing the '" <> T.pack (showPermission p) <> "' permission" + deniedMessage p <> " (" <> T.pack (showPermission p) <> ")" + where deniedMessage ViewPermission = "Ei oikeutta lukea kirjauksia" + deniedMessage AddPermission = "Ei oikeutta lisätä kirjauksia" + deniedMessage EditPermission = "Ei oikeutta muokata kirjanpitoa" diff --git a/hledger-web/Hledger/Web/Handler/AddR.hs b/hledger-web/Hledger/Web/Handler/AddR.hs index def538701..3ea37b708 100644 --- a/hledger-web/Hledger/Web/Handler/AddR.hs +++ b/hledger-web/Hledger/Web/Handler/AddR.hs @@ -40,7 +40,7 @@ postAddR = do liftIO $ do ensureJournalFileExists f appendToJournalFileOrStdout f (showTransaction t') - setMessage "Transaction added." + setMessage "Kirjaus lisätty." redirect JournalR FormMissing -> showForm view enctype FormFailure errs -> do @@ -49,7 +49,7 @@ postAddR = do where showForm view enctype = sendResponse =<< defaultLayout [whamlet| -

Add transaction +

Uusi kirjaus
^{view} diff --git a/hledger-web/Hledger/Web/Handler/EditR.hs b/hledger-web/Hledger/Web/Handler/EditR.hs index caaedeab7..dfe2a1600 100644 --- a/hledger-web/Hledger/Web/Handler/EditR.hs +++ b/hledger-web/Hledger/Web/Handler/EditR.hs @@ -39,13 +39,13 @@ postEditR f = do newtxt <- fromFormSuccess (showForm view enctype) res runExceptT (writeJournalTextIfValidAndChanged f newtxt) >>= \case Left e -> do - setMessage $ "Failed to load journal: " <> toHtml e + setMessage $ "Kirjanpidon lataaminen epäonnistui: " <> toHtml e showForm view enctype Right () -> do - setMessage $ "Saved journal " <> toHtml f <> "\n" + setMessage $ "Kirjanpito tallennettu tiedostoon " <> toHtml f <> "\n" redirect JournalR where showForm view enctype = sendResponse <=< defaultLayout $ do - setTitle "Edit journal" + setTitle "Muokkaa kirjanpitoa" [whamlet|
^{view}|] diff --git a/hledger-web/Hledger/Web/Handler/JournalR.hs b/hledger-web/Hledger/Web/Handler/JournalR.hs index c1d63e1c4..397941a76 100644 --- a/hledger-web/Hledger/Web/Handler/JournalR.hs +++ b/hledger-web/Hledger/Web/Handler/JournalR.hs @@ -23,9 +23,9 @@ getJournalR = do VD{perms, j, q, opts, qparam, qopts, today} <- getViewData require ViewPermission let title = case inAccount qopts of - Nothing -> "General Journal" - Just (a, inclsubs) -> "Transactions in " <> a <> if inclsubs then "" else " (excluding subaccounts)" - title' = title <> if q /= Any then ", filtered" else "" + Nothing -> "Kaikki kirjaukset" + Just (a, inclsubs) -> "Tapahtumat tilillä " <> a <> if inclsubs then "" else " (poislukien alatilit)" + title' = title <> if q /= Any then ", suodatettu" else "" acctlink a = (RegisterR, [("q", replaceInacct qparam $ accountQuery a)]) rspec = (reportspec_ $ cliopts_ opts){_rsQuery = filterQuery (not . queryIsDepth) q} items = reverse $ @@ -34,5 +34,5 @@ getJournalR = do transactionFrag = transactionFragment j defaultLayout $ do - setTitle "journal - hledger-web" + setTitle "päiväkirja - hledger-web" $(widgetFile "journal") diff --git a/hledger-web/Hledger/Web/Handler/MiscR.hs b/hledger-web/Hledger/Web/Handler/MiscR.hs index 464eab8ea..732aae074 100644 --- a/hledger-web/Hledger/Web/Handler/MiscR.hs +++ b/hledger-web/Hledger/Web/Handler/MiscR.hs @@ -44,7 +44,7 @@ getManageR = do VD{j} <- getViewData require EditPermission defaultLayout $ do - setTitle "Edit journal" + setTitle "Muokkaa kirjanpitoa" $(widgetFile "manage") getDownloadR :: FilePath -> Handler TypedContent diff --git a/hledger-web/Hledger/Web/Handler/RegisterR.hs b/hledger-web/Hledger/Web/Handler/RegisterR.hs index 528424994..cd7bb3c50 100644 --- a/hledger-web/Hledger/Web/Handler/RegisterR.hs +++ b/hledger-web/Hledger/Web/Handler/RegisterR.hs @@ -30,9 +30,9 @@ getRegisterR = do VD{perms, j, q, opts, qparam, qopts, today} <- getViewData require ViewPermission - let (a,inclsubs) = fromMaybe ("all accounts",True) $ inAccount qopts - s1 = if inclsubs then "" else " (excluding subaccounts)" - s2 = if q /= Any then ", filtered" else "" + let (a,inclsubs) = fromMaybe ("kaikki tilit",True) $ inAccount qopts + s1 = if inclsubs then "" else " (poislukien alitilit)" + s2 = if q /= Any then ", suodatettu" else "" header = a <> s1 <> s2 let rspec = reportspec_ (cliopts_ opts) @@ -50,12 +50,12 @@ getRegisterR = do styleAmounts (journalCommodityStylesWith HardRounding j) $ accountTransactionsReport rspec{_rsQuery=q} j acctQuery balancelabel - | isJust (inAccount qopts), balanceaccum_ (_rsReportOpts rspec) == Historical = "Historical Total" - | isJust (inAccount qopts) = "Period Total" - | otherwise = "Total" + | isJust (inAccount qopts), balanceaccum_ (_rsReportOpts rspec) == Historical = "Historiallinen saldo" + | isJust (inAccount qopts) = "Kauden saldo" + | otherwise = "Saldo" transactionFrag = transactionFragment j defaultLayout $ do - setTitle "register - hledger-web" + setTitle "kirjaukset - hledger-web" $(widgetFile "register") -- cf. Hledger.Reports.AccountTransactionsReport.accountTransactionsReportItems diff --git a/hledger-web/Hledger/Web/Handler/UploadR.hs b/hledger-web/Hledger/Web/Handler/UploadR.hs index 629e4b460..1d3c5a9c1 100644 --- a/hledger-web/Hledger/Web/Handler/UploadR.hs +++ b/hledger-web/Hledger/Web/Handler/UploadR.hs @@ -48,20 +48,20 @@ postUploadR f = do newtxt <- case TE.decodeUtf8' lbs of Left e -> do setMessage $ - "Encoding error: '" <> toHtml (show e) <> "'. " <> - "If your file is not UTF-8 encoded, try the 'edit form', " <> - "where the transcoding should be handled by the browser." + "Merkistövirhe: '" <> toHtml (show e) <> "'. " <> + "Jos tiedostosi ei käytä UTF-8 merkistöä, kokeile 'muokkaa'-sivua," <> + "jolla selaimesi pitäisi huolehtia merkistön muuntamisesta puolestasi." showForm view enctype Right newtxt -> return newtxt runExceptT (writeJournalTextIfValidAndChanged f newtxt) >>= \case Left e -> do - setMessage $ "Failed to load journal: " <> toHtml e + setMessage $ "Kirjanpidon lataaminen epäonnistui: " <> toHtml e showForm view enctype Right () -> do - setMessage $ "File " <> toHtml f <> " uploaded successfully" + setMessage $ "Tiedoston " <> toHtml f <> " lataaminen onnistui!" redirect JournalR where showForm view enctype = sendResponse <=< defaultLayout $ do - setTitle "Upload journal" + setTitle "Korvaa tiedosto" [whamlet|^{view}|] diff --git a/hledger-web/Hledger/Web/Test.hs b/hledger-web/Hledger/Web/Test.hs index 8992de998..5a9fb1227 100644 --- a/hledger-web/Hledger/Web/Test.hs +++ b/hledger-web/Hledger/Web/Test.hs @@ -96,12 +96,12 @@ hledgerWebTest = do yit "serves a reasonable-looking journal page" $ do get JournalR statusIs 200 - bodyContains "Add a transaction" + bodyContains "Uusi kirjaus" yit "serves a reasonable-looking register page" $ do get RegisterR statusIs 200 - bodyContains "accounts" + bodyContains "tilit" yit "hyperlinks use a base url made from the default host and port" $ do get JournalR diff --git a/hledger-web/Hledger/Web/Widget/AddForm.hs b/hledger-web/Hledger/Web/Widget/AddForm.hs index 2972ef770..eb7477714 100644 --- a/hledger-web/Hledger/Web/Widget/AddForm.hs +++ b/hledger-web/Hledger/Web/Widget/AddForm.hs @@ -43,7 +43,7 @@ addModal addR j today = do