renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[fix] Dict settings NaN in installed dicts submenu (#3173)

Browse Source
This commit is contained in:
Frans de Jonge
2017-09-05 07:56:05 +02:00
committed by GitHub
parent 829e2fffd8
commit ba7fad2cdf
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
frontend/apps/reader/modules/readerdictionary.lua
View File

@@ -145,20 +145,17 @@ function ReaderDictionary:addToMainMenu(menu_items)
text = _("Dictionary settings"),
sub_item_table = {
{
-- text = _("Installed dictionaries"),
text_func = function()
local nb_available = #available_ifos
local nb_disabled = 0
for _ in pairs(G_reader_settings:readSetting("dicts_disabled")) do
nb_disabled = nb_disabled + 1
end
local nb_available, nb_enabled, nb_disabled = self:getNumberOfDictionaries()
local nb_str = nb_available
if nb_disabled > 0 then
local nb_enabled = nb_available - nb_disabled
nb_str = nb_enabled .. "/" .. nb_available
end
return T(_("Installed dictionaries (%1)"), nb_str)
end,
enabled_func = function()
return self:getNumberOfDictionaries() > 0
end,
sub_item_table = self:genDictionariesMenu(),
},
{
@@ -203,6 +200,20 @@ function ReaderDictionary:onLookupWord(word, box, highlight)
return true
end
--- Gets number of available, enabled, and disabled dictionaries
-- @treturn int nb_available
-- @treturn int nb_enabled
-- @treturn int nb_disabled
function ReaderDictionary:getNumberOfDictionaries()
local nb_available = #available_ifos
local nb_disabled = 0
for _ in pairs(G_reader_settings:readSetting("dicts_disabled")) do
nb_disabled = nb_disabled + 1
end
local nb_enabled = nb_available - nb_disabled
return nb_available, nb_enabled, nb_disabled
end
function ReaderDictionary:genDictionariesMenu()
local items = {}
for _, ifo in pairs(available_ifos) do