From 108daf1ae3ade85ed6ac52376fe2d84211f696b8 Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Fri, 14 Feb 2020 09:46:01 +0100 Subject: [PATCH] Bug 24661: Fix inclusion of locale-related javascript files Bug 21156 adds 2 js files (Gettext.js, i18n.js) + 1 generated js file (locale_data.js). Their URL are broken and the files are not loaded. Use Template::Toolkit plugin Asset to include these files, and exclude locale_data.js when language is english, because obviously translations are not needed in this case. Test plan: 1. Just make sure the files mentioned above are loaded correctly when in English and in other languages as well --- .../intranet-tmpl/prog/en/includes/doc-head-close.inc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc index 2988cb66c1..1ad6197288 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc @@ -26,9 +26,11 @@ var Koha = {}; - - - +[% IF lang != 'en' %] + [% Asset.js(lang _ '/js/locale_data.js') | $raw %] +[% END %] +[% Asset.js('js/Gettext.js') | $raw %] +[% Asset.js('js/i18n.js') | $raw %] [% IF ( login ) %] [% Asset.css("css/login.css") | $raw %] -- 2.20.1