From ce0ab3690852cda36b34543fc49717f1958675d9 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Mon, 8 Apr 2013 15:29:23 +0800 Subject: [PATCH] add gettext to all widgets --- frontend/ui/widget/bbox.lua | 4 ++-- frontend/ui/widget/button.lua | 2 +- frontend/ui/widget/config.lua | 14 +++++++------- frontend/ui/widget/confirmbox.lua | 10 +++++----- frontend/ui/widget/infomessage.lua | 3 ++- frontend/ui/widget/menu.lua | 12 ++++++------ frontend/ui/widget/toggleswitch.lua | 10 +++++----- frontend/ui/widget/touchmenu.lua | 4 ++-- 8 files changed, 30 insertions(+), 29 deletions(-) diff --git a/frontend/ui/widget/bbox.lua b/frontend/ui/widget/bbox.lua index 571d1a30c..98a4e009e 100644 --- a/frontend/ui/widget/bbox.lua +++ b/frontend/ui/widget/bbox.lua @@ -178,12 +178,12 @@ function BBoxWidget:adjustScreenBBox(ges, relative) end end self.screen_bbox = { - x0 = math.round(upper_left.x), + x0 = math.round(upper_left.x), y0 = math.round(upper_left.y), x1 = math.round(bottom_right.x), y1 = math.round(bottom_right.y) } - + UIManager.repaint_all = true end diff --git a/frontend/ui/widget/button.lua b/frontend/ui/widget/button.lua index 767e50f79..5e08c5813 100644 --- a/frontend/ui/widget/button.lua +++ b/frontend/ui/widget/button.lua @@ -52,7 +52,7 @@ function Button:init() ges = "tap", range = self.dimen, }, - doc = "Tap Button", + doc = _("Tap Button"), }, } end diff --git a/frontend/ui/widget/config.lua b/frontend/ui/widget/config.lua index e7a2a52a6..415181c68 100644 --- a/frontend/ui/widget/config.lua +++ b/frontend/ui/widget/config.lua @@ -12,12 +12,12 @@ function MenuBarItem:init() ges = "tap", range = self.dimen, }, - doc = "Select Menu Item", + doc = _("Select Menu Item"), }, } else self.active_key_events = { - Select = { {"Press"}, doc = "chose selected item" }, + Select = { {"Press"}, doc = _("chose selected item") }, } end end @@ -51,12 +51,12 @@ function OptionTextItem:init() ges = "tap", range = self.dimen, }, - doc = "Select Option Item", + doc = _("Select Option Item"), }, } else self.active_key_events = { - Select = { {"Press"}, doc = "chose selected item" }, + Select = { {"Press"}, doc = _("chose selected item") }, } end end @@ -105,7 +105,7 @@ function OptionIconItem:init() ges = "tap", range = self.dimen, }, - doc = "Select Option Item", + doc = _("Select Option Item"), }, } end @@ -422,11 +422,11 @@ function ConfigDialog:init() } else -- 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" self.key_events.FocusRight = nil 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") end diff --git a/frontend/ui/widget/confirmbox.lua b/frontend/ui/widget/confirmbox.lua index c7bee880e..180f44d70 100644 --- a/frontend/ui/widget/confirmbox.lua +++ b/frontend/ui/widget/confirmbox.lua @@ -6,10 +6,10 @@ require "ui/widget/button" Widget that shows a message and OK/Cancel buttons ]] ConfirmBox = FocusManager:new{ - text = "no text", + text = _("no text"), width = nil, - ok_text = "OK", - cancel_text = "Cancel", + ok_text = _("OK"), + cancel_text = _("Cancel"), ok_callback = function() end, cancel_callback = function() end, } @@ -20,8 +20,8 @@ function ConfirmBox:init() self.width = Screen:getWidth() - 200 end -- build bottons - self.key_events.Close = { {{"Home","Back"}}, doc = "cancel" } - self.key_events.Select = { {{"Enter","Press"}}, doc = "chose selected option" } + self.key_events.Close = { {{"Home","Back"}}, doc = _("cancel") } + self.key_events.Select = { {{"Enter","Press"}}, doc = _("chose selected option") } local ok_button = Button:new{ text = self.ok_text, diff --git a/frontend/ui/widget/infomessage.lua b/frontend/ui/widget/infomessage.lua index d009be423..464004985 100644 --- a/frontend/ui/widget/infomessage.lua +++ b/frontend/ui/widget/infomessage.lua @@ -14,7 +14,8 @@ InfoMessage = InputContainer:new{ function InfoMessage:init() if Device:hasKeyboard() then key_events = { - AnyKeyPressed = { { Input.group.Any }, seqtext = "any key", doc = "close dialog" } + AnyKeyPressed = { { Input.group.Any }, + seqtext = "any key", doc = _("close dialog") } } else self.ges_events.TapClose = { diff --git a/frontend/ui/widget/menu.lua b/frontend/ui/widget/menu.lua index 8130a38c6..81b8eeb14 100644 --- a/frontend/ui/widget/menu.lua +++ b/frontend/ui/widget/menu.lua @@ -346,12 +346,12 @@ function Menu:init() } else -- set up keyboard events - self.key_events.Close = { {"Back"}, doc = "close menu" } + self.key_events.Close = { {"Back"}, doc = _("close menu") } 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 = { - {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. self.key_events.FocusRight = nil @@ -360,7 +360,7 @@ function Menu:init() self.key_events.SelectByShortCut = { {self.item_shortcuts} } end self.key_events.Select = { - {"Press"}, doc = "select current menu item" + {"Press"}, doc = _("select current menu item") } end @@ -428,9 +428,9 @@ function Menu:updateItems(select_number) self.item_group[select_number]:onFocus() end -- update page information - self.page_info.text = "page "..self.page.."/"..self.page_num + self.page_info.text = _("page ")..self.page.."/"..self.page_num else - self.page_info.text = "no choices available" + self.page_info.text = _("no choices available") end -- FIXME: this is a dirty hack to clear previous menus diff --git a/frontend/ui/widget/toggleswitch.lua b/frontend/ui/widget/toggleswitch.lua index f6cb431b1..3db107b98 100644 --- a/frontend/ui/widget/toggleswitch.lua +++ b/frontend/ui/widget/toggleswitch.lua @@ -16,13 +16,13 @@ ToggleSwitch = InputContainer:new{ function ToggleSwitch:init() self.n_pos = #self.toggle self.position = nil - + local label_font_face = "cfont" local label_font_size = 16 - + self.toggle_frame = FrameContainer:new{background = 0, color = 7, radius = 7, bordersize = 1, padding = 2,} self.toggle_content = HorizontalGroup:new{} - + for i=1,#self.toggle do local label = ToggleLabel:new{ align = "center", @@ -44,7 +44,7 @@ function ToggleSwitch:init() } table.insert(self.toggle_content, button) end - + self.toggle_frame[1] = self.toggle_content self[1] = self.toggle_frame self.dimen = Geom:new(self.toggle_frame:getSize()) @@ -55,7 +55,7 @@ function ToggleSwitch:init() ges = "tap", range = self.dimen, }, - doc = "Toggle switch", + doc = _("Toggle switch"), }, } end diff --git a/frontend/ui/widget/touchmenu.lua b/frontend/ui/widget/touchmenu.lua index 71b87b5d4..91169ccda 100644 --- a/frontend/ui/widget/touchmenu.lua +++ b/frontend/ui/widget/touchmenu.lua @@ -23,7 +23,7 @@ function TouchMenuItem:init() ges = "tap", 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, 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") -- FIXME: this is a dirty hack to clear previous menus -- refert to issue #664