Show page number in sync prompt instead of percentage
This commit is contained in:
@@ -965,14 +965,24 @@ function Bookhoard:_doGetProgress(interactive)
|
|||||||
|
|
||||||
local nav_target = progress.koreader_xpointer or progress.epubcfi or progress.page
|
local nav_target = progress.koreader_xpointer or progress.epubcfi or progress.page
|
||||||
|
|
||||||
|
local sync_text
|
||||||
|
if not self.ui.document.info.has_pages then
|
||||||
|
local total = self.ui.document:getPageCount()
|
||||||
|
local target_page = math.min(Math.round(server_percentage * total), total)
|
||||||
|
sync_text = T(_("Sync to page %1 of %2 from server?"), target_page, total)
|
||||||
|
else
|
||||||
|
sync_text = T(_("Sync to page %1 of %2 from server?"),
|
||||||
|
Math.round(server_percentage * (progress.total_pages or 1)),
|
||||||
|
progress.total_pages or "?")
|
||||||
|
end
|
||||||
|
|
||||||
if self_older then
|
if self_older then
|
||||||
if self.settings.sync_forward == SYNC_STRATEGY.SILENT then
|
if self.settings.sync_forward == SYNC_STRATEGY.SILENT then
|
||||||
self:syncToProgress(nav_target, server_percentage)
|
self:syncToProgress(nav_target, server_percentage)
|
||||||
self:_showSyncedMessage()
|
self:_showSyncedMessage()
|
||||||
elseif self.settings.sync_forward == SYNC_STRATEGY.PROMPT then
|
elseif self.settings.sync_forward == SYNC_STRATEGY.PROMPT then
|
||||||
UIManager:show(ConfirmBox:new{
|
UIManager:show(ConfirmBox:new{
|
||||||
text = T(_("Sync to newer location %1%% from server?"),
|
text = sync_text,
|
||||||
Math.round(server_percentage * 100)),
|
|
||||||
ok_callback = function()
|
ok_callback = function()
|
||||||
self:syncToProgress(nav_target, server_percentage)
|
self:syncToProgress(nav_target, server_percentage)
|
||||||
end,
|
end,
|
||||||
@@ -984,8 +994,7 @@ function Bookhoard:_doGetProgress(interactive)
|
|||||||
self:_showSyncedMessage()
|
self:_showSyncedMessage()
|
||||||
elseif self.settings.sync_backward == SYNC_STRATEGY.PROMPT then
|
elseif self.settings.sync_backward == SYNC_STRATEGY.PROMPT then
|
||||||
UIManager:show(ConfirmBox:new{
|
UIManager:show(ConfirmBox:new{
|
||||||
text = T(_("Sync to previous location %1%% from server?"),
|
text = sync_text,
|
||||||
Math.round(server_percentage * 100)),
|
|
||||||
ok_callback = function()
|
ok_callback = function()
|
||||||
self:syncToProgress(nav_target, server_percentage)
|
self:syncToProgress(nav_target, server_percentage)
|
||||||
end,
|
end,
|
||||||
|
|||||||
Reference in New Issue
Block a user