diff --git a/templates/header_location.twig b/templates/header_location.twig
index f6e97a6bc3..dc3c333ede 100644
--- a/templates/header_location.twig
+++ b/templates/header_location.twig
@@ -8,14 +8,14 @@
diff --git a/templates/import/javascript.twig b/templates/import/javascript.twig
index 56ef1a8292..edd8514b49 100644
--- a/templates/import/javascript.twig
+++ b/templates/import/javascript.twig
@@ -10,7 +10,7 @@ $( function() {
'import_status': 1
}, '&') %}
{% set promot_str = 'The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'|trans|js_format(false) %}
- {% set statustext_str = '%s of %s'|trans|escape_js_string %}
+ {% set statustext_str = '%s of %s'|trans|e('js') %}
{% set second_str = '%s/sec.'|trans|js_format(false) %}
{% set remaining_min = 'About %MIN min. %SEC sec. remaining.'|trans|js_format(false) %}
{% set remaining_second = 'About %SEC sec. remaining.'|trans|js_format(false) %}
diff --git a/templates/scripts.twig b/templates/scripts.twig
index c152edbd38..58b3ae49fb 100644
--- a/templates/scripts.twig
+++ b/templates/scripts.twig
@@ -10,13 +10,13 @@
{% if files is not empty %}
window.AJAX.scriptHandler
{% for file in files %}
- .add('{{ file.filename|escape_js_string }}', {{ file.has_onload ? 1 : 0 }})
+ .add('{{ file.filename|e('js') }}', {{ file.has_onload ? 1 : 0 }})
{% endfor %}
;
$(function() {
{% for file in files %}
{% if file.has_onload %}
- window.AJAX.fireOnload('{{ file.filename|escape_js_string }}');
+ window.AJAX.fireOnload('{{ file.filename|e('js') }}');
{% endif %}
{% endfor %}
});