From 0c5adde9f4e97a5aadc03ef36314b4e383aade0f Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 10 Jan 2022 10:35:40 +0100
Subject: [PATCH] Bug 29837: Remove JS error during installer

Uncaught ReferenceError: _ is not defined

the _() function is called from calendar.inc, but calendar.inc is
 included before the definition of this function in
installer-intranet-bottom.inc

Test plan:
Confirm that the JS error is gone

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---
 .../prog/en/includes/installer-intranet-bottom.inc              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc
index 3f1ca56a38..99b8da94ba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/installer-intranet-bottom.inc
@@ -5,7 +5,6 @@
         [% Asset.js("lib/jquery/jquery-ui-1.11.4.min.js") | $raw %]
         [% Asset.js("lib/bootstrap/bootstrap.min.js") | $raw %]
         [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") | $raw %]
-        [% INCLUDE 'calendar.inc' %]
         <!-- installer-intranet-bottom.inc -->
         <script>
             function _(s) { return s } // dummy function for gettext
@@ -20,6 +19,7 @@
             });
         </script>
         <!-- / installer-intranet-bottom.inc -->
+        [% INCLUDE 'calendar.inc' %]
         [% jsinclude | $raw # Parse the page template's JavaScript block if necessary %]
     </body>
 </html>
-- 
2.39.5