Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
41b25fec
Commit
41b25fec
authored
May 05, 2014
by
Sarina Canelake
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure system language is released in dark lang middleware
LMS-2644
parent
5cef9f7a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletions
+12
-1
common/djangoapps/dark_lang/middleware.py
+6
-1
common/djangoapps/dark_lang/tests.py
+6
-0
No files found.
common/djangoapps/dark_lang/middleware.py
View file @
41b25fec
...
...
@@ -10,6 +10,7 @@ in the user's session.
This middleware must be placed before the LocaleMiddleware, but after
the SessionMiddleware.
"""
from
django.conf
import
settings
from
django.utils.translation.trans_real
import
parse_accept_lang_header
...
...
@@ -33,6 +34,7 @@ def dark_parse_accept_lang_header(accept):
for
lang
,
priority
in
browser_langs
:
lang
=
CHINESE_LANGUAGE_CODE_MAP
.
get
(
lang
.
lower
(),
lang
)
django_langs
.
append
((
lang
,
priority
))
return
django_langs
# If django 1.7 or higher is used, the right-side can be updated with new-style codes.
...
...
@@ -65,7 +67,10 @@ class DarkLangMiddleware(object):
"""
Current list of released languages
"""
return
DarkLangConfig
.
current
()
.
released_languages_list
language_options
=
DarkLangConfig
.
current
()
.
released_languages_list
if
settings
.
LANGUAGE_CODE
not
in
language_options
:
language_options
.
append
(
settings
.
LANGUAGE_CODE
)
return
language_options
def
process_request
(
self
,
request
):
"""
...
...
common/djangoapps/dark_lang/tests.py
View file @
41b25fec
...
...
@@ -93,6 +93,12 @@ class DarkLangMiddlewareTests(TestCase):
self
.
process_request
(
accept
=
'rel;q=1.0, unrel;q=0.5'
)
)
def
test_accept_with_syslang
(
self
):
self
.
assertAcceptEquals
(
'en;q=1.0, rel;q=0.8'
,
self
.
process_request
(
accept
=
'en;q=1.0, rel;q=0.8, unrel;q=0.5'
)
)
def
test_accept_multiple_released_langs
(
self
):
DarkLangConfig
(
released_languages
=
(
'rel, unrel'
),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment