Archives
/
koreader
mirror of https://github.com/koreader/koreader
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

add gettext to all widgets

Browse Source
pull/39/head
Qingping Hou 11 years ago
parent 3602c61b1f
commit ce0ab36908
8 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File

4
frontend/ui/widget/bbox.lua
Unescape Escape View File

@ -178,12 +178,12 @@ function BBoxWidget:adjustScreenBBox(ges, relative)
end end
end end
self.screen_bbox = { self.screen_bbox = {
x0 = math.round(upper_left.x), x0 = math.round(upper_left.x),
y0 = math.round(upper_left.y), y0 = math.round(upper_left.y),
x1 = math.round(bottom_right.x), x1 = math.round(bottom_right.x),
y1 = math.round(bottom_right.y) y1 = math.round(bottom_right.y)
} }
UIManager.repaint_all = true UIManager.repaint_all = true
end end

2
frontend/ui/widget/button.lua
Unescape Escape View File

@ -52,7 +52,7 @@ function Button:init()
ges = "tap", ges = "tap",
range = self.dimen, range = self.dimen,
}, },
doc = "Tap Button", doc = _("Tap Button"),
}, },
} }
end end

14
frontend/ui/widget/config.lua
Unescape Escape View File

@ -12,12 +12,12 @@ function MenuBarItem:init()
ges = "tap", ges = "tap",
range = self.dimen, range = self.dimen,
}, },
doc = "Select Menu Item", doc = _("Select Menu Item"),
}, },
} }
else else
self.active_key_events = { self.active_key_events = {
Select = { {"Press"}, doc = "chose selected item" }, Select = { {"Press"}, doc = _("chose selected item") },
} }
end end
end end
@ -51,12 +51,12 @@ function OptionTextItem:init()
ges = "tap", ges = "tap",
range = self.dimen, range = self.dimen,
}, },
doc = "Select Option Item", doc = _("Select Option Item"),
}, },
} }
else else
self.active_key_events = { self.active_key_events = {
Select = { {"Press"}, doc = "chose selected item" }, Select = { {"Press"}, doc = _("chose selected item") },
} }
end end
end end
@ -105,7 +105,7 @@ function OptionIconItem:init()
ges = "tap", ges = "tap",
range = self.dimen, range = self.dimen,
}, },
doc = "Select Option Item", doc = _("Select Option Item"),
}, },
} }
end end
@ -422,11 +422,11 @@ function ConfigDialog:init()
} }
else else
-- set up keyboard events -- set up keyboard events
self.key_events.Close = { {"Back"}, doc = "close config menu" } self.key_events.Close = { {"Back"}, doc = _("close config menu") }
-- we won't catch presses to "Right" -- we won't catch presses to "Right"
self.key_events.FocusRight = nil self.key_events.FocusRight = nil
end end
self.key_events.Select = { {"Press"}, doc = "select current menu item"} self.key_events.Select = { {"Press"}, doc = _("select current menu item") }
UIManager:setDirty(self, "partial") UIManager:setDirty(self, "partial")
end end

10
frontend/ui/widget/confirmbox.lua
Unescape Escape View File

