Merge pull request #159 from badgerman/develop

remove the change_locales code
This commit is contained in:
Enno Rehling 2015-04-04 09:21:42 +02:00
commit bd3c9f1fcb
1 changed files with 43 additions and 54 deletions

View File

@ -26,18 +26,6 @@ function callbacks(rules, name, ...)
end end
end end
local function change_locales(localechange)
for loc, flist in pairs(localechange) do
for index, name in pairs(flist) do
f = get_faction(atoi36(name))
if f ~= nil and f.locale ~= loc then
print("LOCALECHANGE ", f, f.locale, loc)
f.locale = loc
end
end
end
end
local function dbupdate() local function dbupdate()
update_scores() update_scores()
dbname = config.dbname or 'eressea.db' dbname = config.dbname or 'eressea.db'
@ -153,9 +141,6 @@ function process(rules, orders)
process_orders() process_orders()
callbacks(rules, 'update') callbacks(rules, 'update')
local localechange = { de = { 'ii' } }
change_locales(localechange)
write_files(config.locales) write_files(config.locales)
file = '' .. get_turn() .. '.dat' file = '' .. get_turn() .. '.dat'
@ -184,7 +169,11 @@ end
function file_exists(name) function file_exists(name)
local f=io.open(name,"r") local f=io.open(name,"r")
if f~=nil then io.close(f) return true else return false end if not f then
return false
end
io.close(f)
return true
end end
if file_exists('execute.lock') then if file_exists('execute.lock') then