提交 da5b9be5 编写于 作者: baltery's avatar baltery

[Bugfix] Update some translation and set warning, partial fix #646

上级 d1fbbd32
......@@ -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>
......
......@@ -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"
......
......@@ -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.
先完成此消息的编辑!
想要评论请 注册