mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 23:26:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #24063 -- Allowed locale variants supported by gettext.

Browse Source 
The locale code can contain a variant after @, so allowed that.
This commit is contained in:
Michal Čihař
2014-12-30 15:41:31 +01:00
committed by Tim Graham
parent 9d6914da66
commit 76d26d8922
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
django/utils/translation/trans_real.py
View File

@@ -43,9 +43,12 @@ accept_language_re = re.compile(r'''
(?:\s*,\s*|$) # Multiple accepts per header.
''', re.VERBOSE)
language_code_re = re.compile(r'^[a-z]{1,8}(?:-[a-z0-9]{1,8})*$', re.IGNORECASE)
language_code_re = re.compile(
r'^[a-z]{1,8}(?:-[a-z0-9]{1,8})*(?:@[a-z0-9]{1,20})?$',
re.IGNORECASE
)
language_code_prefix_re = re.compile(r'^/([\w-]+)(/|$)')
language_code_prefix_re = re.compile(r'^/([\w@-]+)(/|$)')
@receiver(setting_changed)