rattail/appypod-rattail
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[gen] Allow to specify several folder within an app where to store static ui content (js, css, images). [gen] When browser settings are ignored or absent, default language is the first one listed in Config.languages.

Browse source
This commit is contained in:
Gaetan Delannay 2014-03-28 12:25:42 +01:00
parent d5a9450d72
commit 81a201dcad
3 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gen/mixins/__init__.py
View file

@ -1470,7 +1470,8 @@ class BaseMixin:
def getUserLanguage(self):
'''Gets the language (code) of the current user.'''
if not hasattr(self, 'REQUEST'): return 'en'
if not hasattr(self, 'REQUEST'):
return self.getProductConfig().appConfig.languages[0]
# Try the value which comes from the cookie. Indeed, if such a cookie is
# present, it means that the user has explicitly chosen this language
# via the language selector.
@ -1484,7 +1485,7 @@ class BaseMixin:
# language preferences as defined in the user's browser. Several
# languages can be listed, from most to less wanted.
res = self.REQUEST.get('HTTP_ACCEPT_LANGUAGE', None)
if not res: return 'en'
if not res: return self.getProductConfig().appConfig.languages[0]
if ',' in res: res = res[:res.find(',')]
if '-' in res: res = res[:res.find('-')]
return res