Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Improved error report on loading translation file.

Browse source
This commit is contained in:
John MacFarlane 2017-08-12 12:25:33 -07:00
parent 622c3f2fa6
commit 444f8e9569
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Text/Pandoc/Class.hs
View file

@ -346,10 +346,12 @@ getTranslations = do
Just (lang, Nothing) -> do -- read from file
let translationFile = "translations/" ++ renderLang lang ++ ".yaml"
let fallbackFile = "translations/" ++ langLanguage lang ++ ".yaml"
let getTrans bs =
let getTrans fp = do
bs <- readDataFile fp
case readTranslations (UTF8.toString bs) of
Left e -> do
report $ CouldNotLoadTranslations (renderLang lang) e
report $ CouldNotLoadTranslations (renderLang lang)
(fp ++ ": " ++ e)
-- make sure we don't try again...
modifyCommonState $ \st ->
st{ stTranslations = Nothing }
@ -358,9 +360,9 @@ getTranslations = do
modifyCommonState $ \st ->
st{ stTranslations = Just (lang, Just t) }
return t
catchError (readDataFile translationFile >>= getTrans)
catchError (getTrans translationFile)
(\_ ->
catchError (readDataFile fallbackFile >>= getTrans)
catchError (getTrans fallbackFile)
(\e -> do
report $ CouldNotLoadTranslations (renderLang lang)
$ case e of