diff --git a/apps/authentication/templates/authentication/login_wait_confirm.html b/apps/authentication/templates/authentication/login_wait_confirm.html
index 8a67a501e..7ee7632f0 100644
--- a/apps/authentication/templates/authentication/login_wait_confirm.html
+++ b/apps/authentication/templates/authentication/login_wait_confirm.html
@@ -10,7 +10,6 @@
     <title>{{ title }}</title>
     {% include '_head_css_js.html' %}
     <link href="{% static "css/jumpserver.css" %}" rel="stylesheet">
-    <script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>
     <script src="{% static "js/jumpserver.js" %}"></script>
 
 </head>
diff --git a/apps/jumpserver/urls.py b/apps/jumpserver/urls.py
index d5c28bc93..331930c3a 100644
--- a/apps/jumpserver/urls.py
+++ b/apps/jumpserver/urls.py
@@ -1,12 +1,9 @@
 # ~*~ coding: utf-8 ~*~
 from __future__ import unicode_literals
-import os
 
 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
 
@@ -45,10 +42,6 @@ if settings.XPACK_ENABLED:
         path('xpack/', include('xpack.urls.api_urls', namespace='api-xpack'))
     )
 
-js_i18n_patterns = i18n_patterns(
-    path('jsi18n/', JavaScriptCatalog.as_view(), name='javascript-catalog'),
-)
-
 
 apps = [
     'users', 'assets', 'perms', 'terminal', 'ops', 'audits', 'orgs', 'auth',
@@ -71,7 +64,7 @@ urlpatterns = [
 
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \
             + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
-urlpatterns += js_i18n_patterns
+# 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 b930154ff..787235568 100644
--- a/apps/static/js/jumpserver.js
+++ b/apps/static/js/jumpserver.js
@@ -3,6 +3,10 @@
 //此函数用于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 1e6a16c84..d773e6a78 100644
--- a/apps/templates/_base_only_content.html
+++ b/apps/templates/_base_only_content.html
@@ -11,7 +11,6 @@
 
     {% include '_head_css_js.html' %}
     <link href="{% static "css/jumpserver.css" %}" rel="stylesheet">
-    <script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>
     <script src="{% static "js/jumpserver.js" %}"></script>
     <style>
         .passwordBox {
diff --git a/apps/templates/_base_only_msg_content.html b/apps/templates/_base_only_msg_content.html
index 1d9ca6c8d..6d1e781eb 100644
--- a/apps/templates/_base_only_msg_content.html
+++ b/apps/templates/_base_only_msg_content.html
@@ -10,7 +10,6 @@
     <link rel="shortcut icon" href="{{ FAVICON_URL }}" type="image/x-icon">
     {% include '_head_css_js.html' %}
     <link href="{% static "css/jumpserver.css" %}" rel="stylesheet">
-    <script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>
     <script src="{% static "js/jumpserver.js" %}"></script>
     <style>
         .captcha {
diff --git a/apps/templates/_foot_js.html b/apps/templates/_foot_js.html
index ff158b54b..ba27689b7 100644
--- a/apps/templates/_foot_js.html
+++ b/apps/templates/_foot_js.html
@@ -6,7 +6,6 @@
 <!-- Custom and plugin javascript -->
 <script src="{% static "js/plugins/toastr/toastr.min.js" %}"></script>
 <script src="{% static "js/inspinia.js" %}"></script>
-<script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>
 <script src="{% static "js/jumpserver.js" %}?v=8"></script>
 <script src="{% static 'js/plugins/select2/select2.full.min.js' %}"></script>
 <script src="{% static 'js/plugins/select2/i18n/zh-CN.js' %}"></script>
diff --git a/apps/templates/_without_nav_base.html b/apps/templates/_without_nav_base.html
index 98bcb6189..2737d82c1 100644
--- a/apps/templates/_without_nav_base.html
+++ b/apps/templates/_without_nav_base.html
@@ -11,7 +11,6 @@
         <link rel="stylesheet" href="{% static 'css/otp.css' %}" />
         <script src="{% static 'js/jquery-3.1.1.min.js' %}"></script>
         <script src="{% static "js/plugins/qrcode/qrcode.min.js" %}"></script>
-        <script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>
 	</head>
 
 	<body>
diff --git a/apps/terminal/api/command.py b/apps/terminal/api/command.py
index 12141bef1..a7798ce08 100644
--- a/apps/terminal/api/command.py
+++ b/apps/terminal/api/command.py
@@ -86,7 +86,6 @@ class CommandQueryMixin:
 
         if date_to_q:
             date_to_st = dt_parser(date_to_q).timestamp()
-
         return date_from_st, date_to_st
 
 
diff --git a/apps/users/templates/users/user_password_update.html b/apps/users/templates/users/user_password_update.html
index 7148dd622..97bc044d6 100644
--- a/apps/users/templates/users/user_password_update.html
+++ b/apps/users/templates/users/user_password_update.html
@@ -8,7 +8,6 @@
     <link href="{% static "css/plugins/sweetalert/sweetalert.css" %}" rel="stylesheet">
     <script src="{% static "js/plugins/sweetalert/sweetalert.min.js" %}"></script>
     <script type="text/javascript" src="{% static 'js/pwstrength-bootstrap.js' %}"></script>
-    <script type="text/javascript" src="{% url 'javascript-catalog' %}"></script>
     <script src="{% static "js/jumpserver.js" %}"></script>
 
     <style>