Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-17 13:03:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix skin and locale at first run, adding new locale to combobox, exit function double call, enable sound option

Browse Source
This commit is contained in:
Henrique
2012-06-20 03:31:52 -03:00
parent eb457bf9cd
commit db4ced65eb
5 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/client_locales/locales.lua
View File

@@ -45,8 +45,8 @@ function Locales.init()
Locales.installLocales('locales')
local userLocaleName = Settings.get('locale')
if userLocaleName and Locales.setLocale(userLocaleName) then
local userLocaleName = Settings.get('locale', 'false')
if userLocaleName ~= 'false' and Locales.setLocale(userLocaleName) then
pdebug('Using configured locale: ' .. userLocaleName)
else
pdebug('Using default locale: ' .. defaultLocaleName)
@@ -82,14 +82,16 @@ function Locales.installLocale(locale)
local installedLocale = installedLocales[locale.name]
if installedLocale then
-- combine translations replacing with new if already exists
for word,translation in pairs(locale.translation) do
installedLocale.translation[word] = translation
end
else
installedLocales[locale.name] = locale
-- update combobox
if localeComboBox then
localeComboBox.onOptionChange = nil
localeComboBox:addOption(locale.languageName, locale.name)
localeComboBox.onOptionChange = onLocaleComboBoxOptionChange
end
end
end