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

pull/756/head^2
ibuler 2017-09-28 20:52:33 +08:00
parent d1fbbd3213
commit da5b9be5ca
4 changed files with 11 additions and 13 deletions

View File

@ -12,7 +12,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label" for="id_users">{% trans "Asset csv file" %}</label> <label class="control-label" for="id_users">{% trans "Asset csv file" %}</label>
<input id="id_assets" type="file" name="file" /> <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' %} {% trans 'If set id, will use this id update asset existed' %}
</span> </span>
</div> </div>

Binary file not shown.

View File

@ -716,14 +716,12 @@ msgid "Download"
msgstr "下载" msgstr "下载"
#: assets/templates/assets/_asset_import_modal.html:13 #: assets/templates/assets/_asset_import_modal.html:13
#, fuzzy
#| msgid "Asset excel file"
msgid "Asset csv file" msgid "Asset csv file"
msgstr "资产excel" msgstr "资产csv文件"
#: assets/templates/assets/_asset_import_modal.html:16 #: assets/templates/assets/_asset_import_modal.html:16
msgid "If set id, will use this id update asset existed" 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.html:16
#: assets/templates/assets/system_user_list.html:9 #: assets/templates/assets/system_user_list.html:9
@ -1888,16 +1886,16 @@ msgid "Import user"
msgstr "导入" msgstr "导入"
#: users/templates/users/_user_import_modal.html:6 #: 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 "下载模板" msgstr "下载模板"
#: users/templates/users/_user_import_modal.html:14 #: users/templates/users/_user_import_modal.html:14
msgid "Users excel file" msgid "Users csv file"
msgstr "用户excel" msgstr "用户csv文件"
#: users/templates/users/_user_import_modal.html:16 #: users/templates/users/_user_import_modal.html:16
msgid "If set id, will use this id update existed" msgid "If set id, will use this id update user existed"
msgstr "" msgstr "如果设置了id则会使用该行信息更新该id的用户"
#: users/templates/users/_user_update_pk_modal.html:4 #: users/templates/users/_user_update_pk_modal.html:4
msgid "Update User SSH Public Key" msgid "Update User SSH Public Key"

View File

@ -3,7 +3,7 @@
{% block modal_id %}user_import_modal{% endblock %} {% block modal_id %}user_import_modal{% endblock %}
{% block modal_title%}{% trans "Import user" %}{% endblock %} {% block modal_title%}{% trans "Import user" %}{% endblock %}
{% block modal_body %} {% 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"> <form method="post" action="{% url 'users:user-import' %}" id="fm_user_import" enctype="multipart/form-data">
{% csrf_token %} {% csrf_token %}
<div class="form-group"> <div class="form-group">
@ -11,9 +11,9 @@
<a href="{% url 'users:user-export' %}" style="display: block">{% trans 'Download' %}</a> <a href="{% url 'users:user-export' %}" style="display: block">{% trans 'Download' %}</a>
</div> </div>
<div class="form-group"> <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" /> <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> </div>
</form> </form>
<p> <p>