Skip to content
This repository has been archived by the owner on Oct 29, 2019. It is now read-only.

Commit

Permalink
Toolbar delete: use request language during reversing redirect URL
Browse files Browse the repository at this point in the history
  • Loading branch information
Mykhailo Kolesnyk committed Mar 2, 2016
1 parent ef4b1db commit ec76507
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions aldryn_newsblog/cms_toolbar.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from django.core.exceptions import ImproperlyConfigured
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _, get_language_from_request
from django.utils.translation import ugettext as _, get_language_from_request, override

from cms.toolbar_base import CMSToolbar
from cms.toolbar_pool import toolbar_pool
Expand All @@ -26,8 +26,10 @@ class NewsBlogToolbar(CMSToolbar):
watch_models = [Article, ]
supported_apps = ('aldryn_newsblog',)

def get_on_delete_redirect_url(self, article):
url = reverse('{0}:article-list'.format(article.app_config.namespace))
def get_on_delete_redirect_url(self, article, language=None):
with override(language):
url = reverse(
'{0}:article-list'.format(article.app_config.namespace))
return url

def __get_newsblog_config(self):
Expand Down Expand Up @@ -116,7 +118,8 @@ def populate(self):
active=True)

if delete_article_perm and article:
redirect_url = self.get_on_delete_redirect_url(article)
redirect_url = self.get_on_delete_redirect_url(
article, language=language)
url = get_admin_url('aldryn_newsblog_article_delete',
[article.pk, ])
menu.add_modal_item(_('Delete this article'), url=url,
Expand Down

0 comments on commit ec76507

Please sign in to comment.