Browse files

Fixed #19142 -- Language codes can include numbers (RFC 3066).

  • Loading branch information...
1 parent 6b0d93d commit e6b34193c5c7d117ededdab04bb16caf8864f07c @JanBednarik JanBednarik committed Oct 21, 2012
Showing with 5 additions and 2 deletions.
  1. +3 −2 django/utils/translation/trans_real.py
  2. +2 −0 tests/regressiontests/i18n/tests.py
View
5 django/utils/translation/trans_real.py
@@ -30,9 +30,10 @@
# magic gettext number to separate context from message
CONTEXT_SEPARATOR = "\x04"
-# Format of Accept-Language header values. From RFC 2616, section 14.4 and 3.9.
+# Format of Accept-Language header values. From RFC 2616, section 14.4 and 3.9
+# and RFC 3066, section 2.1
accept_language_re = re.compile(r'''
- ([A-Za-z]{1,8}(?:-[A-Za-z]{1,8})*|\*) # "en", "en-au", "x-y-z", "*"
+ ([A-Za-z]{1,8}(?:-[A-Za-z0-9]{1,8})*|\*) # "en", "en-au", "x-y-z", "es-419", "*"
(?:\s*;\s*q=(0(?:\.\d{,3})?|1(?:.0{,3})?))? # Optional "q=1.00", "q=0.8"
(?:\s*,\s*|$) # Multiple accepts per header.
''', re.VERBOSE)
View
2 tests/regressiontests/i18n/tests.py
@@ -715,6 +715,7 @@ def test_parse_spec_http_header(self):
# Good headers.
self.assertEqual([('de', 1.0)], p('de'))
self.assertEqual([('en-AU', 1.0)], p('en-AU'))
+ self.assertEqual([('es-419', 1.0)], p('es-419'))
self.assertEqual([('*', 1.0)], p('*;q=1.00'))
self.assertEqual([('en-AU', 0.123)], p('en-AU;q=0.123'))
self.assertEqual([('en-au', 0.5)], p('en-au;q=0.5'))
@@ -739,6 +740,7 @@ def test_parse_spec_http_header(self):
self.assertEqual([], p('da, en-gb;q=0.8, en;q=0.7,#'))
self.assertEqual([], p('de;q=2.0'))
self.assertEqual([], p('de;q=0.a'))
+ self.assertEqual([], p('12-345'))
self.assertEqual([], p(''))
def test_parse_literal_http_header(self):

0 comments on commit e6b3419

Please sign in to comment.