From 8991ec1372b47672bbb462f3007bfe0a117a3891 Mon Sep 17 00:00:00 2001 From: zwim <36999612+zwim@users.noreply.github.com> Date: Sun, 10 Jan 2021 19:37:51 +0100 Subject: [PATCH] Align wording of AltStatusBar menu to the bottom one (#7130) Also change to "Font size (%1)" --- .../apps/reader/modules/readercoptlistener.lua | 15 ++++++++------- frontend/apps/reader/modules/readerfooter.lua | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/frontend/apps/reader/modules/readercoptlistener.lua b/frontend/apps/reader/modules/readercoptlistener.lua index ee1d60d60..16105b390 100644 --- a/frontend/apps/reader/modules/readercoptlistener.lua +++ b/frontend/apps/reader/modules/readercoptlistener.lua @@ -21,6 +21,7 @@ function ReaderCoptListener:onReadSettings(config) end) end + -- crengine top status bar can only show author and title together self.title = G_reader_settings:readSetting("cre_header_title") or 1 self.clock = G_reader_settings:readSetting("cre_header_clock") or 1 self.page_number = G_reader_settings:readSetting("cre_header_page_number") or 1 @@ -76,7 +77,7 @@ function ReaderCoptListener:getAltStatusBarMenu() separator = true, }, { - text = _("Title"), + text = _("Book author and title"), checked_func = function() return self.title == 1 end, @@ -86,7 +87,7 @@ function ReaderCoptListener:getAltStatusBarMenu() end, }, { - text = _("Clock"), + text = _("Current time"), checked_func = function() return self.clock == 1 end, @@ -96,7 +97,7 @@ function ReaderCoptListener:getAltStatusBarMenu() end, }, { - text = _("Page number"), + text = _("Current page"), checked_func = function() return self.page_number == 1 end, @@ -106,7 +107,7 @@ function ReaderCoptListener:getAltStatusBarMenu() end, }, { - text = _("Page count"), + text = _("Total pages"), checked_func = function() return self.page_count == 1 end, @@ -116,7 +117,7 @@ function ReaderCoptListener:getAltStatusBarMenu() end, }, { - text = _("Reading percentage"), + text = _("Progress percentage"), checked_func = function() return self.reading_percent == 1 end, @@ -126,7 +127,7 @@ function ReaderCoptListener:getAltStatusBarMenu() end, }, { - text = _("Battery"), + text = _("Battery status"), checked_func = function() return self.battery == 1 end, @@ -161,7 +162,7 @@ function ReaderCoptListener:getAltStatusBarMenu() }, { text_func = function() - return T(_("Top status bar font size (%1)"), G_reader_settings:readSetting("cre_header_status_font_size") or 20 ) + return T(_("Font size (%1)"), G_reader_settings:readSetting("cre_header_status_font_size") or 20 ) end, callback = function(touchmenu_instance) local SpinWidget = require("ui/widget/spinwidget") diff --git a/frontend/apps/reader/modules/readerfooter.lua b/frontend/apps/reader/modules/readerfooter.lua index 5c4f16829..878f46f71 100644 --- a/frontend/apps/reader/modules/readerfooter.lua +++ b/frontend/apps/reader/modules/readerfooter.lua @@ -799,7 +799,7 @@ function ReaderFooter:textOptionTitles(option) pages_left = T(_("Pages left in chapter (%1)"), symbol_prefix[symbol].pages_left), battery = T(_("Battery status (%1)"), symbol_prefix[symbol].battery), percentage = symbol_prefix[symbol].percentage - and T(_("Progress percentage (%1)"), symbol_prefix[symbol].percentage) or ("Progress percentage"), + and T(_("Progress percentage (%1)"), symbol_prefix[symbol].percentage) or _("Progress percentage"), book_time_to_read = T(_("Book time to read (%1)"),symbol_prefix[symbol].book_time_to_read), chapter_time_to_read = T(_("Chapter time to read (%1)"), symbol_prefix[symbol].chapter_time_to_read), frontlight = T(_("Frontlight level (%1)"), symbol_prefix[symbol].frontlight),