diff --git a/frontend/apps/reader/modules/readerdictionary.lua b/frontend/apps/reader/modules/readerdictionary.lua index f5f3256b8..462fa5bc4 100644 --- a/frontend/apps/reader/modules/readerdictionary.lua +++ b/frontend/apps/reader/modules/readerdictionary.lua @@ -209,6 +209,10 @@ function ReaderDictionary:showDict(word, results, box) -- differentiate between dict and wiki is_wiki = self.is_wiki, wiki_languages = self.wiki_languages, + refresh_callback = function() + -- update info in footer (time, battery, etc) + self.view.footer:updateFooter() + end, } table.insert(self.dict_window_list, self.dict_window) UIManager:show(self.dict_window) diff --git a/frontend/apps/reader/modules/readerfooter.lua b/frontend/apps/reader/modules/readerfooter.lua index db9608ef2..f5e484cc2 100644 --- a/frontend/apps/reader/modules/readerfooter.lua +++ b/frontend/apps/reader/modules/readerfooter.lua @@ -524,10 +524,6 @@ function ReaderFooter:onPosUpdate(pos) self:updateFooterPos() end -function ReaderFooter:onUpdateFooter() - self:updateFooter() -end - -- recalculate footer sizes when document page count is updated -- see documentation for more info about this event. ReaderFooter.onUpdatePos = ReaderFooter.updateFooter diff --git a/frontend/ui/network/wpa_supplicant.lua b/frontend/ui/network/wpa_supplicant.lua index d72b3b99e..bb17823c4 100644 --- a/frontend/ui/network/wpa_supplicant.lua +++ b/frontend/ui/network/wpa_supplicant.lua @@ -65,7 +65,7 @@ function WpaSupplicant:authenticateNetwork(network) local re = wcli:setNetwork(nw_id, "ssid", string.format("\"%s\"", network.ssid)) if re == 'FAIL' then wcli:removeNetwork(nw_id) - return false, _("Failed to set network SSID.") + return false, _("An error occurred while selecting network.") end if not network.psk then network.psk = calculatePsk(network.ssid, network.password) @@ -74,7 +74,7 @@ function WpaSupplicant:authenticateNetwork(network) re = wcli:setNetwork(nw_id, "psk", network.psk) if re == 'FAIL' then wcli:removeNetwork(nw_id) - return false, _("Failed to set network password.") + return false, _("An error occurred while setting password.") end wcli:enableNetworkByID(nw_id) diff --git a/frontend/ui/widget/dictquicklookup.lua b/frontend/ui/widget/dictquicklookup.lua index bfb794ad1..d29070011 100644 --- a/frontend/ui/widget/dictquicklookup.lua +++ b/frontend/ui/widget/dictquicklookup.lua @@ -56,6 +56,8 @@ local DictQuickLookup = InputContainer:new{ definition_padding = Screen:scaleBySize(2), definition_margin = Screen:scaleBySize(2), button_padding = Screen:scaleBySize(14), + -- refresh_callback will be called before we trigger full refresh in onSwipe + refresh_callback = nil, } function DictQuickLookup:init() @@ -627,8 +629,7 @@ function DictQuickLookup:onSwipe(arg, ges) elseif ges.direction == "east" then self:changeToPrevDict() else - -- update footer (time & battery) - UIManager:broadcastEvent(Event:new("UpdateFooter")) + if self.refresh_callback then self.refresh_callback() end -- trigger full refresh UIManager:setDirty(nil, "full") end diff --git a/frontend/ui/wikipedia.lua b/frontend/ui/wikipedia.lua index 3430f5dc6..89751127f 100644 --- a/frontend/ui/wikipedia.lua +++ b/frontend/ui/wikipedia.lua @@ -298,7 +298,7 @@ function Wikipedia:createEpub(epub_path, page, lang, with_images, progress_callb end end - progress_callback(_("Fetching Wikipedia page...")) + progress_callback(_("Fetching Wikipedia page…")) local ok, phtml = pcall(self.wikiphtml, self, page, lang) if not ok then progress_callback(phtml) @@ -741,7 +741,7 @@ time, abbr, sup { if include_images then local nb_images = #images for inum, img in ipairs(images) do - progress_callback(T(_("Fetching image %1 / %2 ..."), inum, nb_images)) + progress_callback(T(_("Fetching image %1 / %2 …"), inum, nb_images)) local src = img.src if use_img_2x and img.src2x then src = img.src2x