From 987f8404313317d5bfd55d89803a37074a8afea2 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 9 Nov 2020 18:02:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(i18n):=20=E4=BF=AE=E5=A4=8D=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=AF=86=E7=A0=81=E9=82=A3=E7=9A=84i18n=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/jumpserver/conf.py                | 2 +-
 apps/jumpserver/urls.py                | 8 +++++++-
 apps/static/js/jumpserver.js           | 4 ----
 apps/templates/_base_only_content.html | 1 +
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py
index bd5f45d3d..883760e4a 100644
--- a/apps/jumpserver/conf.py
+++ b/apps/jumpserver/conf.py
@@ -369,7 +369,7 @@ class Config(dict):
         tp = type(default_value)
         # 对bool特殊处理
         if tp is bool and isinstance(v, str):
-            if v in ("true", "True", "1"):
+            if v.lower() in ("true", "1"):
                 return True
             else:
                 return False
diff --git a/apps/jumpserver/urls.py b/apps/jumpserver/urls.py
index d39eb56c5..dd2d02693 100644
--- a/apps/jumpserver/urls.py
+++ b/apps/jumpserver/urls.py
@@ -4,6 +4,8 @@ from __future__ import unicode_literals
 from django.urls import path, include, re_path
 from django.conf import settings
 from django.conf.urls.static import static
+from django.conf.urls.i18n import i18n_patterns
+from django.views.i18n import JavaScriptCatalog
 
 from . import views, api
 
@@ -66,7 +68,11 @@ urlpatterns = [
 
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \
             + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
-# urlpatterns += js_i18n_patterns
+
+js_i18n_patterns = i18n_patterns(
+    path('jsi18n/', JavaScriptCatalog.as_view(), name='javascript-catalog'),
+)
+urlpatterns += js_i18n_patterns
 
 handler404 = 'jumpserver.views.handler404'
 handler500 = 'jumpserver.views.handler500'
diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js
index 787235568..b930154ff 100644
--- a/apps/static/js/jumpserver.js
+++ b/apps/static/js/jumpserver.js
@@ -3,10 +3,6 @@
 //此函数用于checkbox的全选和反选
 var checked = false;
 
-function gettext(s) {
-    return s
-}
-
 function check_all(form) {
     var checkboxes = document.getElementById(form);
     if (checked === false) {
diff --git a/apps/templates/_base_only_content.html b/apps/templates/_base_only_content.html
index d773e6a78..2c757d344 100644
--- a/apps/templates/_base_only_content.html
+++ b/apps/templates/_base_only_content.html
@@ -11,6 +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 {