github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

[Update] 添加和修改部分翻译

pull/828/merge
ibuler 2018-01-01 00:45:12 +08:00
parent 0916757eb8
commit c48531c586
12 changed files with 664 additions and 554 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/assets/templates/assets/_asset_group_bulk_update_modal.html
View File

@ -2,7 +2,7 @@
{% load i18n %}
{% block modal_id %}asset_group_bulk_update_modal{% endblock %}
{% block modal_class %}modal-lg{% endblock %}
{% block modal_title%}{% trans "Update Asset Group" %}{% endblock %}
{% block modal_title%}{% trans "Update asset sroup" %}{% endblock %}
{% block modal_body %}
{% load bootstrap3 %}
<p class="text-success text-center">{% trans "Hint: only change the field you want to update." %}</p>

2
apps/assets/templates/assets/asset_detail.html
View File

@ -196,7 +196,7 @@
</td>
</tr>
<tr>
<td>{% trans 'Test is alive' %}:</td>
<td>{% trans 'Test connective' %}:</td>
<td>
<span class="pull-right">
<button type="button" class="btn btn-primary btn-xs" id="btn-test-is-alive" style="width: 54px">{% trans 'Test' %}</button>

2
apps/assets/templates/assets/cluster_assets.html
View File

@ -71,7 +71,7 @@
<table class="table">
<tbody>
<tr class="no-borders-tr">
<td width="50%">{% trans 'Test assets alive' %}:</td>
<td width="50%">{% trans 'Test assets connective' %}:</td>
<td>
<span style="float: right">
<button type="button" class="btn btn-primary btn-xs" id="btn-test-assets" style="width: 54px">{% trans 'Run' %}</button>

6
apps/assets/templates/assets/cluster_list.html
View File

@ -91,12 +91,12 @@ $(document).ready(function(){
}, function() {
var success = function() {
var msg = "{% trans 'Cluster Deleted.' %}";
swal("{% trans 'Cluster Delete' %}", msg, "success");
swal("{% trans 'Cluster delete' %}", msg, "success");
$('#cluster_list_table').DataTable().ajax.reload();
};
var fail = function() {
var msg = "{% trans 'Cluster Deleting failed.' %}";
swal("{% trans 'Cluster Delete' %}", msg, "error");
var msg = "{% trans 'Cluster deleting failed.' %}";
swal("{% trans 'Cluster delete' %}", msg, "error");
};
var url_delete = the_url + '?id__in=' + JSON.stringify(plain_id_list);
APIUpdateAttr({url: url_delete, method: 'DELETE', success: success, error: fail});

BIN
apps/locale/zh/LC_MESSAGES/django.mo
View File

Binary file not shown.

1185
apps/locale/zh/LC_MESSAGES/django.po
View File

File diff suppressed because it is too large Load Diff

2
apps/ops/templates/ops/task_detail.html
View File

@ -69,7 +69,7 @@
<td><b><a href="{% url 'ops:adhoc-detail' pk=object.latest_adhoc.id %}">{{ object.latest_adhoc.short_id }}</a></b></td>
</tr>
<tr>
<td>{% trans 'Latest run' %}:</td>
<td>{% trans 'Last run' %}:</td>
<td><b>{{ object.latest_history.date_start }}</b></td>
</tr>
<tr>

5
apps/static/js/jumpserver.js
View File

@ -280,6 +280,11 @@ jumpserver.initDataTable = function (options) {
language: {
search: "搜索",
lengthMenu: "每页 _MENU_",
info: "显示第 _START_ 到 _END_; 总共 _TOTAL_ ",
infoFiltered: "",
infoEmpty: "",
zeroRecords: "没有匹配记录",
emptyTable: "没有记录",
paginate: {
first: "第一页",
previous: "上一页",

4
apps/templates/_message.html
View File

@ -13,9 +13,7 @@
{% if user.is_authenticated and not user.is_public_key_valid %}
<div class="alert alert-danger help-message">
{% url 'users:user-pubkey-update' as user_pubkey_update %}
{% blocktrans %}
Your ssh public key not set or expired. Please click <a href="{{ user_pubkey_update }}"> this link </a>to update your
{% endblocktrans %}
{% trans 'Your ssh public key not set or expired. Please click <a href="{{ user_pubkey_update }}"> this link </a>to update' %}
</div>
{% endif %}
{% endblock %}

2
apps/users/models/user.py
View File

@ -46,7 +46,7 @@ class User(AbstractUser):
_private_key = models.CharField(max_length=5000, blank=True, verbose_name=_('Private key'))
_public_key = models.CharField(max_length=5000, blank=True, verbose_name=_('Public key'))
comment = models.TextField(max_length=200, blank=True, verbose_name=_('Comment'))
is_first_login = models.BooleanField(default=False)
is_first_login = models.BooleanField(default=True)
date_expired = models.DateTimeField(default=date_expired_default, blank=True, null=True, verbose_name=_('Date expired'))
created_by = models.CharField(max_length=30, default='', verbose_name=_('Created by'))

4
apps/users/templates/users/user_detail.html
View File

@ -374,11 +374,11 @@ $(document).ready(function() {
$('#txt_pk').val('');
$this.closest('.modal').modal('hide');
var msg = "{% trans 'Successfully updated the SSH public key.' %}";
swal("{% trans 'User SSH Public Key Update' %}", msg, "success");
swal("{% trans 'User SSH public key update' %}", msg, "success");
};
var fail = function(msg) {
swal({
title: "{% trans 'User SSH Public Key Update' %}",
title: "{% trans 'User SSH public key update' %}",
text: msg,
type: "error",
showCancelButton: false,

4
apps/users/templates/users/user_profile.html
View File

@ -168,12 +168,12 @@ $(document).on('click', '#btn_update_pk', function() {
var success = function() {
$('#txt_pk').val('');
var msg = "{% trans 'Successfully updated the SSH public key.' %}";
swal("{% trans 'User SSH Public Key Update' %}", msg, "success");
swal("{% trans 'User SSH public key update' %}", msg, "success");
};
var fail = function() {
var msg = "{% trans 'Failed to update SSH public key.' %}";
swal({
title: "{% trans 'User SSH Public Key Update' %}",
title: "{% trans 'User SSH public key update' %}",
text: msg,
type: "error",
showCancelButton: false,