From 7456a7774de2914c557aa96bbebba3e80b6d34fa Mon Sep 17 00:00:00 2001
From: DylannCordel <d.cordel@webu.coop>
Date: Thu, 6 Apr 2017 17:20:37 +0200
Subject: [PATCH] use switch_language

---
 newsbox_i18n/models.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/newsbox_i18n/models.py b/newsbox_i18n/models.py
index e71c839..64b36ca 100644
--- a/newsbox_i18n/models.py
+++ b/newsbox_i18n/models.py
@@ -2,11 +2,12 @@
 from __future__ import unicode_literals
 
 from django.core.urlresolvers import reverse
-from django.utils.translation import ugettext_lazy as _,  get_language, activate
+from django.utils.translation import ugettext_lazy as _,  get_language
 from django.utils import six
 from django.utils.encoding import python_2_unicode_compatible
 from parler.managers import TranslatableManager, TranslatableQuerySet
 from parler.models import TranslatableModel, TranslatedFields
+from parler.utils.context import switch_language
 from newsbox.models import NewsboxModelBase, NewsboxManager
 
 
@@ -81,13 +82,12 @@ class NewsboxI18NBase(six.with_metaclass(NewsboxI18NModelBase, TranslatableModel
                     break
             if not language:
                 return None
-        activate(language)
-        url = reverse(self._newsbox_meta['detail_url_name'], args=(
-            self.newsbox_publication_start_date.strftime("%Y"),
-            self.newsbox_publication_start_date.strftime("%m"),
-            self.newsbox_publication_start_date.strftime("%d"),
-            self.get_slug(language=language),))
-        activate(current_language)
+        with switch_language(self, language):
+            url = reverse(self._newsbox_meta['detail_url_name'], args=(
+                self.newsbox_publication_start_date.strftime("%Y"),
+                self.newsbox_publication_start_date.strftime("%m"),
+                self.newsbox_publication_start_date.strftime("%d"),
+                self.get_slug(language=language),))
         return url
 
     class Meta:
-- 
GitLab