From 5dc9d5d565d1fdf6dd72f3f14e315d72a0f1c56e Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Sun, 19 Jan 2014 12:59:27 -0500 Subject: [PATCH] rename language_po setting entry to language --- frontend/ui/language.lua | 10 +++++----- reader.lua | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/frontend/ui/language.lua b/frontend/ui/language.lua index 6edb61d43..1df3eadb6 100644 --- a/frontend/ui/language.lua +++ b/frontend/ui/language.lua @@ -6,20 +6,20 @@ local _ = require("gettext") Language = {} -function Language:changeLanguage(lang_po) - _.changeLang(lang_po) - G_reader_settings:saveSetting("language_po", lang_po) +function Language:changeLanguage(lang_locale) + _.changeLang(lang_locale) + G_reader_settings:saveSetting("language", lang_locale) UIManager:show(InfoMessage:new{ text = _("Please restart reader for new language setting to take effect."), timeout = 3, }) end -function Language:genLanguageSubItem(lang, lang_po) +function Language:genLanguageSubItem(lang, lang_locale) return { text = lang, callback = function() - self:changeLanguage(lang_po) + self:changeLanguage(lang_locale) end } end diff --git a/reader.lua b/reader.lua index 4ae956f73..84377f7c0 100755 --- a/reader.lua +++ b/reader.lua @@ -11,9 +11,9 @@ local _ = require("gettext") -- has to be done before requiring other files because -- they might call gettext on load G_reader_settings = DocSettings:open(".reader") -local lang_po = G_reader_settings:readSetting("language_po") -if lang_po then - _.changeLang(lang_po) +local lang_locale = G_reader_settings:readSetting("language") +if lang_locale then + _.changeLang(lang_locale) end local UIManager = require("ui/uimanager")