Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
da5b9be5
J
jumpserver
项目概览
gjl2004yn
/
jumpserver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jumpserver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
da5b9be5
编写于
9月 28, 2017
作者:
baltery
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[Bugfix] Update some translation and set warning, partial fix #646
上级
d1fbbd32
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
11 addition
and
13 deletion
+11
-13
apps/assets/templates/assets/_asset_import_modal.html
apps/assets/templates/assets/_asset_import_modal.html
+1
-1
apps/locale/zh/LC_MESSAGES/django.mo
apps/locale/zh/LC_MESSAGES/django.mo
+0
-0
apps/locale/zh/LC_MESSAGES/django.po
apps/locale/zh/LC_MESSAGES/django.po
+7
-9
apps/users/templates/users/_user_import_modal.html
apps/users/templates/users/_user_import_modal.html
+3
-3
未找到文件。
apps/assets/templates/assets/_asset_import_modal.html
浏览文件 @
da5b9be5
...
...
@@ -12,7 +12,7 @@
<div
class=
"form-group"
>
<label
class=
"control-label"
for=
"id_users"
>
{% trans "Asset csv file" %}
</label>
<input
id=
"id_assets"
type=
"file"
name=
"file"
/>
<span
class=
"help-block"
>
<span
class=
"help-block
red-fonts
"
>
{% trans 'If set id, will use this id update asset existed' %}
</span>
</div>
...
...
apps/locale/zh/LC_MESSAGES/django.mo
浏览文件 @
da5b9be5
无法预览此类型文件
apps/locale/zh/LC_MESSAGES/django.po
浏览文件 @
da5b9be5
...
...
@@ -716,14 +716,12 @@ msgid "Download"
msgstr "下载"
#: assets/templates/assets/_asset_import_modal.html:13
#, fuzzy
#| msgid "Asset excel file"
msgid "Asset csv file"
msgstr "资产
excel
"
msgstr "资产
csv文件
"
#: assets/templates/assets/_asset_import_modal.html:16
msgid "If set id, will use this id update asset existed"
msgstr ""
msgstr "
如果设置了id,则会使用该行信息更新该id的资产
"
#: assets/templates/assets/_system_user.html:16
#: assets/templates/assets/system_user_list.html:9
...
...
@@ -1888,16 +1886,16 @@ msgid "Import user"
msgstr "导入"
#: users/templates/users/_user_import_modal.html:6
msgid "Download template or use export
excel
format"
msgid "Download template or use export
csv
format"
msgstr "下载模板"
#: users/templates/users/_user_import_modal.html:14
msgid "Users
excel
file"
msgstr "用户
excel
"
msgid "Users
csv
file"
msgstr "用户
csv文件
"
#: users/templates/users/_user_import_modal.html:16
msgid "If set id, will use this id update existed"
msgstr ""
msgid "If set id, will use this id update
user
existed"
msgstr "
如果设置了id,则会使用该行信息更新该id的用户
"
#: users/templates/users/_user_update_pk_modal.html:4
msgid "Update User SSH Public Key"
...
...
apps/users/templates/users/_user_import_modal.html
浏览文件 @
da5b9be5
...
...
@@ -3,7 +3,7 @@
{% block modal_id %}user_import_modal{% endblock %}
{% block modal_title%}{% trans "Import user" %}{% endblock %}
{% block modal_body %}
<p
class=
"text-success"
>
{% trans "Download template or use export
excel
format" %}
</p>
<p
class=
"text-success"
>
{% trans "Download template or use export
csv
format" %}
</p>
<form
method=
"post"
action=
"{% url 'users:user-import' %}"
id=
"fm_user_import"
enctype=
"multipart/form-data"
>
{% csrf_token %}
<div
class=
"form-group"
>
...
...
@@ -11,9 +11,9 @@
<a
href=
"{% url 'users:user-export' %}"
style=
"display: block"
>
{% trans 'Download' %}
</a>
</div>
<div
class=
"form-group"
>
<label
class=
"control-label"
for=
"id_users"
>
{% trans "Users
excel
file" %}
</label>
<label
class=
"control-label"
for=
"id_users"
>
{% trans "Users
csv
file" %}
</label>
<input
id=
"id_users"
type=
"file"
name=
"file"
/>
<span
class=
"help-block
"
>
{% trans 'If set id, will use this id update
existed' %}
</span>
<span
class=
"help-block
red-fonts"
>
{% trans 'If set id, will use this id update user
existed' %}
</span>
</div>
</form>
<p>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录