@ -6,10 +6,10 @@ require "ui/widget/button"
Widget that shows a message and OK/Cancel buttons Widget that shows a message and OK/Cancel buttons
]] ]]
ConfirmBox = FocusManager:new{ ConfirmBox = FocusManager:new{
text = "no text", text = _("no text"),
width = nil, width = nil,
ok_text = "OK", ok_text = _("OK"),
cancel_text = "Cancel", cancel_text = _("Cancel"),
ok_callback = function() end, ok_callback = function() end,
cancel_callback = function() end, cancel_callback = function() end,
} }
@ -20,8 +20,8 @@ function ConfirmBox:init()
self.width = Screen:getWidth() - 200 self.width = Screen:getWidth() - 200
end end
-- build bottons -- build bottons
self.key_events.Close = { {{"Home","Back"}}, doc = "cancel" } self.key_events.Close = { {{"Home","Back"}}, doc = _("cancel") }
self.key_events.Select = { {{"Enter","Press"}}, doc = "chose selected option" } self.key_events.Select = { {{"Enter","Press"}}, doc = _("chose selected option") }
local ok_button = Button:new{ local ok_button = Button:new{
text = self.ok_text, text = self.ok_text,

3
frontend/ui/widget/infomessage.lua
Unescape Escape View File

@ -14,7 +14,8 @@ InfoMessage = InputContainer:new{
function InfoMessage:init() function InfoMessage:init()
if Device:hasKeyboard() then if Device:hasKeyboard() then
key_events = { key_events = {
AnyKeyPressed = { { Input.group.Any }, seqtext = "any key", doc = "close dialog" } AnyKeyPressed = { { Input.group.Any },
seqtext = "any key", doc = _("close dialog") }
} }
else else
self.ges_events.TapClose = { self.ges_events.TapClose = {

12
frontend/ui/widget/menu.lua
Unescape Escape View File

@ -346,12 +346,12 @@ function Menu:init()
} }
else else
-- set up keyboard events -- set up keyboard events
self.key_events.Close = { {"Back"}, doc = "close menu" } self.key_events.Close = { {"Back"}, doc = _("close menu") }
self.key_events.NextPage = { self.key_events.NextPage = {
{Input.group.PgFwd}, doc = "goto next page of the menu" {Input.group.PgFwd}, doc = _("goto next page of the menu")
} }
self.key_events.PrevPage = { self.key_events.PrevPage = {
{Input.group.PgBack}, doc = "goto previous page of the menu" {Input.group.PgBack}, doc = _("goto previous page of the menu")
} }
-- we won't catch presses to "Right", leave that to MenuItem. -- we won't catch presses to "Right", leave that to MenuItem.
self.key_events.FocusRight = nil self.key_events.FocusRight = nil
@ -360,7 +360,7 @@ function Menu:init()
self.key_events.SelectByShortCut = { {self.item_shortcuts} } self.key_events.SelectByShortCut = { {self.item_shortcuts} }
end end
self.key_events.Select = { self.key_events.Select = {
{"Press"}, doc = "select current menu item" {"Press"}, doc = _("select current menu item")
} }
end end
@ -428,9 +428,9 @@ function Menu:updateItems(select_number)
self.item_group[select_number]:onFocus() self.item_group[select_number]:onFocus()
end end
-- update page information -- update page information
self.page_info.text = "page "..self.page.."/"..self.page_num self.page_info.text = _("page ")..self.page.."/"..self.page_num
else else
self.page_info.text = "no choices available" self.page_info.text = _("no choices available")
end end
-- FIXME: this is a dirty hack to clear previous menus -- FIXME: this is a dirty hack to clear previous menus

10
frontend/ui/widget/toggleswitch.lua
Unescape Escape View File

@ -16,13 +16,13 @@ ToggleSwitch = InputContainer:new{
function ToggleSwitch:init() function ToggleSwitch:init()
self.n_pos = #self.toggle self.n_pos = #self.toggle
self.position = nil self.position = nil
local label_font_face = "cfont" local label_font_face = "cfont"
local label_font_size = 16 local label_font_size = 16
self.toggle_frame = FrameContainer:new{background = 0, color = 7, radius = 7, bordersize = 1, padding = 2,} self.toggle_frame = FrameContainer:new{background = 0, color = 7, radius = 7, bordersize = 1, padding = 2,}
self.toggle_content = HorizontalGroup:new{} self.toggle_content = HorizontalGroup:new{}
for i=1,#self.toggle do for i=1,#self.toggle do
local label = ToggleLabel:new{ local label = ToggleLabel:new{
align = "center", align = "center",
@ -44,7 +44,7 @@ function ToggleSwitch:init()
} }
table.insert(self.toggle_content, button) table.insert(self.toggle_content, button)
end end
self.toggle_frame[1] = self.toggle_content self.toggle_frame[1] = self.toggle_content
self[1] = self.toggle_frame self[1] = self.toggle_frame
self.dimen = Geom:new(self.toggle_frame:getSize()) self.dimen = Geom:new(self.toggle_frame:getSize())
@ -55,7 +55,7 @@ function ToggleSwitch:init()
ges = "tap", ges = "tap",
range = self.dimen, range = self.dimen,
}, },
doc = "Toggle switch", doc = _("Toggle switch"),
}, },
} }
end end

4
frontend/ui/widget/touchmenu.lua
Unescape Escape View File

@ -23,7 +23,7 @@ function TouchMenuItem:init()
ges = "tap", ges = "tap",
range = self.dimen, range = self.dimen,
}, },
doc = "Select Menu Item", doc = _("Select Menu Item"),
}, },
} }
@ -325,7 +325,7 @@ function TouchMenu:updateItems()
table.insert(self.item_group, VerticalSpan:new{width = scaleByDPI(2)}) table.insert(self.item_group, VerticalSpan:new{width = scaleByDPI(2)})
table.insert(self.item_group, self.footer) table.insert(self.item_group, self.footer)
self.footer_page.text = "Page "..self.page.."/"..self.page_num self.footer_page.text = _("Page ")..self.page.."/"..self.page_num
self.time_info.text = os.date("%H:%M") self.time_info.text = os.date("%H:%M")
-- FIXME: this is a dirty hack to clear previous menus -- FIXME: this is a dirty hack to clear previous menus
-- refert to issue #664 -- refert to issue #664

Write Preview
Loading…
Cancel
Save