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

Merge pull request #39 from houqp/houqp-master

Browse Source 
add more gettext
pull/40/merge
Huang Xin 11 years ago
parent ed9a6f8a80 bdd884b849
commit f55c0706be
23 changed files with 683 additions and 150 deletions
Show Stats Download Patch File Download Diff File

12
frontend/document/credocument.lua
Unescape Escape View File

@ -7,7 +7,7 @@ CreOptions = {
options = {
{
name = "screen_mode",
name_text = "Screen Mode",
name_text = _("Screen Mode"),
toggle = {"portrait", "landscape"},
args = {"portrait", "landscape"},
default_arg = "portrait",
@ -21,7 +21,7 @@ CreOptions = {
options = {
{
name = "line_spacing",
name_text = "Line Spacing",
name_text = _("Line Spacing"),
item_text = {"decrease", "increase"},
args = {"decrease", "increase"},
default_arg = nil,
@ -50,7 +50,7 @@ CreOptions = {
options = {
{
name = "font_weight",
name_text = "Font weight",
name_text = _("Font weight"),
item_text = {"toggle bolder"},
-- args is indeed not used, we put here just to keep the
-- UI happy.
@ -60,7 +60,7 @@ CreOptions = {
},
{
name = "font_gamma",
name_text = "Gamma",
name_text = _("Gamma"),
item_text = {"decrease", "increase"},
args = {"decrease", "increase"},
default_arg = nil,
@ -73,7 +73,7 @@ CreOptions = {
options = {
{
name = "view_mode",
name_text = "View mode",
name_text = _("View mode"),
toggle = {"scroll", "page"},
values = {1, 0},
default_value = 0,
@ -83,7 +83,7 @@ CreOptions = {
},
{
name = "embedded_css",
name_text = "Embedded style",
name_text = _("Embedded style"),
toggle = {"on", "off"},
values = {1, 0},
default_value = 0,

46
frontend/document/koptinterface.lua
Unescape Escape View File

@ -11,7 +11,7 @@ KoptOptions = {
options = {
{
name = "screen_mode",
name_text = "Screen Mode",
name_text = _("Screen Mode"),
toggle = {"portrait", "landscape"},
args = {"portrait", "landscape"},
default_arg = "portrait",
@ -25,7 +25,7 @@ KoptOptions = {
options = {
{
name = "trim_page",
name_text = "Page Crop",
name_text = _("Page Crop"),
toggle = {"auto", "manual"},
alternate = false,
values = {1, 0},
@ -40,7 +40,7 @@ KoptOptions = {
options = {
{
name = "full_screen",
name_text = "Full Screen",
name_text = _("Full Screen"),
toggle = {"on", "off"},
values = {1, 0},
default_value = 0,
@ -49,7 +49,7 @@ KoptOptions = {
},
{
name = "page_scroll",
name_text = "Scroll Mode",
name_text = _("Scroll Mode"),
toggle = {"on", "off"},
values = {1, 0},
default_value = 1,
@ -58,21 +58,21 @@ KoptOptions = {
},
{
name = "page_margin",
name_text = "Page Margin",
name_text = _("Page Margin"),
toggle = {"small", "medium", "large"},
values = {0.06, 0.10, 0.14},
default_value = 0.10,
},
{
name = "line_spacing",
name_text = "Line Spacing",
name_text = _("Line Spacing"),
toggle = {"small", "medium", "large"},
values = {1.0, 1.2, 1.4},
default_value = 1.2,
},
{
name = "max_columns",
name_text = "Columns",
name_text = _("Columns"),
item_icons = {
"resources/icons/appbar.column.one.png",
"resources/icons/appbar.column.two.png",
@ -83,7 +83,7 @@ KoptOptions = {
},
{
name = "justification",
name_text = "Text Align",
name_text = _("Text Align"),
item_icons = {
"resources/icons/appbar.align.auto.png",
"resources/icons/appbar.align.left.png",
@ -111,7 +111,7 @@ KoptOptions = {
},
{
name = "font_fine_tune",
name_text = "Fine Tuning",
name_text = _("Fine Tuning"),
toggle = {"decrease","increase"},
values = {-0.05, 0.05},
default_value = 0.05,
@ -127,7 +127,7 @@ KoptOptions = {
options = {
{
name = "contrast",
name_text = "Contrast",
name_text = _("Contrast"),
name_align_right = 0.2,
item_text = {"lightest", "lighter", "default", "darker", "darkest"},
item_font_size = 18,
@ -144,12 +144,12 @@ KoptOptions = {
options = {
{
name = "text_wrap",
name_text = "Reflow",
name_text = _("Reflow"),
toggle = {"on", "off"},
values = {1, 0},
default_value = 0,
events = {
{
{
event = "RedrawCurrentPage",
},
{
@ -162,42 +162,42 @@ KoptOptions = {
},
{
name="screen_rotation",
name_text = "Vertical Text",
name_text = _("Vertical Text"),
toggle = {"on", "off"},
values = {270, 0},
default_value = 0,
},
{
name = "word_spacing",
name_text = "Word Gap",
name_text = _("Word Gap"),
toggle = {"small", "medium", "large"},
values = {0.05, 0.15, 0.375},
default_value = 0.15,
},
{
name = "defect_size",
name_text = "Defect Size",
name_text = _("Defect Size"),
toggle = {"small", "medium", "large"},
values = {0.5, 1.0, 2.0},
default_value = 1.0,
},
{
name = "quality",
name_text = "Render Quality",
name_text = _("Render Quality"),
toggle = {"low", "default", "high"},
values={0.5, 0.8, 1.0},
default_value = 0.8,
},
{
name = "auto_straighten",
name_text = "Auto Straighten",
name_text = _("Auto Straighten"),
toggle = {"0 deg", "5 deg", "10 deg"},
values = {0, 5, 10},
default_value = 0,
},
{
name = "detect_indent",
name_text = "Indentation",
name_text = _("Indentation"),
toggle = {"On", "Off"},
values = {1, 0},
default_value = 1,
@ -217,7 +217,7 @@ KoptInterface = {
}
function KoptInterface:waitForContext(kc)
-- if koptcontext is being processed in background thread
-- if koptcontext is being processed in background thread
-- the isPreCache will return 1.
while kc and kc:isPreCache() == 1 do
DEBUG("waiting for background rendering")
@ -267,7 +267,7 @@ function KoptInterface:setTrimPage(doc, pageno)
--DEBUG("original page dimens", page_dimens)
local orig_bbox = doc:getUsedBBox(pageno)
--DEBUG("original bbox", orig_bbox)
if orig_bbox.x1 - orig_bbox.x0 < page_dimens.w
if orig_bbox.x1 - orig_bbox.x0 < page_dimens.w
or orig_bbox.y1 - orig_bbox.y0 < page_dimens.h then
doc.configurable.trim_page = 0
--DEBUG("Set manual crop in koptengine")
@ -336,7 +336,7 @@ function KoptInterface:makeCache(doc, pageno, context_hash)
local cached = Cache:check(kc_hash)
if cached then
local fullwidth, fullheight = self:getReflowedDim(cached.kctx)
-- prepare cache item with contained blitbuffer
-- prepare cache item with contained blitbuffer
local tile = CacheItem:new{
size = fullwidth * fullheight / 2 + 64, -- estimation
excerpt = Geom:new{ w = fullwidth, h = fullheight },
@ -377,7 +377,7 @@ function KoptInterface:renderPage(doc, pageno, rect, zoom, rotation, render_mode
hash = "renderpg|"..doc.file.."|"..pageno.."|"..doc.configurable:hash("|").."|"..tostring(rect)
size = rect
end
local cached = Cache:check(hash)
if cached then
return cached
@ -412,7 +412,7 @@ function KoptInterface:drawPage(doc, target, x, y, rect, pageno, zoom, rotation,
local tile = self:renderPage(doc, pageno, rect, zoom, rotation, render_mode)
--DEBUG("now painting", tile, rect)
target:blitFrom(tile.bb,
x, y,
x, y,
rect.x - tile.excerpt.x,
rect.y - tile.excerpt.y,
rect.w, rect.h)

4
frontend/ui/reader/readerbookmark.lua
Unescape Escape View File

@ -1,7 +1,7 @@
require "ui/widget/notification"
ReaderBookmark = InputContainer:new{
bm_menu_title = "Bookmarks",
bm_menu_title = _("Bookmarks"),
bookmarks = nil,
}
@ -10,7 +10,7 @@ function ReaderBookmark:init()
self.key_events = {
ShowToc = {
{ "B" },
doc = "show bookmarks" },
doc = _("show bookmarks") },
}
end
self.ui.menu:registerToMainMenu(self)

2
frontend/ui/reader/readerconfig.lua
Unescape Escape View File

@ -50,7 +50,7 @@ ReaderConfig = InputContainer:new{}
function ReaderConfig:init()
if Device:hasKeyboard() then
self.key_events = {
ShowConfigMenu = { { "AA" }, doc = "show config dialog" },
ShowConfigMenu = { { "AA" }, doc = _("show config dialog") },
}
end
if Device:isTouchDevice() then

7
frontend/ui/reader/readercropping.lua
Unescape Escape View File

@ -64,7 +64,7 @@ function ReaderCropping:onPageCrop(mode)
-- backup original page scroll
self.orig_page_scroll = self.view.page_scroll
self.view.page_scroll = false
-- backup and disable original hinting state
-- backup and disable original hinting state
self.ui:handleEvent(Event:new("DisableHinting"))
-- backup original reflow mode as cropping use non-reflow mode
self.orig_reflow_mode = self.document.configurable.text_wrap
@ -76,7 +76,7 @@ function ReaderCropping:onPageCrop(mode)
else
self.ui:handleEvent(Event:new("SetZoomMode", "page", "cropping"))
end
self.ui:handleEvent(Event:new("SetDimensions",
self.ui:handleEvent(Event:new("SetDimensions",
Geom:new{w = Screen:getWidth(), h = Screen:getHeight()*11/12})
)
self.bbox_widget = BBoxWidget:new{
@ -132,7 +132,8 @@ function ReaderCropping:exitPageCrop(confirmed)
else
if confirmed then
-- if original zoom mode is not "content", set zoom mode to "content"
self.ui:handleEvent(Event:new("SetZoomMode", self.orig_zoom_mode:find("content") and self.orig_zoom_mode or "content"))
self.ui:handleEvent(Event:new("SetZoomMode",
self.orig_zoom_mode:find("content") and self.orig_zoom_mode or "content"))
self.ui:handleEvent(Event:new("InitScrollPageStates"))
else
self.ui:handleEvent(Event:new("SetZoomMode", self.orig_zoom_mode))

35
frontend/ui/reader/readerfont.lua
Unescape Escape View File

@ -2,7 +2,7 @@ ReaderFont = InputContainer:new{
font_face = nil,
font_size = nil,
line_space_percent = nil,
font_menu_title = "Change font",
font_menu_title = _("Change font"),
face_table = nil,
-- default gamma from crengine's lvfntman.cpp
gamma_index = nil,
@ -12,22 +12,22 @@ function ReaderFont:init()
if not Device:hasNoKeyboard() then
-- add shortcut for keyboard
self.key_events = {
ShowFontMenu = { {"F"}, doc = "show font menu" },
ShowFontMenu = { {"F"}, doc = _("show font menu") },
IncreaseSize = {
{ "Shift", Input.group.PgFwd },
doc = "increase font size",
doc = _("increase font size"),
event = "ChangeSize", args = "increase" },
DecreaseSize = {
{ "Shift", Input.group.PgBack },
doc = "decrease font size",
doc = _("decrease font size"),
event = "ChangeSize", args = "decrease" },
IncreaseLineSpace = {
{ "Alt", Input.group.PgFwd },
doc = "increase line space",
doc = _("increase line space"),
event = "ChangeLineSpace", args = "increase" },
DecreaseLineSpace = {
{ "Alt", Input.group.PgBack },
doc = "decrease line space",
doc = _("decrease line space"),
event = "ChangeLineSpace", args = "decrease" },
}
end
@ -117,12 +117,19 @@ end
--]]
function ReaderFont:onChangeSize(direction)
local delta = 1
local msg = ""
if direction == "decrease" then
delta = -1
msg = _("Decrease font size to ")
else
msg = _("Increase font size to ")
end
self.font_size = self.font_size + delta
UIManager:show(Notification:new{
text = direction.." font size to "..self.font_size,
text = msg..self.font_size,
timeout = 1,
})
self.ui.document:zoomFont(delta)
@ -138,7 +145,7 @@ function ReaderFont:onSetFontSize(new_size)
self.font_size = new_size
UIManager:show(Notification:new{
text = "Set font size to "..self.font_size,
text = _("Set font size to ")..self.font_size,
timeout = 1,
})
self.ui.document:setFontSize(new_size)
@ -148,16 +155,19 @@ function ReaderFont:onSetFontSize(new_size)
end
function ReaderFont:onChangeLineSpace(direction)
local msg = ""
if direction == "decrease" then
self.line_space_percent = self.line_space_percent - 10
-- NuPogodi, 15.05.12: reduce lowest space_percent to 80
self.line_space_percent = math.max(self.line_space_percent, 80)
msg = _("Decrease line space to ")
else
self.line_space_percent = self.line_space_percent + 10
self.line_space_percent = math.min(self.line_space_percent, 200)
msg = _("Increase line space to ")
end
UIManager:show(Notification:new{
text = direction.." line space to "..self.line_space_percent.."%",
text = msg..self.line_space_percent.."%",
timeout = 1,
})
self.ui.document:setInterlineSpacePercent(self.line_space_percent)
@ -173,14 +183,17 @@ function ReaderFont:onToggleFontBolder()
end
function ReaderFont:onChangeFontGamma(direction)
local msg = ""
if direction == "increase" then
cre.setGammaIndex(self.gamma_index+2)
msg = _("Increase gamma to ")
elseif direction == "decrease" then
cre.setGammaIndex(self.gamma_index-2)
msg = _("Decrease gamma to ")
end
self.gamma_index = cre.getGammaIndex()
UIManager:show(Notification:new{
text = direction.." gamma to "..self.gamma_index,
text = msg..self.gamma_index,
timeout = 1
})
self.ui:handleEvent(Event:new("RedrawCurrentView"))
@ -199,7 +212,7 @@ function ReaderFont:setFont(face)
if face and self.font_face ~= face then
self.font_face = face
UIManager:show(Notification:new{
text = "redrawing with font "..face,
text = _("Redrawing with font ")..face,
timeout = 1,
})

2
frontend/ui/reader/readermenu.lua
Unescape Escape View File

@ -31,7 +31,7 @@ function ReaderMenu:init()
if Device:hasKeyboard() then
self.key_events = {
ShowMenu = { { _("Menu") }, doc = _("show menu") },
ShowMenu = { { "Menu" }, doc = _("show menu") },
}
end
end

8
frontend/ui/reader/readerpanning.lua
Unescape Escape View File

@ -14,16 +14,16 @@ function ReaderPanning:init()
self.key_events = {
-- these will all generate the same event, just with different arguments
MoveUp = {
{ "Up" }, doc = "move visible area up",
{ "Up" }, doc = _("move visible area up"),
event = "Panning", args = {0, -1} },
MoveDown = {
{ "Down" }, doc = "move visible area down",
{ "Down" }, doc = _("move visible area down"),
event = "Panning", args = {0, 1} },
MoveLeft = {
{ "Left" }, doc = "move visible area left",
{ "Left" }, doc = _("move visible area left"),
event = "Panning", args = {-1, 0} },
MoveRight = {
{ "Right" }, doc = "move visible area right",
{ "Right" }, doc = _("move visible area right"),
event = "Panning", args = {1, 0} },
}
end

50
frontend/ui/reader/readerrolling.lua
Unescape Escape View File

@ -18,44 +18,44 @@ function ReaderRolling:init()
self.key_events = {
GotoNextView = {
{ Input.group.PgFwd },
doc = "go to next view",
doc = _("go to next view"),
event = "GotoViewRel", args = 1
},
GotoPrevView = {
{ Input.group.PgBack },
doc = "go to previous view",
doc = _("go to previous view"),
event = "GotoViewRel", args = -1
},
MoveUp = {
{ "Up" },
doc = "move view up",
doc = _("move view up"),
event = "Panning", args = {0, -1}
},
MoveDown = {
{ "Down" },
doc = "move view down",
doc = _("move view down"),
event = "Panning", args = {0, 1}
},
GotoFirst = {
{"1"}, doc = "go to start", event = "GotoPercent", args = 0},
Goto11 = {
{"2"}, doc = "go to 11%", event = "GotoPercent", args = 11},
Goto22 = {
{"3"}, doc = "go to 22%", event = "GotoPercent", args = 22},
Goto33 = {
{"4"}, doc = "go to 33%", event = "GotoPercent", args = 33},
Goto44 = {
{"5"}, doc = "go to 44%", event = "GotoPercent", args = 44},
Goto55 = {
{"6"}, doc = "go to 55%", event = "GotoPercent", args = 55},
Goto66 = {
{"7"}, doc = "go to 66%", event = "GotoPercent", args = 66},
Goto77 = {
{"8"}, doc = "go to 77%", event = "GotoPercent", args = 77},
Goto88 = {
{"9"}, doc = "go to 88%", event = "GotoPercent", args = 88},
GotoLast = {
{"0"}, doc = "go to end", event = "GotoPercent", args = 100},
GotoFirst = {
{"1"}, doc = _("go to start"), event = "GotoPercent", args = 0},
Goto11 = {
{"2"}, doc = _("go to 11%"), event = "GotoPercent", args = 11},
Goto22 = {
{"3"}, doc = _("go to 22%"), event = "GotoPercent", args = 22},
Goto33 = {
{"4"}, doc = _("go to 33%"), event = "GotoPercent", args = 33},
Goto44 = {
{"5"}, doc = _("go to 44%"), event = "GotoPercent", args = 44},
Goto55 = {
{"6"}, doc = _("go to 55%"), event = "GotoPercent", args = 55},
Goto66 = {
{"7"}, doc = _("go to 66%"), event = "GotoPercent", args = 66},
Goto77 = {
{"8"}, doc = _("go to 77%"), event = "GotoPercent", args = 77},
Goto88 = {
{"9"}, doc = _("go to 88%"), event = "GotoPercent", args = 88},
GotoLast = {
{"0"}, doc = _("go to end"), event = "GotoPercent", args = 100},
}
end
@ -82,7 +82,7 @@ function ReaderRolling:initGesListener()
GestureRange:new{
ges = "tap",
range = Geom:new{
x = 0,
x = 0,
y = Screen:getHeight()/4,
w = Screen:getWidth()/4,
h = 5*Screen:getHeight()/8,

10
frontend/ui/reader/readerrotation.lua
Unescape Escape View File

@ -7,8 +7,14 @@ function ReaderRotation:init()
if Device:hasKeyboard() then
self.key_events = {
-- these will all generate the same event, just with different arguments
RotateLeft = { {"J"}, doc = "rotate left by 90 degrees", event = "Rotate", args = -90 },
RotateRight = { {"K"}, doc = "rotate right by 90 degrees", event = "Rotate", args = 90 },
RotateLeft = {
{"J"},
doc = _("rotate left by 90 degrees"),
event = "Rotate", args = -90 },
RotateRight = {
{"K"},
doc = _("rotate right by 90 degrees"),
event = "Rotate", args = 90 },
}
end
if Device:isTouchDevice() then

6
frontend/ui/reader/readertypeset.lua
Unescape Escape View File

@ -1,5 +1,5 @@
ReaderTypeset = InputContainer:new{
css_menu_title = "Set render style",
css_menu_title = _("Set render style"),
css = nil,
internal_css = true,
}
@ -40,13 +40,13 @@ end
function ReaderTypeset:genStyleSheetMenu()
local file_list = {
{
text = "clear all external styles",
text = _("clear all external styles"),
callback = function()
self:setStyleSheet(nil)
end
},
{
text = "Auto",
text = _("Auto"),
callback = function()
self:setStyleSheet(self.ui.document.default_css)
end

1
frontend/ui/reader/readerview.lua
Unescape Escape View File

@ -3,7 +3,6 @@ require "ui/reader/readerfooter"
require "ui/reader/readerdogear"
ReaderView = OverlapGroup:new{
_name = "ReaderView",
document = nil,
-- single page state

30
frontend/ui/reader/readerzooming.lua
Unescape Escape View File

@ -12,42 +12,42 @@ function ReaderZooming:init()
self.key_events = {
ZoomIn = {
{ "Shift", Input.group.PgFwd },
doc = "zoom in",
doc = _("zoom in"),
event = "Zoom", args = "in"
},
ZoomOut = {
{ "Shift", Input.group.PgBack },
doc = "zoom out",
doc = _("zoom out"),
event = "Zoom", args = "out"
},
ZoomToFitPage = {
{ "A" },
doc = "zoom to fit page",
doc = _("zoom to fit page"),
event = "SetZoomMode", args = "page"
},
ZoomToFitContent = {
{ "Shift", "A" },
doc = "zoom to fit content",
doc = _("zoom to fit content"),
event = "SetZoomMode", args = "content"
},
ZoomToFitPageWidth = {
{ "S" },
doc = "zoom to fit page width",
doc = _("zoom to fit page width"),
event = "SetZoomMode", args = "pagewidth"
},
ZoomToFitContentWidth = {
{ "Shift", "S" },
doc = "zoom to fit content width",
doc = _("zoom to fit content width"),
event = "SetZoomMode", args = "contentwidth"
},
ZoomToFitPageHeight = {
{ "D" },
doc = "zoom to fit page height",
doc = _("zoom to fit page height"),
event = "SetZoomMode", args = "pageheight"
},
ZoomToFitContentHeight = {
{ "Shift", "D" },
doc = "zoom to fit content height",
doc = _("zoom to fit content height"),
event = "SetZoomMode", args = "contentheight"
},
}
@ -232,30 +232,30 @@ end
function ReaderZooming:addToMainMenu(tab_item_table)
if self.ui.document.info.has_pages then
table.insert(tab_item_table.typeset, {
text = "Switch zoom mode",
text = _("Switch zoom mode"),
sub_item_table = {
{
text = "Zoom to fit content width",
text = _("Zoom to fit content width"),
callback = self:genSetZoomModeCallBack("contentwidth")
},
{
text = "Zoom to fit content height",
text = _("Zoom to fit content height"),
callback = self:genSetZoomModeCallBack("contentheight")
},
{
text = "Zoom to fit page width",
text = _("Zoom to fit page width"),
callback = self:genSetZoomModeCallBack("pagewidth")
},
{
text = "Zoom to fit page height",
text = _("Zoom to fit page height"),
callback = self:genSetZoomModeCallBack("pageheight")
},
{
text = "Zoom to fit content",
text = _("Zoom to fit content"),
callback = self:genSetZoomModeCallBack("content")
},
{
text = "Zoom to fit page",
text = _("Zoom to fit page"),
callback = self:genSetZoomModeCallBack("page")
},
}

9
frontend/ui/readerui.lua
Unescape Escape View File

@ -24,7 +24,8 @@ it works using data gathered from a document interface
ReaderUI = InputContainer:new{
key_events = {
Close = { {"Home"}, doc = "close document", event = "Close" },
Close = { { "Home" },
doc = _("close document"), event = "Close" },
},
active_widgets = {},
@ -52,8 +53,8 @@ function ReaderUI:init()
end
if Device:hasKeyboard() then
self.key_events.Back = {
{ "Back" }, doc = "close document",
self.key_events.Back = {
{ "Back" }, doc = _("close document"),
event = "Close" }
end
@ -102,7 +103,7 @@ function ReaderUI:init()
if self.document.info.has_pages then
-- for page specific controller
-- if needed, insert a paging container
local pager = ReaderPaging:new{
dialog = self.dialog,

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

@ -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

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

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

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

@ -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

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
]]
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,

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

@ -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 = {

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

@ -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

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

@ -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

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

@ -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

552
l10n/templates/koreader.pot
Unescape Escape View File

@ -6,13 +6,13 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: https://github.com/koreader/koreader-base/issues\n"
"POT-Creation-Date: 2013-04-07 18:47+0000\n"
"POT-Creation-Date: 2013-04-08 07:38+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: frontend/ui/reader/readerconfig.lua:117
#: frontend/ui/reader/readerconfig.lua:114
msgid ""
")\n"
"end\n"
@ -21,21 +21,111 @@ msgid ""
" self.configurable:saveSettings(self.ui.doc_settings, self.options.prefix.."
msgstr ""
#: reader.lua:196
#: reader.lua:197
msgid ""
"-d start in debug mode"
msgstr ""
#: reader.lua:197
#: reader.lua:198
msgid ""
"-h show this usage help"
msgstr ""
#: frontend/ui/reader/readertypeset.lua:49
msgid ""
"Auto"
msgstr ""
#: frontend/document/koptinterface.lua:193
msgid ""
"Auto Straighten"
msgstr ""
#: frontend/ui/inputevent.lua:317
msgid ""
"Auto-detected Kindle 2"
msgstr ""
#: frontend/ui/inputevent.lua:313
msgid ""
"Auto-detected Kindle 3"
msgstr ""
#: frontend/ui/inputevent.lua:309
msgid ""
"Auto-detected Kindle 4"
msgstr ""
#: frontend/ui/inputevent.lua:315
msgid ""
"Auto-detected Kindle DXG"
msgstr ""
#: frontend/ui/inputevent.lua:287
msgid ""
"Auto-detected Kindle PaperWhite"
msgstr ""
#: frontend/ui/inputevent.lua:307
msgid ""
"Auto-detected Kindle Touch"
msgstr ""
#: frontend/ui/reader/readerbookmark.lua:4
msgid ""
"Bookmarks"
msgstr ""
#: frontend/ui/widget/confirmbox.lua:12
msgid ""
"Cancel"
msgstr ""
#: frontend/ui/reader/readerfont.lua:5
msgid ""
"Change font"
msgstr ""
#: frontend/document/koptinterface.lua:75
msgid ""
"Columns"
msgstr ""
#: frontend/document/koptinterface.lua:130
msgid ""
"Contrast"
msgstr ""
#: frontend/ui/reader/readerfont.lua:124
msgid ""
"Decrease font size to "
msgstr ""
#: frontend/ui/reader/readerfont.lua:192
msgid ""
"Decrease gamma to "
msgstr ""
#: frontend/ui/reader/readerfont.lua:163
msgid ""
"Decrease line space to "
msgstr ""
#: frontend/document/koptinterface.lua:179
msgid ""
"Defect Size"
msgstr ""
#: frontend/ui/reader/readermenu.lua:106
msgid ""
"Document menu"
msgstr ""
#: frontend/document/credocument.lua:86
msgid ""
"Embedded style"
msgstr ""
#: reader.lua:87
msgid ""
"Exit"
@ -46,14 +136,29 @@ msgid ""
"FileManager"
msgstr ""
#: frontend/ui/reader/readermenu.lua:61
#: frontend/document/koptinterface.lua:114
msgid ""
"Help"
"Fine Tuning"
msgstr ""
#: reader.lua:17
#: frontend/document/credocument.lua:53
msgid ""
"Font weight"
msgstr ""
#: frontend/document/koptinterface.lua:43
msgid ""
"Full Screen"
msgstr ""
#: frontend/document/credocument.lua:63
msgid ""
"Home"
"Gamma"
msgstr ""
#: frontend/ui/reader/readermenu.lua:61
msgid ""
"Help"
msgstr ""
#: reader.lua:105
@ -61,16 +166,36 @@ msgid ""
"Home menu"
msgstr ""
#: reader.lua:202
#: reader.lua:203
msgid ""
"If you don't pass any path, the last viewed document will be opened"
msgstr ""
#: reader.lua:199
#: reader.lua:200
msgid ""
"If you give the name of a directory instead of a file path, a file"
msgstr ""
#: frontend/ui/reader/readerfont.lua:126
msgid ""
"Increase font size to "
msgstr ""
#: frontend/ui/reader/readerfont.lua:189
msgid ""
"Increase gamma to "
msgstr ""
#: frontend/ui/reader/readerfont.lua:167
msgid ""
"Increase line space to "
msgstr ""
#: frontend/document/koptinterface.lua:200
msgid ""
"Indentation"
msgstr ""
#: frontend/ui/reader/readermenu.lua:64
msgid ""
"Just kidding, this page is not implemented yet."
@ -86,9 +211,10 @@ msgid ""
"Last documents"
msgstr ""
#: frontend/ui/reader/readermenu.lua:34
#: frontend/document/credocument.lua:24
#: frontend/document/koptinterface.lua:68
msgid ""
"Menu"
"Line Spacing"
msgstr ""
#: reader.lua:126
@ -96,54 +222,440 @@ msgid ""
"No reader engine for this file"
msgstr ""
#: reader.lua:194
#: frontend/ui/inputevent.lua:319
msgid ""
"Not supported device model!"
msgstr ""
#: frontend/ui/widget/confirmbox.lua:11
msgid ""
"OK"
msgstr ""
#: frontend/ui/widget/touchmenu.lua:328
msgid ""
"Page "
msgstr ""
#: frontend/document/koptinterface.lua:28
msgid ""
"Page Crop"
msgstr ""
#: frontend/document/koptinterface.lua:61
msgid ""
"Page Margin"
msgstr ""
#: reader.lua:195
msgid ""
"Read all the books on your E-Ink reader"
msgstr ""
#: reader.lua:205
#: frontend/ui/reader/readerfont.lua:215
msgid ""
"Redrawing with font "
msgstr ""
#: frontend/document/koptinterface.lua:147
msgid ""
"Reflow"
msgstr ""
#: frontend/document/koptinterface.lua:186
msgid ""
"Render Quality"
msgstr ""
#: frontend/document/credocument.lua:10
#: frontend/document/koptinterface.lua:14
msgid ""
"Screen Mode"
msgstr ""
#: frontend/document/koptinterface.lua:52
msgid ""
"Scroll Mode"
msgstr ""
#: reader.lua:206
msgid ""
"See http://github.com/koreader/kindlepdfviewer for more info."
msgstr ""
#: frontend/ui/widget/config.lua:15
#: frontend/ui/widget/touchmenu.lua:26
msgid ""
"Select Menu Item"
msgstr ""
#: frontend/ui/widget/config.lua:54
#: frontend/ui/widget/config.lua:108
msgid ""
"Select Option Item"
msgstr ""
#: frontend/ui/reader/readerfont.lua:148
msgid ""
"Set font size to "
msgstr ""
#: frontend/ui/reader/readertypeset.lua:2
msgid ""
"Set render style"
msgstr ""
#: reader.lua:17
msgid ""
"Show Home Menu"
msgstr ""
#: frontend/ui/reader/readertoc.lua:87
#: frontend/ui/reader/readerzooming.lua:235
msgid ""
"Switch zoom mode"
msgstr ""
#: frontend/ui/reader/readertoc.lua:85
msgid ""
"Table of Contents"
msgstr ""
#: frontend/ui/reader/readertoc.lua:5
#: frontend/ui/reader/readertoc.lua:3
msgid ""
"Table of contents"
msgstr ""
#: reader.lua:204
#: frontend/ui/widget/button.lua:55
msgid ""
"Tap Button"
msgstr ""
#: frontend/document/koptinterface.lua:86
msgid ""
"Text Align"
msgstr ""
#: reader.lua:205
msgid ""
"This software is licensed under the GPLv3."
msgstr ""
#: reader.lua:200
#: frontend/ui/widget/toggleswitch.lua:58
msgid ""
"Toggle switch"
msgstr ""
#: frontend/document/koptinterface.lua:165
msgid ""
"Vertical Text"
msgstr ""
#: frontend/document/credocument.lua:76
msgid ""
"View mode"
msgstr ""
#: frontend/document/koptinterface.lua:172
msgid ""
"Word Gap"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:254
msgid ""
"Zoom to fit content"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:242
msgid ""
"Zoom to fit content height"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:238
msgid ""
"Zoom to fit content width"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:258
msgid ""
"Zoom to fit page"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:250
msgid ""
"Zoom to fit page height"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:246
msgid ""
"Zoom to fit page width"
msgstr ""
#: frontend/ui/widget/confirmbox.lua:23
msgid ""
"cancel"
msgstr ""
#: reader.lua:201
msgid ""
"chooser will show up and let you select a file"
msgstr ""
#: frontend/ui/reader/readertoc.lua:13
#: frontend/ui/widget/config.lua:20
#: frontend/ui/widget/config.lua:59
msgid ""
"chose selected item"
msgstr ""
#: frontend/ui/widget/confirmbox.lua:24
msgid ""
"chose selected option"
msgstr ""
#: frontend/ui/reader/readertypeset.lua:43
msgid ""
"clear all external styles"
msgstr ""
#: frontend/ui/widget/config.lua:425
msgid ""
"close config menu"
msgstr ""
#: frontend/ui/widget/infomessage.lua:18
msgid ""
"close dialog"
msgstr ""
#: frontend/ui/readerui.lua:28
#: frontend/ui/readerui.lua:57
msgid ""
"close document"
msgstr ""
#: frontend/ui/widget/menu.lua:349
msgid ""
"close menu"
msgstr ""
#: frontend/ui/reader/readerfont.lua:22
msgid ""
"decrease font size"
msgstr ""
#: frontend/ui/reader/readerfont.lua:30
msgid ""
"decrease line space"
msgstr ""
#: frontend/ui/reader/readerrolling.lua:42
msgid ""
"go to 11%"
msgstr ""
#: frontend/ui/reader/readerrolling.lua:44
msgid ""
"go to 22%"
msgstr ""
#: frontend/ui/reader/readerrolling.lua:46
msgid ""
"go to 33%"
msgstr ""
#: frontend/ui/reader/readerrolling.lua:48
msgid ""
"go to 44%"
msgstr ""
#: frontend/ui/reader/readerrolling.lua:50
msgid ""
"go to 55%"
msgstr ""
#: frontend/ui/reader/readerrolling.lua:52
msgid ""
"go to 66%"
msgstr ""
#: frontend/ui/reader/readerrolling.lua:54
msgid ""
"go to 77%"
msgstr ""
#: frontend/ui/reader/readerrolling.lua:56
msgid ""
"go to 88%"
msgstr ""
#: frontend/ui/reader/readerrolling.lua:58
msgid ""
"go to end"
msgstr ""
#: frontend/ui/reader/readerrolling.lua:21
msgid ""
"go to next view"
msgstr ""
#: frontend/ui/reader/readerrolling.lua:26
msgid ""
"go to previous view"
msgstr ""
#: frontend/ui/reader/readerrolling.lua:40
msgid ""
"go to start"
msgstr ""
#: frontend/ui/widget/menu.lua:351
msgid ""
"goto next page of the menu"
msgstr ""
#: frontend/ui/widget/menu.lua:354
msgid ""
"goto previous page of the menu"
msgstr ""
#: frontend/ui/reader/readerfont.lua:18
msgid ""
"increase font size"
msgstr ""
#: frontend/ui/reader/readerfont.lua:26
msgid ""
"increase line space"
msgstr ""
#: frontend/ui/reader/readerrolling.lua:36
msgid ""
"move view down"
msgstr ""
#: frontend/ui/reader/readerrolling.lua:31
msgid ""
"move view up"
msgstr ""
#: frontend/ui/reader/readerpanning.lua:20
msgid ""
"move visible area down"
msgstr ""
#: frontend/ui/reader/readerpanning.lua:23
msgid ""
"move visible area left"
msgstr ""
#: frontend/ui/reader/readerpanning.lua:26
msgid ""
"move visible area right"
msgstr ""
#: frontend/ui/reader/readerpanning.lua:17
msgid ""
"move visible area up"
msgstr ""
#: frontend/ui/widget/menu.lua:433
msgid ""
"no choices available"
msgstr ""
#: frontend/ui/widget/confirmbox.lua:9
msgid ""
"no text"
msgstr ""
#: frontend/ui/widget/menu.lua:431
msgid ""
"page "
msgstr ""
#: frontend/ui/reader/readerrotation.lua:12
msgid ""
"rotate left by 90 degrees"
msgstr ""
#: frontend/ui/reader/readerrotation.lua:16
msgid ""
"rotate right by 90 degrees"
msgstr ""
#: frontend/ui/widget/config.lua:429
#: frontend/ui/widget/menu.lua:363
msgid ""
"select current menu item"
msgstr ""
#: frontend/ui/reader/readertoc.lua:11
msgid ""
"show Table of Content menu"
msgstr ""
#: frontend/ui/reader/readerbookmark.lua:13
msgid ""
"show bookmarks"
msgstr ""
#: frontend/ui/reader/readerconfig.lua:53
msgid ""
"show config dialog"
msgstr ""
#: frontend/ui/reader/readerfont.lua:15
msgid ""
"show font menu"
msgstr ""
#: frontend/ui/reader/readermenu.lua:34
msgid ""
"show menu"
msgstr ""
#: reader.lua:193
#: reader.lua:194
msgid ""
"usage: ./reader.lua [OPTION] ... path"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:15
msgid ""
"zoom in"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:20
msgid ""
"zoom out"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:30
msgid ""
"zoom to fit content"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:50
msgid ""
"zoom to fit content height"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:40
msgid ""
"zoom to fit content width"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:25
msgid ""
"zoom to fit page"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:45
msgid ""
"zoom to fit page height"
msgstr ""
#: frontend/ui/reader/readerzooming.lua:35
msgid ""
"zoom to fit page width"
msgstr ""

Write Preview
Loading…
Cancel
Save