From 279121384435ef2349d46d0abad11597cd5de951 Mon Sep 17 00:00:00 2001 From: BaiJiangJie Date: Tue, 23 Oct 2018 20:41:01 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0storage=E7=BF=BB?= =?UTF-8?q?=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/api.py | 6 +- .../common/command_storage_create.html | 2 +- .../common/replay_storage_create.html | 30 +- apps/locale/zh/LC_MESSAGES/django.mo | Bin 55096 -> 55532 bytes apps/locale/zh/LC_MESSAGES/django.po | 345 +++++++++++------- 5 files changed, 242 insertions(+), 141 deletions(-) diff --git a/apps/common/api.py b/apps/common/api.py index 193132b7a..f65efa8ca 100644 --- a/apps/common/api.py +++ b/apps/common/api.py @@ -116,11 +116,7 @@ class ReplayStorageCreateAPI(APIView): storage = jms_storage.get_object_storage(storage_data) target = 'tests.py' src = os.path.join(settings.BASE_DIR, 'common', target) - ok, msg = storage.upload(src=src, target=target) - if not ok: - return False - storage.delete(path=target) - return True + return storage.is_valid(src, target) class ReplayStorageDeleteAPI(APIView): diff --git a/apps/common/templates/common/command_storage_create.html b/apps/common/templates/common/command_storage_create.html index 0f631161f..ad28e4cb1 100644 --- a/apps/common/templates/common/command_storage_create.html +++ b/apps/common/templates/common/command_storage_create.html @@ -50,7 +50,7 @@
-
如果有多台主机，请使用逗号 ( , ) 进行分割
+
{% trans 'Tips: If there are multiple hosts, separate them with a comma (,)' %}
diff --git a/apps/common/templates/common/replay_storage_create.html b/apps/common/templates/common/replay_storage_create.html index d717a508d..6382d27e1 100644 --- a/apps/common/templates/common/replay_storage_create.html +++ b/apps/common/templates/common/replay_storage_create.html @@ -45,7 +45,6 @@
* required
-{# #}
@@ -53,77 +52,84 @@ diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index d88a5bfaef399ce91967de0660f258bf9005b329..b91198c4a60f99df3b260f584b3ef4661f0b65e4 100644 GIT binary patch delta 17673 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 EKV!QHI{*Lx delta 17354 zcmcKBXLMJ^y2tUIgg^oTLP+R@(5v(+AVrFF5Ty4IIsrnFzUjRQ(vc#e*BGRT^j=jI z4u~R%^ddz8Mc{sa|NZ2wbJsd=?u)zE8b0$pGka$C?2=%4kPxtIOMrVdEZIDVBXxk| zWW({994B)!$9Yg(S;uKy&2gq;6C8~{;rD)y)2_PX9KsSch{^v^(>wn}EyoEXzKId| z5|d+^+RT9wmVej)lnxlH`}4EpbMtOILwG+ zQRgj2Hqlv&!MG7M;g_f#Igdej6SLwYOvU_8%6eWy2FyjA19f6`)Q)t(6xanru{Y`p zMq(h&!IZerT!ra~x1bh!06XKis0%1npNqw6=oX~Xol0Mvg9FgNf#ZCLgRv=|G_yDK z^8K+K`6H+W{Dayl|3+RMj64=jS}cmqPzxG|sc;@@hgUXY|FxnoN$5%sqXs;IA$Shc z;1%Ryaqgi8@N4YlQ=|H2Lyc1q)m{#@Bk!ZmZ-}}j?NI%@VICaVnEel>vWSH4$p+L@ zdknMSPpB((7ALq=ic^_q z9gd*}`qn!9%ksBTJM#o}r7uwZ0=Z8z1T|oK)D`DOEu)!aQaf3@5IIny3xxnHh*0Z?riX zgY^E-rcw$Qp|<8MYUMwm9?Bc2Tk{sR&~(kcdl`w^sj?V>RZ$OZbJRlnqsDPj=gmZ2 z$P(1su?1bNbT<`Ea1OQ7Yp7@7ftkF8cVZN(y%ef{71TgYP*>I#wG&-X3mb&GWiDy~ z<54^NiN%Xsu>TrxEeV~Nh+6Rx)WF}HS5X7rMGf=}HIUQNTSzc!0a;PcQf}0}E`{3B z+NgONT6=5M!g{u3|J9){iLY@mYM@fByooBBAD|}u2sLnf)Btg)g?)@#@EDB3>8SU7 zGuFj3_!u*`_Rb4xcnx9}_$#9vY4 zg|zi1$b#D0oTvqsL|tHI)c9^qDjKLEYT{<79qEX=72QxB2c!DAr~xLR`prO1_$lhv ze2!7L)#7ha=l_iAe+zZ~Lu5YJ`O_Nw+Ie55Ak;!~n1!)4aXHiky-^bmMLmR*Q1^Th zYT)&#ehH{sv=6i4VbraLv27=GNzakAr6)WSpgrNGt7BB*HKtf(!lhq{8MsAr%p zYURBwKgb+~x)qa95AQrwzxAjEB%&U={T81>UHL`JzwXTbYb8O^-cy5deMKBOQL`~chwXkT^74^0JeAEuCL`}TW;_cSH4>kTti!ZuVbOqN@TYU#} z;tLGG%w4^o0ogG#aRt=F*c3Bi3~HiLSP&GA6@0s0A!QZPhBvZ$tI_5`%C*Y9~&h&ifH{Ykom3{2uDU9;5obKz#{=dw4%3 zv!K7;|1wlk&`=&VKvmSl^-x>a618Q$P**q%wG*>Y{gz`X+=LqE8tMY>U=aR+x|Of3 z-LI!NZZHNgzmtuMCXPa#P#86EY1C6)4RwW$P*>Irb!Dwl{X3x+*c0^{4@I4~9(4{N#w!ps0lBlt~jWVH$ZAL1M13hU@CkEHE{*h!m6PrY+|;? zVB%;@iG5K0hG0pY+=u0S4|7|W6b=+x*{g{UM80rcypkAlzsC)au^7;FE{Yqg0^3_oT z_CkKgaN?}}toaja;`^utKS5on`-+O5-q3#DfHhE`#->;Vd!pX=1(yF3wZ&&JHC{kX ze8aql+Q}!V37?~${(r39>F@1i3S=R!6HY}}8i{&13V97qWwSPFq9zu1Fnd^j0BS*F z%&C}`crK>FRj37ifl;^{)8UU8s`vi^6@6M?V+dx9^In@gr~%5O7El}Y5Pf8EM+_y7 zMO}c4I)54#!iA{w52Ieg^QeBeFbtn!2=hCE1H3H@Lp?khu?7}Ly=H?@ujwbKg{(*4 zGlQC7zj+RIK+zEt-KiK z$BL*ejYciFCu(QLS$-yJqIniCGgqS~-h{f4?St5VB@U6$m7Kx?cp3E&`49Fwra*03 zgjoRfI#opNOmo!M$D*F@;iy|P0n_1p)PmPxdfbW;cz7`Tuc!Mm30>g})CmC}d%w3w zpyH0G1;pVqoPe5O=n!w>si^Z8pcb&o+>GkC6Scq-s4KsK+SwZ}6>ZgB^C{{czCv|O zHPjm*Giu;MsD+e9Evz<1VJp;*4a0)yqCVy8Q9E@8GvIC1_-{-%%`kofl88hN*bH@I zR}9A~sHb@u=Ejq#2_9k(%sAY8SjV9HAH$V+1-S-iUDxjW$Iu^IVQpCM53YVkq@d4CAE}+i4gSxVpsPmIe z@OB`B8Hsv$^I`zRUdIfE7M^LM*FQJL z5SKvZ7of)b9CiK{)P?Ltz5h>8{Q@Vk|9U?|CwVK+iF!Cnp{}exYM{2LE9j0|U>p|4 z(Wn78p(Z+jx$zrR|7WP3dW~9m=wxr6!l?5qyHtXxG{H!0je$56wF7F`!1FK&<53IS zjOw=+ljC7bfu~UY&!Z-|jzRb*>fXOWT~Mki-U8i>RP?^)!~{Hyx+R0AdM6A+O)v?I z;!Mnmd$A7wf}wtV6Q(&%RpNK2^Gf1yEQxzjJMtLSKYWI_6YY_Oy3SB4nqV^OgjuMG z4xw(%6Xbz){AYSsHW3>z;XLFc=G>UYKZ3`0v-#T&`D?fz*UaIwOTO!;-oqO?&l|4_ z>XtOdWP1Ojsc1{Oqqb@w>M0(HIdGQcw_+jUUFHqUPMl^weX$7E#0{vw@jNzDFW~n| z;zAgLFU`P(T)5ukkFYQPE>S2Y`$t*yNq2GcLr@7YCxk8be(lbN1&FI*3+#y<@eo$Q+)F&8%~j?Ntf2O#-U8d9#_eKpEWS%T2=%sY zTgv|HHTi~wR(b;!KgQIU>@#nmFf+3mh3cQ*ENxap?NmdH+gscVwUFVKpJ2{$t+L$Q zgj(5di!Wg&;+v?gdt-6BW!?e`q4MP{u8X=gEieGvTfVd9`&v90b)GxU67w-9iB%RK z#Yp1wr~#jtFHu+i*5Z)mUVC~}K8wZqQ41()`I2T8Oi8{z^0v873o3dDJDP)0AE4=| z0Y5>lbQx+V5-dJt@z1D3o(NEopq|=UZEBi zw8}FpDqqy%im34#q9$sISuqyXZ>qUq7586>coG^g!5WU3-&y{u#ZOSrz#B7Tymwx4 z)Hv^>uDCI30Uc346?`WG_Gp(d<>8n~XtZBXNO zHv6J(!3c99>PzWvr@~j&d4$Pv%39Car~wwB29CFQyR{!geM(PYehgUWombc_iTWv8 z0drzK)OdZYeHilN-F3!L(Y=~u4NFlSS6RHx+-dH!_M;Y`M@@7YHO_s@|A`vsAB%(6 zd$%$amCudA%l$Y<4hNI<%@l%W6 zVj;c%$v1eP#1g2El~DKUeT>8osEJ2e`!v*+&Otq#+pYaLYN0=1Fg`?$_riQ*`M{0d z0@I?a4mqf##C)g$N}xa1H5*`2;>M6-JO#Vr8PxctHhUNFE-J2# zdZ-(2X8(IpxkEx9ie_894n58OSdIJ;48gA~f86487GE)cHSeNs!DG}8Ia|GP)1$`8 zV&>n<{%b|0N#w?g*3bc!?~NK@08Yb+*bKwAc{|q4j6?MwiJD-%`3dU$WtbTgEPvX( zxI56Gbf_jXIQ-0TxqVuFxt18hs+D81>G@UqMo&&?b=!Hf26O%uTW-V zvj=Lzv8aX2vUon~N>`biEx*$|g1Tkjq0YN!`6uQZ%cuI11?&9}qoS?Js|1!sOK)#=;iwD9iLNFpOhp~aqdq)UEN+8p?`-xp zN0?Jk=gl`iGvm#TsD*xkdb^II#=C1i-@*Q?L%>e&N;06fE+3}HDwc0*`DlzFKf>ZU z*1i!n@E+6!oG^bwEzsHJwWmPE;TC7z#r|u+0+x6W^-Zsb`t%M!-=`My5N}5fa2d6Q z*UWq7ALbj>f`WE?I}m|7uK+4v4D}jTa;a#bn%2+=HE~;uhoerMjM}MLsQ3DF%!Q{> z13ofeq521X<&B#b6=%jw7-ew<)Oc=HDw?n<>S2nr4r9$J=4{kN3(R;_{{$?72Q7YP z2JG=BOpjVX5gdo5P~+_Mbe$vC;XBk$TtW@}E0)Els1pi)?X9>h>O)iqbwvYFw{Qk( zqE)E=8!X;w?lX^?XMA%1zqiDXs1vW7kIYx7tqR)fwP!{Bv@BqjGT$@npe~>p>VmqM zvE~qSEc*WbKb=Z;I?hEcAi>;+n)tNES1rD8@f*}csrGqSo)vX|F0+_f$*hCgvE~-{ zMOPDyu*59XfJ-gjgxb>Gs1pxhcf4$I_5EJH4eCkO#S5XVQZ$3r+5c}(Z>ovT# zhGYl5IF%WO8Za~JA;|A=?*)1elW(=32m zKryqDS;uUS>K|=!PxE8UNq)SwuR(pdHe)Wli0qW>{N+`gu%q5Yg;7^l9(6)J)KABO zm;)zZB(AphBd7r%S{!=J`oFp46|allisZvhg#@T)LXL^GvI#w054)q%yG(lsADiWabMJe24gJqJL9M< z#HSdJ(@uMTqgi2ofjaRB>crFLCG)1WKgB@W|H1%#Yx#gP-dmCqHBJO-;n~nlMWq;( zV612zYFb<$b!E-Xt{6f*7&X8+i|3>ItwKHhiPnAwb*p|sy*+PGI~ab}8>jeL_CJI~ zWlPjW-OCmh4>Kp3pPDPNApN$WCcI?%C#Z$Ju{hm1Z=y)l0t=(>Ld}}z?EP;4glnvD(pIH{Qg|#ehi<+=EYT&`x3N`RF)WFLuzXjEQ59;ANYVk?bPJWL%|3~w-m*?OAS%+7q|9S6( zU>wQ`p{TcHDr(@A-+L3KK@FS<^I{Gxj5V<(_Qywf3iUef{(;Xn`d{$=GFt_+YUEfd z+Ony>1V21bEB(Q|j_(ma!e;o+MQ;bjqF&p1s4Fk}Fa8S{Ji#C1QAbUA}_hr22 zW3#^(%y4Olwg&xg6_+V5C_3um0;`wBmXsl!$b8N=N)O^Zl&+MdV>j*TZE!tT8>zDa zPIb&ezp~hl_z&s>sJoj8_&vgRj3zmYq>hc$vs3?qvW0qx_MYPvMcdBD(3wwu0ZyXN z`{+;nlKO9ydX!1zs!(+NMq5+-nfxZ|n<*Tw(~-n+${dRBcWZo0(ecddK1Ih&KRsC--%t*c9D*yYQTer$ z&pGiFxoXr8+8~#xZ=hZmCt+>MU5ft2(;RXo=%0!O@51lM{eo*KNyjU4R~2ji8U+7& zG$Q6@`1kRGS}$_?RIC4CP7I?|r5;FrCFOJK>+lK1pSJ#}Bg9mF0`)I3A3jxr!!1l_ z9m~z*G*+T4Ax?{_P``?0vG!%Y-uyj*HXVi4$Lfk7>kp0rOWG#>|A}gg00?= z_WG2hBP;dN+RrIux>4>?rjopFCnR+oX(t^e-^7xuEcahFKbuW#>TsW8;JF9 zOLcrnpO3W_?^3Q&PE*=h<9F1Td;NTWmLbkZEgW^!#m@Bo2_q;Wl#S$1Q~1z1b7>1C zmvpqEa*SMKOH9Xj+TF!A;WQGXs9z_!2A5Gjr2Y@3ByEj}f1>D1`77nW9S!KK<0SnW z;tt~UIE%7}dL8mQ&SDDUXx)DuyC^A0X2vMWXo`-4FgDRHZZ~x7F+7`*R(C z>QnrfHXRx59R0xf7rB9yC6qU`rSbKkKk-(7=D$hhBgzO)s(?D;u{iqSGV=PZhC%h3NYB|YVg?%P~SN*YJZU0E@`Tak1IGCF#j z{mAtrj-~8Z1IO>QH6h=WqN5aXUrcUsS?bHFFCzblGK1nr*+9{e5^LcdU&PJ#^4<;U zOK{!>I!ApXopw+LQ|HH=Qx#`Yx>MKhH$^EqC^~+oT&6UmJ&2NY^rCW`_#_^qbf=!* z=2$^}G9{Zn$oZ*Epsc2G5DugBMAT7}++6JJi+Eh|4!Nb66%XOpcni7tzT+L@PdR^u z#ksK%xeJt!ssD*>a1dp_cm32jw$Y$t4P~m;cQQ~5>bWsL`P=GX$2sfsyT$wI^OE{E z*qgSo*4~r2H03qr8o5MDY05l`Z~l%{c2FwQA(ZkCr4U8OIm&upji2JCctiiR^r>n6 zl*>rTN&XPIN|bSw{**oBQc`sMgZygcJLdQ~J)KWT{74y2$D|{Y_zdMWiCuV_Qh?Hq zJ~hbQrv5Hv3Ps0e%28j<`=c-Uo>UJ~qNsnyc`JO6dpa_&$=tBnno-yB*26hKemuD- z?1ucq7$-CJOw=o2f8tftPg(z5^UQd*KrX6J;{KOJ!+@+~MyM;mgHl*<$yRm^PoDip4~ z(uGo=a*f7saUC6=P;XC3Iv$YMk&HHtJ%+drm3x#R>W3(^$?vs(>KjjKtqR8{^c#cU z>tv1uy>3&z`v3Z~l?~9G>|x4h)><2Xp`@n$nGLd(dI55GDSgQK@mxG4SD$#G^$D=? z>fvZ|&uE)L$)@|C!X6}I-~V;{A)S7pyk{pD#~hT4lq~ewf_ZTjFvWTxo& zfHI7J`oFrLlKX>tEM*}@M+Xn@b5o5D^DNPT`V~qj@lTYGsW-QiB8bOO|5~x-@=)zT zNjmUq!|PUqtU$tcaKm!ce_p&7ADy$JP0ijI1e zz0`}5AK}aJZ(prVVGt#g0+D{Y0b~+pL9GVe}r-YR zr2Zale^TFr$%w<$nd6iV7(#sk?QO9s>PU^9a51GM^}p$R6u+hPvGdgL0cA=!$=xK2 zTf-oH>H9FNi;l^#N)K`)V zAl7k@xHI{rqa1Nj{bKkx$)%LvNz9^5qNl`lKa3 zNgTwab*SsOLMczVM4wBvy^nvZfn%J052;0RIKh1zWGntfe8A$})H6~qg$3xFhWbZ1 znOMgK>K(}Cw*HU2wC}%K9!pyzO49KKmG|hE8mD7*RVq<#P9m6Qk>O z2~51*_*?(PeNEE@%)Qe5!Q87Y`UMQ?9g{e?Wlz7kk6L9+3~#;MKk@6fHT)7Yw?7=1 z_-l0jFgGeLreE()L!$-^>>JmqTTIk|n1KU(#C9tZ)v-%V*G_|a59}D#V?flv?lDn= z29S^HG$6_vinQuGC@Q*BtWJsQOOLpJ57H^NOVohAePW^p#>DmM5!ZOqLk4 zY>9tj%9SAjb92YvoSSuZx8!%$j=wp1(cFWpqY_W7uIrcn&eXBD$L@A+P1${S(yW`4 zSKM6`pIBvWgnweE^*Q|#=WqBbFtNq9iRs+idnVuBxb^1Vc{j(+y19Ab&9Uo#|9ZOZ z*{y|J@9tT6XG{F;PuJaEJl<=*HGlWbuV*=Tw(PsTcZ;3<$==`g#Q)#Vc5WvoUOSjA LRbrL1n^XM{*><-> diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 4c0305a50..1dd36ba15 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Jumpserver 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-16 16:03+0800\n" +"POT-Creation-Date: 2018-10-23 20:30+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -34,8 +34,8 @@ msgid "Test if the assets under the node are connectable: {}" msgstr "测试节点下资产是否可连接: {}" #: assets/forms/asset.py:27 assets/models/asset.py:83 assets/models/user.py:113 -#: assets/templates/assets/asset_detail.html:183 -#: assets/templates/assets/asset_detail.html:191 +#: assets/templates/assets/asset_detail.html:187 +#: assets/templates/assets/asset_detail.html:195 #: assets/templates/assets/system_user_asset.html:95 perms/models.py:32 msgid "Nodes" msgstr "节点管理" @@ -43,7 +43,7 @@ msgstr "节点管理" #: assets/forms/asset.py:30 assets/forms/asset.py:69 assets/forms/asset.py:112 #: assets/forms/asset.py:116 assets/models/asset.py:88 #: assets/models/cluster.py:19 assets/models/user.py:73 -#: assets/templates/assets/asset_detail.html:73 templates/_nav.html:24 +#: assets/templates/assets/asset_detail.html:77 templates/_nav.html:24 #: xpack/plugins/cloud/models.py:137 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:67 #: xpack/plugins/orgs/templates/orgs/org_list.html:18 @@ -110,6 +110,7 @@ msgstr "选择资产" #: assets/templates/assets/domain_gateway_list.html:58 #: assets/templates/assets/system_user_asset.html:52 #: assets/templates/assets/user_asset_list.html:163 +#: common/templates/common/replay_storage_create.html:60 msgid "Port" msgstr "端口" @@ -154,8 +155,10 @@ msgstr "不能包含特殊字符" #: assets/templates/assets/label_list.html:14 #: assets/templates/assets/system_user_detail.html:58 #: assets/templates/assets/system_user_list.html:29 common/models.py:30 -#: common/templates/common/terminal_setting.html:72 -#: common/templates/common/terminal_setting.html:90 ops/models/adhoc.py:37 +#: common/templates/common/command_storage_create.html:41 +#: common/templates/common/replay_storage_create.html:44 +#: common/templates/common/terminal_setting.html:80 +#: common/templates/common/terminal_setting.html:102 ops/models/adhoc.py:37 #: ops/templates/ops/task_detail.html:59 ops/templates/ops/task_list.html:35 #: orgs/models.py:12 perms/models.py:28 #: perms/templates/perms/asset_permission_detail.html:62 @@ -243,7 +246,9 @@ msgstr "自动推送系统用户到资产" msgid "" "1-100, High level will be using login asset as default, if user was granted " "more than 2 system user" -msgstr "1-100, 1最低优先级，100最高优先级。授权多个用户时，高优先级的系统用户将会作为默认登录用户" +msgstr "" +"1-100, 1最低优先级，100最高优先级。授权多个用户时，高优先级的系统用户将会作为" +"默认登录用户" #: assets/forms/user.py:155 msgid "" @@ -281,7 +286,7 @@ msgid "Hostname" msgstr "主机名" #: assets/models/asset.py:75 assets/models/domain.py:49 -#: assets/models/user.py:117 +#: assets/models/user.py:117 assets/templates/assets/asset_detail.html:73 #: assets/templates/assets/domain_gateway_list.html:59 #: assets/templates/assets/system_user_detail.html:70 #: assets/templates/assets/system_user_list.html:31 @@ -290,14 +295,14 @@ msgstr "主机名" msgid "Protocol" msgstr "协议" -#: assets/models/asset.py:77 assets/templates/assets/asset_detail.html:97 +#: assets/models/asset.py:77 assets/templates/assets/asset_detail.html:101 #: assets/templates/assets/user_asset_list.html:165 msgid "Platform" msgstr "系统平台" #: assets/models/asset.py:84 assets/models/cmd_filter.py:20 #: assets/models/domain.py:52 assets/models/label.py:21 -#: assets/templates/assets/asset_detail.html:105 +#: assets/templates/assets/asset_detail.html:109 #: assets/templates/assets/user_asset_list.html:169 msgid "Is active" msgstr "激活" @@ -306,19 +311,19 @@ msgstr "激活" msgid "Public IP" msgstr "公网IP" -#: assets/models/asset.py:92 assets/templates/assets/asset_detail.html:113 +#: assets/models/asset.py:92 assets/templates/assets/asset_detail.html:117 msgid "Asset number" msgstr "资产编号" -#: assets/models/asset.py:96 assets/templates/assets/asset_detail.html:77 +#: assets/models/asset.py:96 assets/templates/assets/asset_detail.html:81 msgid "Vendor" msgstr "制造商" -#: assets/models/asset.py:98 assets/templates/assets/asset_detail.html:81 +#: assets/models/asset.py:98 assets/templates/assets/asset_detail.html:85 msgid "Model" msgstr "型号" -#: assets/models/asset.py:100 assets/templates/assets/asset_detail.html:109 +#: assets/models/asset.py:100 assets/templates/assets/asset_detail.html:113 msgid "Serial number" msgstr "序列号" @@ -338,7 +343,7 @@ msgstr "CPU核数" msgid "CPU vcpus" msgstr "CPU总数" -#: assets/models/asset.py:108 assets/templates/assets/asset_detail.html:89 +#: assets/models/asset.py:108 assets/templates/assets/asset_detail.html:93 msgid "Memory" msgstr "内存" @@ -350,7 +355,7 @@ msgstr "硬盘大小" msgid "Disk info" msgstr "硬盘信息" -#: assets/models/asset.py:115 assets/templates/assets/asset_detail.html:101 +#: assets/models/asset.py:115 assets/templates/assets/asset_detail.html:105 #: assets/templates/assets/user_asset_list.html:166 msgid "OS" msgstr "操作系统" @@ -368,7 +373,7 @@ msgid "Hostname raw" msgstr "主机名原始" #: assets/models/asset.py:125 assets/templates/assets/asset_create.html:34 -#: assets/templates/assets/asset_detail.html:220 +#: assets/templates/assets/asset_detail.html:224 #: assets/templates/assets/asset_update.html:39 templates/_nav.html:26 msgid "Labels" msgstr "标签管理" @@ -377,7 +382,7 @@ msgstr "标签管理" #: assets/models/cluster.py:28 assets/models/cmd_filter.py:24 #: assets/models/cmd_filter.py:54 assets/models/group.py:21 #: assets/templates/assets/admin_user_detail.html:68 -#: assets/templates/assets/asset_detail.html:117 +#: assets/templates/assets/asset_detail.html:121 #: assets/templates/assets/cmd_filter_detail.html:77 #: assets/templates/assets/domain_detail.html:72 #: assets/templates/assets/system_user_detail.html:100 @@ -412,7 +417,7 @@ msgstr "创建日期" #: assets/models/domain.py:51 assets/models/group.py:23 #: assets/models/label.py:22 assets/templates/assets/admin_user_detail.html:72 #: assets/templates/assets/admin_user_list.html:32 -#: assets/templates/assets/asset_detail.html:125 +#: assets/templates/assets/asset_detail.html:129 #: assets/templates/assets/cmd_filter_detail.html:65 #: assets/templates/assets/cmd_filter_list.html:27 #: assets/templates/assets/cmd_filter_rule_list.html:62 @@ -533,8 +538,10 @@ msgstr "过滤器" #: assets/models/cmd_filter.py:46 #: assets/templates/assets/cmd_filter_rule_list.html:58 #: audits/templates/audits/login_log_list.html:50 -#: common/templates/common/terminal_setting.html:73 -#: common/templates/common/terminal_setting.html:91 +#: common/templates/common/command_storage_create.html:31 +#: common/templates/common/replay_storage_create.html:31 +#: common/templates/common/terminal_setting.html:81 +#: common/templates/common/terminal_setting.html:103 msgid "Type" msgstr "类型" @@ -568,6 +575,8 @@ msgstr "每行一个命令" #: assets/templates/assets/system_user_list.html:38 audits/models.py:37 #: audits/templates/audits/operate_log_list.html:41 #: audits/templates/audits/operate_log_list.html:67 +#: common/templates/common/terminal_setting.html:82 +#: common/templates/common/terminal_setting.html:104 #: ops/templates/ops/adhoc_history.html:59 ops/templates/ops/task_adhoc.html:64 #: ops/templates/ops/task_history.html:65 ops/templates/ops/task_list.html:42 #: perms/templates/perms/asset_permission_list.html:60 @@ -843,10 +852,12 @@ msgstr "其它" #: assets/templates/assets/gateway_create_update.html:58 #: assets/templates/assets/label_create_update.html:18 #: common/templates/common/basic_setting.html:61 +#: common/templates/common/command_storage_create.html:81 #: common/templates/common/email_setting.html:62 #: common/templates/common/ldap_setting.html:62 +#: common/templates/common/replay_storage_create.html:139 #: common/templates/common/security_setting.html:70 -#: common/templates/common/terminal_setting.html:106 +#: common/templates/common/terminal_setting.html:68 #: perms/templates/perms/asset_permission_create_update.html:69 #: terminal/templates/terminal/terminal_update.html:47 #: users/templates/users/_user.html:46 @@ -874,10 +885,12 @@ msgstr "重置" #: assets/templates/assets/gateway_create_update.html:59 #: assets/templates/assets/label_create_update.html:19 #: common/templates/common/basic_setting.html:62 +#: common/templates/common/command_storage_create.html:82 #: common/templates/common/email_setting.html:63 #: common/templates/common/ldap_setting.html:63 +#: common/templates/common/replay_storage_create.html:140 #: common/templates/common/security_setting.html:71 -#: common/templates/common/terminal_setting.html:108 +#: common/templates/common/terminal_setting.html:70 #: perms/templates/perms/asset_permission_create_update.html:70 #: terminal/templates/terminal/command_list.html:103 #: terminal/templates/terminal/session_list.html:127 @@ -945,12 +958,12 @@ msgid "Quick update" msgstr "快速更新" #: assets/templates/assets/admin_user_assets.html:72 -#: assets/templates/assets/asset_detail.html:168 +#: assets/templates/assets/asset_detail.html:172 msgid "Test connective" msgstr "测试可连接性" #: assets/templates/assets/admin_user_assets.html:75 -#: assets/templates/assets/asset_detail.html:171 +#: assets/templates/assets/asset_detail.html:175 #: assets/templates/assets/system_user_asset.html:75 #: assets/templates/assets/system_user_asset.html:161 #: assets/templates/assets/system_user_detail.html:151 @@ -1003,6 +1016,8 @@ msgstr "更新" #: assets/templates/assets/label_list.html:39 #: assets/templates/assets/system_user_detail.html:30 #: assets/templates/assets/system_user_list.html:93 audits/models.py:33 +#: common/templates/common/terminal_setting.html:90 +#: common/templates/common/terminal_setting.html:112 #: ops/templates/ops/task_list.html:72 #: perms/templates/perms/asset_permission_detail.html:34 #: perms/templates/perms/asset_permission_list.html:201 @@ -1031,12 +1046,13 @@ msgid "Select nodes" msgstr "选择节点" #: assets/templates/assets/admin_user_detail.html:100 -#: assets/templates/assets/asset_detail.html:200 +#: assets/templates/assets/asset_detail.html:204 #: assets/templates/assets/asset_list.html:633 #: assets/templates/assets/cmd_filter_detail.html:106 #: assets/templates/assets/system_user_asset.html:112 #: assets/templates/assets/system_user_detail.html:182 -#: assets/templates/assets/system_user_list.html:143 templates/_modal.html:22 +#: assets/templates/assets/system_user_list.html:143 +#: common/templates/common/terminal_setting.html:165 templates/_modal.html:22 #: terminal/templates/terminal/session_detail.html:108 #: users/templates/users/user_detail.html:382 #: users/templates/users/user_detail.html:408 @@ -1096,28 +1112,28 @@ msgstr "选择需要修改属性" msgid "Select all" msgstr "全选" -#: assets/templates/assets/asset_detail.html:85 +#: assets/templates/assets/asset_detail.html:89 msgid "CPU" msgstr "CPU" -#: assets/templates/assets/asset_detail.html:93 +#: assets/templates/assets/asset_detail.html:97 msgid "Disk" msgstr "硬盘" -#: assets/templates/assets/asset_detail.html:121 +#: assets/templates/assets/asset_detail.html:125 #: users/templates/users/user_detail.html:115 #: users/templates/users/user_profile.html:104 msgid "Date joined" msgstr "创建日期" -#: assets/templates/assets/asset_detail.html:137 +#: assets/templates/assets/asset_detail.html:141 #: terminal/templates/terminal/session_detail.html:81 #: users/templates/users/user_detail.html:134 #: users/templates/users/user_profile.html:142 msgid "Quick modify" msgstr "快速修改" -#: assets/templates/assets/asset_detail.html:143 +#: assets/templates/assets/asset_detail.html:147 #: assets/templates/assets/asset_list.html:95 #: assets/templates/assets/user_asset_list.html:47 perms/models.py:34 #: perms/models.py:82 @@ -1134,15 +1150,15 @@ msgstr "快速修改" msgid "Active" msgstr "激活中" -#: assets/templates/assets/asset_detail.html:160 +#: assets/templates/assets/asset_detail.html:164 msgid "Refresh hardware" msgstr "更新硬件信息" -#: assets/templates/assets/asset_detail.html:163 +#: assets/templates/assets/asset_detail.html:167 msgid "Refresh" msgstr "刷新" -#: assets/templates/assets/asset_detail.html:300 +#: assets/templates/assets/asset_detail.html:304 #: users/templates/users/user_detail.html:301 #: users/templates/users/user_detail.html:328 msgid "Update successfully!" @@ -1271,6 +1287,7 @@ msgstr "删除选择资产" #: assets/templates/assets/asset_list.html:631 #: assets/templates/assets/system_user_list.html:141 +#: common/templates/common/terminal_setting.html:163 #: users/templates/users/user_detail.html:380 #: users/templates/users/user_detail.html:406 #: users/templates/users/user_detail.html:474 @@ -1747,22 +1764,34 @@ msgstr "用户管理" msgid "Login log" msgstr "登录日志" -#: common/api.py:18 +#: common/api.py:22 msgid "Test mail sent to {}, please check" msgstr "邮件已经发送{}, 请检查" -#: common/api.py:42 +#: common/api.py:46 msgid "Test ldap success" msgstr "连接LDAP成功" -#: common/api.py:72 +#: common/api.py:76 msgid "Search no entry matched in ou {}" msgstr "在ou:{}中没有匹配条目" -#: common/api.py:81 +#: common/api.py:85 msgid "Match {} s users" msgstr "匹配 {} 个用户" +#: common/api.py:107 common/api.py:138 +msgid "Error: Account invalid" +msgstr "" + +#: common/api.py:110 common/api.py:141 +msgid "Create succeed" +msgstr "创建成功" + +#: common/api.py:127 common/api.py:157 +msgid "Delete succeed" +msgstr "删除成功" + #: common/const.py:6 #, python-format msgid "%(name)s was created successfully" @@ -1879,120 +1908,98 @@ msgid "Enable LDAP auth" msgstr "启用LDAP认证" #: common/forms.py:139 -msgid "List sort by" -msgstr "资产列表排序" - -#: common/forms.py:142 -msgid "Heartbeat interval" -msgstr "心跳间隔" - -#: common/forms.py:142 ops/models/adhoc.py:38 -msgid "Units: seconds" -msgstr "单位: 秒" - -#: common/forms.py:145 msgid "Password auth" msgstr "密码认证" -#: common/forms.py:148 +#: common/forms.py:142 msgid "Public key auth" msgstr "密钥认证" -#: common/forms.py:151 common/templates/common/terminal_setting.html:68 -#: terminal/forms.py:30 terminal/models.py:22 -msgid "Command storage" -msgstr "命令存储" +#: common/forms.py:145 +msgid "Heartbeat interval" +msgstr "心跳间隔" -#: common/forms.py:152 -msgid "" -"Set terminal storage setting, `default` is the using as default,You can set " -"other storage and some terminal using" -msgstr "设置终端命令存储，default是默认用的存储方式" +#: common/forms.py:145 ops/models/adhoc.py:38 +msgid "Units: seconds" +msgstr "单位: 秒" -#: common/forms.py:157 common/templates/common/terminal_setting.html:86 -#: terminal/forms.py:35 terminal/models.py:23 -msgid "Replay storage" -msgstr "录像存储" +#: common/forms.py:148 +msgid "List sort by" +msgstr "资产列表排序" -#: common/forms.py:158 -msgid "" -"Set replay storage setting, `default` is the using as default,You can set " -"other storage and some terminal using" -msgstr "设置终端录像存储，default是默认用的存储方式" - -#: common/forms.py:168 +#: common/forms.py:172 msgid "MFA Secondary certification" msgstr "MFA 二次认证" -#: common/forms.py:170 +#: common/forms.py:174 msgid "" "After opening, the user login must use MFA secondary authentication (valid " "for all users, including administrators)" msgstr "开启后，用户登录必须使用MFA二次认证（对所有用户有效，包括管理员）" -#: common/forms.py:177 +#: common/forms.py:181 msgid "Limit the number of login failures" msgstr "限制登录失败次数" -#: common/forms.py:182 +#: common/forms.py:186 msgid "No logon interval" msgstr "禁止登录时间间隔" -#: common/forms.py:184 +#: common/forms.py:188 msgid "" "Tip :(unit/minute) if the user has failed to log in for a limited number of " "times, no login is allowed during this time interval." msgstr "" "提示: (单位: 分钟) 当用户登录失败次数达到限制后，那么在此时间间隔内禁止登录." -#: common/forms.py:190 +#: common/forms.py:194 msgid "Connection max idle time" msgstr "SSH最大空闲时间" -#: common/forms.py:192 +#: common/forms.py:196 msgid "" "If idle time more than it, disconnect connection(only ssh now) Unit: minute" msgstr "提示: (单位: 分钟) 如果超过该配置没有操作，连接会被断开(仅ssh) " -#: common/forms.py:198 +#: common/forms.py:202 msgid "Password minimum length" msgstr "密码最小长度 " -#: common/forms.py:204 +#: common/forms.py:208 msgid "Must contain capital letters" msgstr "必须包含大写字母" -#: common/forms.py:206 +#: common/forms.py:210 msgid "" "After opening, the user password changes and resets must contain uppercase " "letters" msgstr "开启后，用户密码修改、重置必须包含大写字母" -#: common/forms.py:212 +#: common/forms.py:216 msgid "Must contain lowercase letters" msgstr "必须包含小写字母" -#: common/forms.py:213 +#: common/forms.py:217 msgid "" "After opening, the user password changes and resets must contain lowercase " "letters" msgstr "开启后，用户密码修改、重置必须包含小写字母" -#: common/forms.py:219 +#: common/forms.py:223 msgid "Must contain numeric characters" msgstr "必须包含数字字符" -#: common/forms.py:220 +#: common/forms.py:224 msgid "" "After opening, the user password changes and resets must contain numeric " "characters" msgstr "开启后，用户密码修改、重置必须包含数字字符" -#: common/forms.py:226 +#: common/forms.py:230 msgid "Must contain special characters" msgstr "必须包含特殊字符" -#: common/forms.py:227 +#: common/forms.py:231 msgid "" "After opening, the user password changes and resets must contain special " "characters" @@ -2016,7 +2023,7 @@ msgstr "启用" #: common/templates/common/ldap_setting.html:15 #: common/templates/common/security_setting.html:15 #: common/templates/common/terminal_setting.html:16 -#: common/templates/common/terminal_setting.html:46 common/views.py:20 +#: common/templates/common/terminal_setting.html:46 common/views.py:22 msgid "Basic setting" msgstr "基本设置" @@ -2024,7 +2031,7 @@ msgstr "基本设置" #: common/templates/common/email_setting.html:18 #: common/templates/common/ldap_setting.html:18 #: common/templates/common/security_setting.html:18 -#: common/templates/common/terminal_setting.html:20 common/views.py:46 +#: common/templates/common/terminal_setting.html:20 common/views.py:48 msgid "Email setting" msgstr "邮件设置" @@ -2032,7 +2039,7 @@ msgstr "邮件设置" #: common/templates/common/email_setting.html:21 #: common/templates/common/ldap_setting.html:21 #: common/templates/common/security_setting.html:21 -#: common/templates/common/terminal_setting.html:24 common/views.py:72 +#: common/templates/common/terminal_setting.html:24 common/views.py:74 msgid "LDAP setting" msgstr "LDAP设置" @@ -2040,7 +2047,7 @@ msgstr "LDAP设置" #: common/templates/common/email_setting.html:24 #: common/templates/common/ldap_setting.html:24 #: common/templates/common/security_setting.html:24 -#: common/templates/common/terminal_setting.html:28 common/views.py:102 +#: common/templates/common/terminal_setting.html:28 common/views.py:105 msgid "Terminal setting" msgstr "终端设置" @@ -2048,10 +2055,72 @@ msgstr "终端设置" #: common/templates/common/email_setting.html:27 #: common/templates/common/ldap_setting.html:27 #: common/templates/common/security_setting.html:27 -#: common/templates/common/terminal_setting.html:31 common/views.py:130 +#: common/templates/common/terminal_setting.html:31 common/views.py:157 msgid "Security setting" msgstr "安全设置" +#: common/templates/common/command_storage_create.html:50 +#: ops/models/adhoc.py:159 ops/templates/ops/adhoc_detail.html:53 +#: ops/templates/ops/task_adhoc.html:59 ops/templates/ops/task_list.html:38 +msgid "Hosts" +msgstr "主机" + +#: common/templates/common/command_storage_create.html:53 +msgid "Tips: If there are multiple hosts, separate them with a comma (,)" +msgstr "提示: 如果有多台主机，请使用逗号 ( , ) 进行分割" + +#: common/templates/common/command_storage_create.html:65 +msgid "Index" +msgstr "索引" + +#: common/templates/common/command_storage_create.html:72 +msgid "Doc type" +msgstr "文档类型" + +#: common/templates/common/replay_storage_create.html:53 +#: templates/index.html:91 +msgid "Host" +msgstr "主机" + +#: common/templates/common/replay_storage_create.html:67 +msgid "Bucket" +msgstr "桶名称" + +#: common/templates/common/replay_storage_create.html:74 +msgid "Access key" +msgstr "" + +#: common/templates/common/replay_storage_create.html:81 +msgid "Secret key" +msgstr "" + +#: common/templates/common/replay_storage_create.html:88 +msgid "Container name" +msgstr "容器名称" + +#: common/templates/common/replay_storage_create.html:95 +msgid "Account name" +msgstr "账户名称" + +#: common/templates/common/replay_storage_create.html:102 +msgid "Account key" +msgstr "账户密钥" + +#: common/templates/common/replay_storage_create.html:109 +msgid "Endpoint" +msgstr "端点" + +#: common/templates/common/replay_storage_create.html:116 +msgid "Endpoint suffix" +msgstr "端点后缀" + +#: common/templates/common/replay_storage_create.html:130 +#: xpack/plugins/cloud/models.py:206 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:83 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:64 +msgid "Region" +msgstr "地域" + #: common/templates/common/security_setting.html:42 msgid "User login settings" msgstr "用户登录设置" @@ -2060,20 +2129,65 @@ msgstr "用户登录设置" msgid "Password check rule" msgstr "密码校验规则" +#: common/templates/common/terminal_setting.html:76 terminal/forms.py:33 +#: terminal/models.py:22 +msgid "Command storage" +msgstr "命令存储" + +#: common/templates/common/terminal_setting.html:95 +#: common/templates/common/terminal_setting.html:117 +#: perms/templates/perms/asset_permission_asset.html:97 +#: perms/templates/perms/asset_permission_detail.html:157 +#: perms/templates/perms/asset_permission_user.html:97 +#: perms/templates/perms/asset_permission_user.html:125 +#: users/templates/users/user_group_detail.html:95 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:93 +#: xpack/plugins/orgs/templates/orgs/org_detail.html:130 +msgid "Add" +msgstr "添加" + +#: common/templates/common/terminal_setting.html:98 terminal/forms.py:38 +#: terminal/models.py:23 +msgid "Replay storage" +msgstr "录像存储" + +#: common/templates/common/terminal_setting.html:151 +#, fuzzy +#| msgid "Delete succeed" +msgid "Delete success" +msgstr "删除成功" + +#: common/templates/common/terminal_setting.html:154 +msgid "Delete failed" +msgstr "删除失败" + +#: common/templates/common/terminal_setting.html:159 +msgid "Are you sure about deleting it?" +msgstr "您确定删除吗?" + #: common/validators.py:7 msgid "Special char not allowed" msgstr "不能包含特殊字符" -#: common/views.py:19 common/views.py:45 common/views.py:71 common/views.py:101 -#: common/views.py:129 templates/_nav.html:116 +#: common/views.py:21 common/views.py:47 common/views.py:73 common/views.py:104 +#: common/views.py:131 common/views.py:143 common/views.py:156 +#: templates/_nav.html:116 msgid "Settings" msgstr "系统设置" -#: common/views.py:30 common/views.py:56 common/views.py:84 common/views.py:114 -#: common/views.py:140 +#: common/views.py:32 common/views.py:58 common/views.py:86 common/views.py:117 +#: common/views.py:167 msgid "Update setting successfully, please restart program" msgstr "更新设置成功, 请手动重启程序" +#: common/views.py:132 +msgid "Create replay storage" +msgstr "创建录像存储" + +#: common/views.py:144 +msgid "Create command storage" +msgstr "创建命令存储" + #: jumpserver/views.py:180 msgid "" "
Luna is a separately deployed program, you need to deploy Luna, coco, " @@ -2117,11 +2231,6 @@ msgstr "模式" msgid "Options" msgstr "选项" -#: ops/models/adhoc.py:159 ops/templates/ops/adhoc_detail.html:53 -#: ops/templates/ops/task_adhoc.html:59 ops/templates/ops/task_list.html:38 -msgid "Hosts" -msgstr "主机" - #: ops/models/adhoc.py:160 msgid "Run as admin" msgstr "再次执行" @@ -2380,16 +2489,6 @@ msgstr "资产或资产组" msgid "Add asset to this permission" msgstr "添加资产" -#: perms/templates/perms/asset_permission_asset.html:97 -#: perms/templates/perms/asset_permission_detail.html:157 -#: perms/templates/perms/asset_permission_user.html:97 -#: perms/templates/perms/asset_permission_user.html:125 -#: users/templates/users/user_group_detail.html:95 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:93 -#: xpack/plugins/orgs/templates/orgs/org_detail.html:130 -msgid "Add" -msgstr "添加" - #: perms/templates/perms/asset_permission_asset.html:108 msgid "Add node to this permission" msgstr "添加节点" @@ -2665,10 +2764,6 @@ msgid "" "assets per user host per month, respectively." msgstr "以下图形分别描述一个月活跃用户和资产占所有用户主机的百分比" -#: templates/index.html:91 -msgid "Host" -msgstr "主机" - #: templates/index.html:106 templates/index.html:121 msgid "Top 10 assets in a week" msgstr "一周Top10资产" @@ -2787,12 +2882,12 @@ msgstr "输入" msgid "Session" msgstr "会话" -#: terminal/forms.py:31 +#: terminal/forms.py:34 msgid "Command can store in server db or ES, default to server, more see docs" msgstr "" "命令支持存储到服务器端数据库、ES中，默认存储的服务器端数据库，更多查看文档" -#: terminal/forms.py:36 +#: terminal/forms.py:39 msgid "" "Replay file can store in server disk, AWS S3, Aliyun OSS, default to server, " "more see docs" @@ -4160,12 +4255,6 @@ msgstr "同步实例任务历史" msgid "Instance" msgstr "实例" -#: xpack/plugins/cloud/models.py:206 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:83 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:64 -msgid "Region" -msgstr "地域" - #: xpack/plugins/cloud/providers/base.py:73 msgid "任务执行开始: {}" msgstr "" @@ -4339,6 +4428,16 @@ msgstr "创建组织" msgid "Update org" msgstr "更新组织" +#~ msgid "" +#~ "Set terminal storage setting, `default` is the using as default,You can " +#~ "set other storage and some terminal using" +#~ msgstr "设置终端命令存储，default是默认用的存储方式" + +#~ msgid "" +#~ "Set replay storage setting, `default` is the using as default,You can set " +#~ "other storage and some terminal using" +#~ msgstr "设置终端录像存储，default是默认用的存储方式" + #~ msgid "Sync instance task detail" #~ msgstr "同步实例任务详情"