From 780ec6ee2c6a903c25fa43b18c3945f9eb3c7ba7 Mon Sep 17 00:00:00 2001 From: Sarina Canelake Date: Fri, 5 Jun 2015 10:11:04 -0400 Subject: [PATCH] Allow released languages to be previewed under dark lang --- common/djangoapps/dark_lang/middleware.py | 3 --- common/djangoapps/dark_lang/tests.py | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/common/djangoapps/dark_lang/middleware.py b/common/djangoapps/dark_lang/middleware.py index 96e06947a6..b18d064969 100644 --- a/common/djangoapps/dark_lang/middleware.py +++ b/common/djangoapps/dark_lang/middleware.py @@ -126,7 +126,4 @@ class DarkLangMiddleware(object): if not preview_lang: return - if preview_lang in self.released_langs: - return - request.session['django_language'] = preview_lang diff --git a/common/djangoapps/dark_lang/tests.py b/common/djangoapps/dark_lang/tests.py index 9e9b2aab54..6dd0b41882 100644 --- a/common/djangoapps/dark_lang/tests.py +++ b/common/djangoapps/dark_lang/tests.py @@ -155,13 +155,14 @@ class DarkLangMiddlewareTests(TestCase): ) def test_preview_lang_with_released_language(self): + # Preview lang should always override selection. self.assertSessionLangEquals( - UNSET, + 'rel', self.process_request(preview_lang='rel') ) self.assertSessionLangEquals( - 'notrel', + 'rel', self.process_request(preview_lang='rel', django_language='notrel') )