diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 63cb512d6e5..fa66163f82d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -32,6 +32,8 @@ mode. * Fixed a bug where users with limited permissions could not interact with page tree dropdowns. +* Fixed a bug where Django Compressor could not be used on the sekizai ``js`` + block. === 3.3.0 (2016-05-26) === diff --git a/cms/templates/cms/toolbar/placeholder.html b/cms/templates/cms/toolbar/placeholder.html index 6b7196988fa..d0134a418ab 100644 --- a/cms/templates/cms/toolbar/placeholder.html +++ b/cms/templates/cms/toolbar/placeholder.html @@ -2,6 +2,11 @@ {% load i18n l10n sekizai_tags %}
+{% language request.toolbar.toolbar_language %} + +{% endlanguage %} {% endspaceless %}{% addtoblock "js" %} {% language request.toolbar.toolbar_language %} @@ -20,8 +25,5 @@ } }]); - {% endlanguage %} {% endaddtoblock %} diff --git a/cms/tests/test_toolbar.py b/cms/tests/test_toolbar.py index 5c280a7c219..fb8967ab3d3 100644 --- a/cms/tests/test_toolbar.py +++ b/cms/tests/test_toolbar.py @@ -1058,10 +1058,15 @@ def test_edit_render_placeholder(self): response = detail_view(request, ex1.pk, template_string=template_text) self.assertContains( response, - '

\n' - '
{2}

'.format(ex1.placeholder.pk, - plugin.pk, render_placeholder_body) - ) + '

'.format(ex1.placeholder.pk)) + + self.assertContains( + response, + '