Ensure that when 'lang' option is set and i18n is enabled lang is use…

…d as fallback

tests/test_i18n.py

@@ -119,6 +119,7 @@ def setup(self):
         conf['paths']['root'] = 'tests'
         conf['i18n_enabled'] = True
         conf['use_sessions'] = True
+        conf['lang'] = None
         conf['beaker.session.key'] = 'tg_test_session'
         conf['beaker.session.secret'] = 'this-is-some-secret'
         conf.renderers = ['json']
@@ -197,3 +198,10 @@ def test_force_lang(self):
     def test_get_lang_no_session(self):
         r = self.app.get('/get_lang?skip_lang=1', extra_environ={})
         assert '[]' in r, r.body
+
+    def test_get_lang_supported_with_default_lang(self):
+        tg.config['lang'] = 'kr'
+        r = self.app.get('/get_supported_lang?skip_lang=1',
+                         headers={'Accept-Language': 'ru,en,de;q=0.5'})
+        langs = r.json['lang']
+        assert langs == ['ru', 'de', 'kr'], langs

tg/i18n.py

@@ -273,7 +273,7 @@ def setup_i18n(tgl=None):
     else: #pragma: no cover
         languages = []
 
-    languages.extend(map(sanitize_language_code, tgl.request.plain_languages))
+    languages.extend(map(sanitize_language_code, tgl.request.languages))
     set_temporary_lang(languages, tgl=tgl)
 
 

tg/request_local.py

@@ -57,7 +57,7 @@ def controller_url(self):
     def plain_languages(self):
         return self.languages_best_match()
 
-    @property
+    @cached_property
     def languages(self):
         return self.languages_best_match(self._language)