From 7a6027f35ae8d022af05dda4e5c5d4a9925802ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=AB=E5=8D=83=E6=B5=81?= <40739051+jym503558564@users.noreply.github.com> Date: Mon, 27 May 2019 16:12:19 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20csv=E7=BF=BB=E8=AF=91=20(#2736)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/locale/zh/LC_MESSAGES/djangojs.mo | Bin 2465 -> 2698 bytes apps/locale/zh/LC_MESSAGES/djangojs.po | 76 ++++++++++++++++--------- apps/static/js/jumpserver.js | 10 ++-- 3 files changed, 55 insertions(+), 31 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/djangojs.mo b/apps/locale/zh/LC_MESSAGES/djangojs.mo index 189ddbc8eb356af1918545cfeb20150f6b06aa3b..aab4a06e6150424d2779b534a47cd2a73051e6c1 100644 GIT binary patch delta 833 zcmXxi%}Z2K7{~GFj-zIcn%ZcY+AJza5vySs#ul|Pn20c{KVZs3L5r*_Ey6%IZ3?1)z*TpOUUq@d3-tZnIdkCfInTXw&-0w~Or>inUfk`BJ~qYx zvyU0`%ueB7)OZ>(8^j78!w;CoAJ~M)8_b$<2s<%}m+&Iq!bjMMzp)i9YSspANL;jj z76*7RgeoA7D&{&WVZm9(eZ)St;1(wE9k$~ayo!6M!m?yNh~qepIaK0Ts6uuyPJa8y zLX`%1fm2`M>!ZXaj&%s1V-mMf8~<|t!5DFbsxsJ)W0*z#u7rBO>|AwjpbB`4hskg6 zwZPBLf6i`>sgsSMHad^Jco}t)DO79jqY_q78$Ux8{2KM$H|L%+y5DS`=N(vdZ4Ngk z4hJ_F_EJF)Q^}|)?6X>>+fiX^ms(XHO0Gekupk|(J~~)*F}Y;puMoC|ztDj76U3Ri zYK?B@5vD3PKNFeq2FK=S@7$eB+|1pc&QDr)CXBA#o0!NK3iYt|(qCyPdGY$I8?%$S zxxD+Xe6sOVYi9U#YWQqAaV9mIO8U{J@7{?QTfxGcVD07C&2R`RcOyWGNDnJ=4Y~~&_jQe~vj($=XS>L4SXrdj@eH>St=Y>?JM?Wiop8x&#v-SG6<#%_ diff --git a/apps/locale/zh/LC_MESSAGES/djangojs.po b/apps/locale/zh/LC_MESSAGES/djangojs.po index 720927f06..8e0ec5047 100644 --- a/apps/locale/zh/LC_MESSAGES/djangojs.po +++ b/apps/locale/zh/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-11-21 19:14+0800\n" +"POT-Creation-Date: 2019-05-27 15:53+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,58 +17,58 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: static/js/jumpserver.js:168 +#: static/js/jumpserver.js:249 msgid "Update is successful!" msgstr "更新成功" -#: static/js/jumpserver.js:170 +#: static/js/jumpserver.js:251 msgid "An unknown error occurred while updating.." msgstr "更新时发生未知错误" -#: static/js/jumpserver.js:236 static/js/jumpserver.js:273 -#: static/js/jumpserver.js:276 +#: static/js/jumpserver.js:315 static/js/jumpserver.js:352 +#: static/js/jumpserver.js:355 msgid "Error" msgstr "错误" -#: static/js/jumpserver.js:236 +#: static/js/jumpserver.js:315 msgid "Being used by the asset, please unbind the asset first." msgstr "正在被资产使用中，请先解除资产绑定" -#: static/js/jumpserver.js:242 static/js/jumpserver.js:283 +#: static/js/jumpserver.js:321 static/js/jumpserver.js:362 msgid "Delete the success" msgstr "删除成功" -#: static/js/jumpserver.js:248 +#: static/js/jumpserver.js:327 msgid "Are you sure about deleting it?" msgstr "你确定删除吗 ?" -#: static/js/jumpserver.js:252 static/js/jumpserver.js:293 +#: static/js/jumpserver.js:331 static/js/jumpserver.js:372 msgid "Cancel" msgstr "取消" -#: static/js/jumpserver.js:254 static/js/jumpserver.js:295 +#: static/js/jumpserver.js:333 static/js/jumpserver.js:374 msgid "Confirm" msgstr "确认" -#: static/js/jumpserver.js:273 +#: static/js/jumpserver.js:352 msgid "" "The organization contains undeleted information. Please try again after " "deleting" msgstr "组织中包含未删除信息，请删除后重试" -#: static/js/jumpserver.js:276 +#: static/js/jumpserver.js:355 msgid "" "Do not perform this operation under this organization. Try again after " "switching to another organization" msgstr "请勿在此组织下执行此操作，切换到其他组织后重试" -#: static/js/jumpserver.js:289 +#: static/js/jumpserver.js:368 msgid "" "Please ensure that the following information in the organization has been " "deleted" msgstr "请确保组织内的以下信息已删除" -#: static/js/jumpserver.js:290 +#: static/js/jumpserver.js:369 msgid "" "User list、User group、Asset list、Domain list、Admin user、System user、" "Labels、Asset permission" @@ -76,52 +76,76 @@ msgstr "" "用户列表、用户组、资产列表、网域列表、管理用户、系统用户、标签管理、资产授权" "规则" -#: static/js/jumpserver.js:329 +#: static/js/jumpserver.js:408 msgid "Loading ..." msgstr "加载中 ..." -#: static/js/jumpserver.js:330 +#: static/js/jumpserver.js:409 msgid "Search" msgstr "搜索" -#: static/js/jumpserver.js:333 +#: static/js/jumpserver.js:412 #, javascript-format msgid "Selected item %d" msgstr "选中 %d 项" -#: static/js/jumpserver.js:337 +#: static/js/jumpserver.js:416 msgid "Per page _MENU_" msgstr "每页 _MENU_" -#: static/js/jumpserver.js:338 +#: static/js/jumpserver.js:417 msgid "" "Displays the results of items _START_ to _END_; A total of _TOTAL_ entries" msgstr "显示第 _START_ 至 _END_ 项结果; 总共 _TOTAL_ 项" -#: static/js/jumpserver.js:341 +#: static/js/jumpserver.js:420 msgid "No match" msgstr "没有匹配项" -#: static/js/jumpserver.js:342 +#: static/js/jumpserver.js:421 msgid "No record" msgstr "没有记录" -#: static/js/jumpserver.js:701 +#: static/js/jumpserver.js:563 +msgid "Unknown error occur" +msgstr "" + +#: static/js/jumpserver.js:800 msgid "Password minimum length {N} bits" msgstr "密码最小长度 {N} 位" -#: static/js/jumpserver.js:702 +#: static/js/jumpserver.js:801 msgid "Must contain capital letters" msgstr "必须包含大写字母" -#: static/js/jumpserver.js:703 +#: static/js/jumpserver.js:802 msgid "Must contain lowercase letters" msgstr "必须包含小写字母" -#: static/js/jumpserver.js:704 +#: static/js/jumpserver.js:803 msgid "Must contain numeric characters" msgstr "必须包含数字字符" -#: static/js/jumpserver.js:705 +#: static/js/jumpserver.js:804 msgid "Must contain special characters" msgstr "必须包含特殊字符" + +#: static/js/jumpserver.js:976 +msgid "Export failed" +msgstr "导出失败" + +#: static/js/jumpserver.js:993 +msgid "Import Success" +msgstr "导入成功" + +#: static/js/jumpserver.js:998 +msgid "Update Success" +msgstr "更新成功" + +#: static/js/jumpserver.js:1028 +msgid "Import failed" +msgstr "导入失败" + +#: static/js/jumpserver.js:1033 +msgid "Update failed" +msgstr "更新失败" diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js index b452c353a..0197312fd 100644 --- a/apps/static/js/jumpserver.js +++ b/apps/static/js/jumpserver.js @@ -973,7 +973,7 @@ function APIExportData(props) { window.open(export_url); }, error: function () { - toastr.error('Export failed'); + toastr.error(gettext('Export failed')); } }) } @@ -990,12 +990,12 @@ function APIImportData(props){ if(props.method === 'POST'){ $('#created_failed').html(''); $('#created_failed_detail').html(''); - $('#success_created').html("Import Success"); + $('#success_created').html(gettext("Import Success")); $('#success_created_detail').html("Count" + ": " + data.length); }else{ $('#updated_failed').html(''); $('#updated_failed_detail').html(''); - $('#success_updated').html("Update Success"); + $('#success_updated').html(gettext("Update Success")); $('#success_updated_detail').html("Count" + ": " + data.length); } @@ -1025,12 +1025,12 @@ function APIImportData(props){ if(props.method === 'POST'){ $('#success_created').html(''); $('#success_created_detail').html(''); - $('#created_failed').html("Import failed"); + $('#created_failed').html(gettext("Import failed")); $('#created_failed_detail').html(html); }else{ $('#success_updated').html(''); $('#success_updated_detail').html(''); - $('#updated_failed').html("Update failed"); + $('#updated_failed').html(gettext("Update failed")); $('#updated_failed_detail').html(html); } }