# HG changeset patch # User bsw # Date 1340184719 -7200 # Node ID a06634d17718752b112ec58c39a3d5d37725241c # Parent 54dc906589908f3ae19ba4a7cc08b23f5f02f1df Make available languages configurable diff -r 54dc90658990 -r a06634d17718 app/main/index/_action/set_lang.lua --- a/app/main/index/_action/set_lang.lua Wed Jun 20 08:07:39 2012 +0200 +++ b/app/main/index/_action/set_lang.lua Wed Jun 20 11:31:59 2012 +0200 @@ -1,9 +1,15 @@ local lang = param.get("lang") -if lang == "de" or lang == "en" or lang == "eo" then - app.session.lang = param.get("lang") +local valid_lang = false +for i, tmp_lang in ipairs(config.available_languages) do + if lang == tmp_lang then + valid_lang = true + end +end +if valid_lang then + app.session.lang = lang app.session:save() if app.session.member_id then app.session.member.lang = app.session.lang app.session.member:save() end -end \ No newline at end of file +end diff -r 54dc90658990 -r a06634d17718 app/main/member/_menu.lua --- a/app/main/member/_menu.lua Wed Jun 20 08:07:39 2012 +0200 +++ b/app/main/member/_menu.lua Wed Jun 20 11:31:59 2012 +0200 @@ -75,15 +75,10 @@ ui.tag{ tag = "span", content = _"Select language" } end } - for i, lang in ipairs{"en", "de", "eo"} do + for i, lang in ipairs(config.available_languages) do ui.tag{ tag = "li", content = function() ui.link{ - content = function() - ui.image{ - static = "lang/" .. lang .. ".png", - } - ui.tag{ content = _('Select language "#{langcode}"', { langcode = lang }) } - end, + content = _('Select language "#{langcode}"', { langcode = lang }), module = "index", action = "set_lang", params = { lang = lang }, diff -r 54dc90658990 -r a06634d17718 config/default.lua --- a/config/default.lua Wed Jun 20 08:07:39 2012 +0200 +++ b/config/default.lua Wed Jun 20 11:31:59 2012 +0200 @@ -48,6 +48,8 @@ photo = nil } +config.available_languages = { 'en', 'de', 'eo', 'el' } + config.default_lang = "de" -- after how long is a user considered inactive and the trustee will see warning