libs/web: let luci.i18n.setlanguage() return the lang that was actually loaded
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 2 Dec 2012 13:30:46 +0000 (13:30 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 2 Dec 2012 13:30:46 +0000 (13:30 +0000)
libs/web/luasrc/i18n.lua

index ff917c6..545a8ae 100644 (file)
@@ -63,8 +63,10 @@ function setlanguage(lang)
        if not tparser.load_catalog(context.lang, i18ndir) then
                if context.parent then
                        tparser.load_catalog(context.parent, i18ndir)
        if not tparser.load_catalog(context.lang, i18ndir) then
                if context.parent then
                        tparser.load_catalog(context.parent, i18ndir)
+                       return context.parent
                end
        end
                end
        end
+       return context.lang
 end
 
 --- Return the translated value for a specific translation key.
 end
 
 --- Return the translated value for a specific translation key.