From 0db72bd00f3d5aab328e0ff7744714d7f15966e7 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 17 Nov 2020 16:15:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(i18n):=20=E4=BF=AE=E5=A4=8Djs18n=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/jumpserver/urls.py                | 6 +++---
 apps/templates/_base_only_content.html | 2 +-
 apps/templates/_head_css_js.html       | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/jumpserver/urls.py b/apps/jumpserver/urls.py
index dd2d02693..624212e6f 100644
--- a/apps/jumpserver/urls.py
+++ b/apps/jumpserver/urls.py
@@ -69,9 +69,9 @@ urlpatterns = [
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \
             + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
 
-js_i18n_patterns = i18n_patterns(
-    path('jsi18n/', JavaScriptCatalog.as_view(), name='javascript-catalog'),
-)
+js_i18n_patterns = [
+    path('core/jsi18n/', JavaScriptCatalog.as_view(), name='javascript-catalog'),
+]
 urlpatterns += js_i18n_patterns
 
 handler404 = 'jumpserver.views.handler404'
diff --git a/apps/templates/_base_only_content.html b/apps/templates/_base_only_content.html
index 2c757d344..9da6c0157 100644
--- a/apps/templates/_base_only_content.html
+++ b/apps/templates/_base_only_content.html
@@ -11,7 +11,7 @@
 
     {% include '_head_css_js.html' %}
     <link href="{% static "css/jumpserver.css" %}" rel="stylesheet">
-    <script src="{% url 'javascript-catalog' %}"></script>
+
     <script src="{% static "js/jumpserver.js" %}"></script>
     <style>
         .passwordBox {
diff --git a/apps/templates/_head_css_js.html b/apps/templates/_head_css_js.html
index b4fbcd47b..9bd58f864 100644
--- a/apps/templates/_head_css_js.html
+++ b/apps/templates/_head_css_js.html
@@ -13,5 +13,7 @@
 <script src="{% static 'js/plugins/sweetalert/sweetalert.min.js' %}"></script>
 <script src="{% static 'js/bootstrap.min.js' %}"></script>
 <script src="{% static 'js/plugins/datatables/datatables.min.js' %}"></script>
+<script src="{% url 'javascript-catalog' %}"></script>
 <link href="{% static 'css/plugins/select2/select2.min.css' %}" rel="stylesheet">
 
+