From 5ec163b020d371ba4de38cb1ea22cf8ca63eede6 Mon Sep 17 00:00:00 2001 From: Thomas Lagae Date: Sat, 20 Jul 2019 17:49:28 +0200 Subject: [PATCH] Replace direct use of STATIC_URL with static templatetag --- wagtail_modeltranslation/wagtail_hooks.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/wagtail_modeltranslation/wagtail_hooks.py b/wagtail_modeltranslation/wagtail_hooks.py index b557bc6..ccc400a 100644 --- a/wagtail_modeltranslation/wagtail_hooks.py +++ b/wagtail_modeltranslation/wagtail_hooks.py @@ -7,6 +7,7 @@ from six import iteritems from django.conf import settings from django.conf.urls import url from django.http import HttpResponse, QueryDict +from django.templatetags.static import static from django.utils.html import escape, format_html, format_html_join from django.views.decorators.csrf import csrf_exempt from wagtail_modeltranslation import settings as wmt_settings @@ -28,9 +29,9 @@ def translated_slugs(): 'wagtail_modeltranslation/js/wagtail_translated_slugs.js', ] - js_includes = format_html_join('\n', '', ( - (settings.STATIC_URL, filename) for filename in js_files) - ) + js_includes = format_html_join('\n', '', ( + (static(filename),) for filename in js_files) + ) lang_codes = [] for lang in settings.LANGUAGES: @@ -123,18 +124,17 @@ def streamfields_translation_copy(): 'wagtail_modeltranslation/js/copy_stream_fields.js', ] - js_includes = format_html_join('\n', '', ( - (settings.STATIC_URL, filename) for filename in js_files) - ) + js_includes = format_html_join('\n', '', ( + (static(filename),) for filename in js_files) + ) return js_includes @hooks.register('insert_editor_css') def modeltranslation_page_editor_css(): - return format_html('') + filename = 'wagtail_modeltranslation/css/page_editor_modeltranslation.css' + return format_html(''.format(static(filename))) @hooks.register('register_rich_text_link_handler')