[fix, spec] Stop the kobo_touch_probe test from causing problems for other tests. (#3877)

Previously, it caused problems because it was overriding G_reader_settings,
which caused the Translator test to fail on the second (but not first) run.
pull/3879/head
Frode Austvik 6 years ago committed by Frans de Jonge
parent 82b13a64b0
commit 58d9f5c0b3

@ -9,10 +9,13 @@ local DataStorage = require("datastorage")
local _ = require("gettext")
-- read settings and check for language override
-- but don't re-read if already done, to avoid causing problems for unit tests
-- has to be done before requiring other files because
-- they might call gettext on load
G_reader_settings = require("luasettings"):open(
DataStorage:getDataDir().."/settings.reader.lua")
if G_reader_settings == nil then
G_reader_settings = require("luasettings"):open(
DataStorage:getDataDir().."/settings.reader.lua")
end
local lang_locale = G_reader_settings:readSetting("language")
if lang_locale then
_.changeLang(lang_locale)

Loading…
Cancel
Save