Added language in 'activate' url

lizardsystem · Oct 7, 2016 · 8c3579a · 8c3579a
1 parent 3f602cd
commit 8c3579a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/lizard_auth_server/tests/test_views_api_v2.py b/lizard_auth_server/tests/test_views_api_v2.py
@@ -311,6 +311,7 @@ def setUp(self):
             'lizard_auth_server.api_v2.activate-and-set-password',
             kwargs={'user_id': self.user.id,
                     'sso_key': key,
+                    'language': 'en',
                     'message': signed_message})
 
     def test_get_smoke(self):

diff --git a/lizard_auth_server/urls.py b/lizard_auth_server/urls.py
@@ -120,6 +120,7 @@ def check_settings():
     url(r'^api2/activate/' +
         '(?P<user_id>[^/]+)/' +
         '(?P<sso_key>[^/]+)/' +
+        '(?P<language>[^/]+)/' +
         '(?P<message>[^/]+)$',
         views_api_v2.ActivateAndSetPasswordView.as_view(),
         name='lizard_auth_server.api_v2.activate-and-set-password'),

diff --git a/lizard_auth_server/views_api_v2.py b/lizard_auth_server/views_api_v2.py
@@ -515,6 +515,7 @@ def create_and_mail_user(self, username, first_name, last_name, email,
                 reverse('lizard_auth_server.api_v2.activate-and-set-password',
                         kwargs={'user_id': user.id,
                                 'sso_key': key,
+                                'language': language,
                                 'message': signed_message}))
 
             translation.activate(language)