mirror of https://github.com/jumpserver/jumpserver
fix(i18n): 修复重置密码那的i18n问题
parent
f04544e8df
commit
987f840431
|
@ -369,7 +369,7 @@ class Config(dict):
|
||||||
tp = type(default_value)
|
tp = type(default_value)
|
||||||
# 对bool特殊处理
|
# 对bool特殊处理
|
||||||
if tp is bool and isinstance(v, str):
|
if tp is bool and isinstance(v, str):
|
||||||
if v in ("true", "True", "1"):
|
if v.lower() in ("true", "1"):
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
return False
|
return False
|
||||||
|
|
|
@ -4,6 +4,8 @@ from __future__ import unicode_literals
|
||||||
from django.urls import path, include, re_path
|
from django.urls import path, include, re_path
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.conf.urls.static import static
|
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
|
from . import views, api
|
||||||
|
|
||||||
|
@ -66,7 +68,11 @@ urlpatterns = [
|
||||||
|
|
||||||
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \
|
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \
|
||||||
+ static(settings.STATIC_URL, document_root=settings.STATIC_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'
|
handler404 = 'jumpserver.views.handler404'
|
||||||
handler500 = 'jumpserver.views.handler500'
|
handler500 = 'jumpserver.views.handler500'
|
||||||
|
|
|
@ -3,10 +3,6 @@
|
||||||
//此函数用于checkbox的全选和反选
|
//此函数用于checkbox的全选和反选
|
||||||
var checked = false;
|
var checked = false;
|
||||||
|
|
||||||
function gettext(s) {
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
|
|
||||||
function check_all(form) {
|
function check_all(form) {
|
||||||
var checkboxes = document.getElementById(form);
|
var checkboxes = document.getElementById(form);
|
||||||
if (checked === false) {
|
if (checked === false) {
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
|
|
||||||
{% include '_head_css_js.html' %}
|
{% include '_head_css_js.html' %}
|
||||||
<link href="{% static "css/jumpserver.css" %}" rel="stylesheet">
|
<link href="{% static "css/jumpserver.css" %}" rel="stylesheet">
|
||||||
|
<script src="{% url 'javascript-catalog' %}"></script>
|
||||||
<script src="{% static "js/jumpserver.js" %}"></script>
|
<script src="{% static "js/jumpserver.js" %}"></script>
|
||||||
<style>
|
<style>
|
||||||
.passwordBox {
|
.passwordBox {
|
||||||
|
|
Loading…
Reference in New Issue