From ceb8b2f5b30cc14d4cdb99f3c852593b97868dde Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 22 Mar 2019 17:16:02 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/locale/zh/LC_MESSAGES/django.mo | Bin 67181 -> 69760 bytes apps/locale/zh/LC_MESSAGES/django.po | 400 ++++++++++++++++++--------- apps/settings/utils.py | 5 +- 3 files changed, 275 insertions(+), 130 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 39667dc97a5e6b8eddfe43447b2cc6910b16475f..7196bfa06fc852332f3287f7f17f6c56a1276e04 100644 GIT binary patch delta 22396 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 delta 19968 zcmYk^2Xqz1+sE-uA&^i)4JDz3UPA{dO79)%gc>>sNbi>(DWN2^i1a31yoi8^^deml zq!*D63d&!qyx-s5hxf4OjGuX)nVp%P-Mu#fj$@YvKAs-vxt2C?uEQ}mz;Pn*0RK50 z=s11KDeE|2)OVaXoPr}TV*|&Tit#uWvo>^`vwn`V8290T#*P#2?>MEKlBc~%Gk4rP z%^fE#aa9b)=9s~8JWdBHK_muaN*smBaVm!4Jj{+8k##vIusHsL6)~`d<3wQZPs0(|Hq4*jzV)E9U&-_jf47K7?s0Dn2+OoEo4Etg@4n-{>!SYKm zC-K*)^Nyi*>KSU>D}apRoWw z#eNvx)^P^nG~~8B@98tu9om4Ah0u|Yd`0h8LX|Jtf)B(wwZ)-VsN6Mu!ew>MD> zOWoeR@|>t=A_}$T4N(j1jJopvs4Ey8qHftb%z%e53tmC(@V_1^T0qi{?n4uX zYRHOOVG-2CwXw(AxqaMP+sHc83>K4pJ=J7ZisA#}# zsFnYSneh~A3-4nle1+P9bUcw-U`8|2EM%58E1}++I;e4)VmXXK&9?}X>iu6yMOUx^ zb;2&x1P3t+PhnB~4|PRRG49TkMD0vD)Germy3%H5H0C7kf;BM~b%7^QJ8%OtFu(IJ z6>VM0F787Tf!e|nW=+%%v_UO&AZo%17SBR0d?{)HYf+yYTTl}nKrQsLwckh0_Y^(a z8mFtfMQKn2{Iam^xqPF}Ts{duwTk)VP z`>!nt>gHZiCe%Zc2XzZRM!hz*P_Iop)D;awUC~U`fQwK&vH^AFJ5X=UanyxeK+W?A zHQs-y1*Y%L{%e37-Q9<-s96U!Pze(2FdUj@G5UxV) z)CSbVJ5l`(q2~3Rr=k`AfjZ#;zoVXszmW&n3Hpq0OzeYE zn24JA2x`G6QR7`gO?V5n<@ZtJzrZAV|NZ*99h0IuhGI$#!xWesb6|0co1zBjfa>1^ zHBmp*#6vAV0rj>_MfG21?d!~K=qW|RJ}R2%U)02b{oIEuE$Yg1qb4YY>Q@o<5nTs$ z?_)3md!U|yNvH{DqHf^=)N8!~bKn8gPX5u4{nr35NEF4lsHeI}fA>l%p$4vp>emA` z!Dki^MNKpcwXjL3TM&=xw*d3va`eZe=5f?V^Qr#qzbem2)WZy)yI+r;Pz#F3NZf}l z@HW=L3Ip6Ln}oUriKqoE#Zc z#EGaY`yO>gdr&)Y$l_zD1)f3O8owcK|6tSt(xP@C(kz5&h)ZKytc4oi)5a<>sC(ZB z^-PRF4X_z?B|FT6sJG>e#aB>Ue9!WsL*0dD!PMll;|45-JYLRK48Z!seB*kY##FR* z(Woo!iJG7vYHLTJ7B&vUaHh4d#tg(;P*-x;;?o#Pd)LL_H%jPy=m2_1}ZqnG>i5U&K6k8+9QeBiwvyRKIZ4PUW+F zLk!mY-F(Yn7?a)Eg!j7XJ*2}0Zev7&gzme|inicg7 zl*LR~2R)j&GnE3^8#TdP)JoT)cHlJX%6>;p6gLt5&!Hy1h+5Dij6i3!`(=_9vlCV{qft9I3U&Tu)P+q$ z?cf~CFGKCzYSib!?$PYOPTWgE6C6XGcn|gTK1JPI|1s{?rNnUJ?5K$z-E}b?YjbpQ5(DJL(zmAUor67Pu8>Evmy#)YkoidhKqTNyoWgvjtJ@ ztx-GC8+A)Yn)6XR;YBU@2XilK!G}?|;xuN^`~Q%Nw#08dtHtz~51V0b9EEx~mthos zkJ^ztr~x0E|Dbm4E$S8|pWrSeBWj`9QT>aWAEEF4uR=w)pdPAY3oL=%P*<9Wns7bp z8Tbb4;X%{_(@b>VhBByI(*ku1+nK#kJ24dXu#ZOdi$#y_#SALivNf0uH=~}~lc=q_ zjvC+<>O^Of+dnBP4n;i!VW=z5gW9p;sAr;<<%gpBO~CvZKZ*U<06&mugZr#Q*2!+i z!kC171=Px`pmv}h>Z$LD8gLHkvwj5@#+{fI?^-@dth@CQs9Tf=gRo>Q_g|IrBm%Jt zYQmZrfc33oW7L+mL@lHX>Pq{fo}Cevk3%hNJ{G`ZmVb_#_?^Wmzi`LN=%J#9NKA%B zF%N!ZaeLG=(H(WALs1K!j5#n4^^9yn_1lBGb*C{i-b5|@HR^RtHpLw$0yVFv5EVUq z?j=!XSy6lx)BPy=qmM))(Tf0n84j^st1R}QtXny4LafqLfJVs*X$ zgQ)2J-GO@le?_hAF($>=s0jn6xu!)uT#=}O%c7o%TGk$oT3ByPh91;7UzoEjzW|fy z{a;2UIUUwuKJ=ot_%dpxw=e`>TRv#IJ8()=zc4c^s$Xu@ghf#oQr6-cs0(R;`7s&; zncta2B^aloPMCvwsFs`Gpe@@48`Etu9;E!0$3VrVj3KUIdKN+A>4wxw}&ti z|3pokCY~Q`u^jT$J1bEA?|G;!qw*Gq;gSURBRJC>?jvzo+=*>bCxp%A!NEc}2){tx z)3;a*!{_mbjaVP^;=dS$+2*?oYhVsREzGloN?9t0u^hfbJ-y`?*e4?D-qpl$*aV;B zS=@$46Wtvd`z4>A#M`h0zQ7nPw9sAXOzcD)_!S@9*bPfEzjK(1p3>Kt2}2jTPkDX} zBd&~k*jkz~Wr=ma3M16F}qt2U$dK;FbE^IC8A>4w|djEG*(Lmvg-3|p& z4^;`&02MI})#J3ox_dmlDccQ|m z0Y5?w*bw!!_e2dm)SQeOcrF&i<){UnKs~g-p%!q@;#a6o*pQ{}Tag#_EY(7fRu)Y~ zE9!?DAQpAy^HBq>KyBT3=8ssB_#kSh{CR?VV+z#3!%(**4mD0Z>OvNyE^q_tg7z(A z|26O#61w7xs4Mvgb;3LBiYb@#AmKn%`x4Z^>rex2LmnpQAnI9qiRzbfh5I>?33VX_ zP|sKe)P*)%;c*A*Vu}8knuf7h8)u`g@Dgf4w^0juhMG9rO7}G_g6h`T8$Sx_s^h3Z!l^)Qx0?O}K>YN2tcg?i>wVV9kCxCQI4cJJMPs1pO$xTZ!;m=*OoksG71Jw{?2 z*1^q~+K*d+m5D>vx}OX6FhKpV1kT1>djAhlsYBu(YRgKjb9bNt>WX4e6AwV0I2<+c z2F#9^F&JN?Ze5b~?oNf_1me7?an_-3#SV*)VFN$z|0OEm>D)wm238@k>mOOHj9FJ*Lsb zTdC+u4q3w;EJ*yPnT5~Uti&~NEXH6Byp6i@f~+C}OPNjZ1aV)~Ev&fRwGL`0Tc8%! z4n6A7-x@}v;)&*LbFsPJ+>RRPAZh`}Eq~tp9W#;t%i`c2ZvQaUL!1>gPmvvLd(=9dVqw*Yw-v=Br>i`i(;^@CVdF_E~(~Jd5SYU-D4V`=8-Q_q{EJ zT5)ZQo0~mRA3&o~15Y#K%|z6BOU;euPSlnkw)ld@w^0l8{6j@o`k!^kx7!`46e?fE z;$G%Z%tn5q#Vb(v`Ww{N9<}(2#m`X-OZJm%2GoLby0OP8K}Ayn+|QhZI&UFrtG`B__bqD24k~7T=b9y+q9zR4>z&2QN$4k()~Epnqw?b|o@*{gUGZj%x0(Ab zf7-lY`D>_&A6op{+LIk{^PvaWf8Dd}By^>vQ4>_MxF%{rjV<5K>|*xD3bYTfcoVAs zcc=^4XZ~vWdlo-O&6mt`&|N@U)DGlFomd?;P)oCm`MI@^v3Rz**z)Vm-IhONUPC=} z56!?s?mV8XR5VdB)K-0rT3G{3iY+bQ!Sekui2QKWd1K8u^GkCL>O!`fhb?~zwUE1R z%>EyC2TEyX!5}*1vpCA)3aC%Os;GrFwtPp_Lb{uS%yH%n)OZWc<(Npk))zB>wIl8T zbTU5zYaegUMBTEl%gps zeK|bGd|2#fcYs!A2eTXMCz{VN56#Uy#E?7#c}sxNr!64 zi#nmC`7x?rEwiE79Q80oTRa$35RWpapmuPc#k?YSg&r|_I~uOKt(ic6qQ zsAyKRd|lLvn_0dKY9YN*J1_+Oai$rMQN(l21K5uEZ>)?>PPuyGsnj5G7OP_B(|nU* zG-{>$Q42bcx}vM7g*>qQE6hyncZS~uFdP@*2yBI!esN#7&#^ag^0V#--cV#*j}zxs zoH^z~b2(Pwgte%NA6ou}#qTUman4;}I#ju%H>&?DoQ5fX<@R7A2H+FaEqZ3YMeSs=^X`11Qty8R6%AAX zwUrgELkr8tSUd!EuP2}e`pV)J*1ik%x*bJ5OP5hs{D=7*GY}`a;2Ms;-~WqK(ZJQs zcBlmnLG8>Ga~@_PUV&P`Zp$Auf5H6ZuUnk#H+LZ!Fd6ymsPXcfrGMl8D^b-FjW9KF zwE3Ck$DkH84fPr>Ms4v?RR0s^HPn^=iMsNam=c38xF_w}N^h8Vt^J9`uTB3;?gE3&2(u{q9y+rrYP`zj9JZWjCskovv?wMzQ>tOMGIKzCY-I-;jnoQE75)vwV=qW z?gaT!_qw#jl~C>VF&sa&xSzETF(;U_d~*L6QPGL(%q`}2^C#4m9zuN%Ttr>rTQlUE z+ny11Aq6cikLuR|wX@=|SZuqu%=j)Hq+E@~cq`@ZPZZ{}&QE@j7atJJ=LoqF&4TH{CyGAB-Ak0cxP- z=4RCSyR3b`#V1fZdd}j*Z7Tka0jKn>K~j5cFX6ZSHPqIPT|7RNaj zA2QFQCcc9j?;TFSpx@nbrke9TRMcT5>dMxm2L2Aq;6c>HZ%``^zU_VjMxZ9Bg}T=r zQR56j^&f5VRCBhuz+7T_R#VXl8_k{OVe=en;+q!#gQbZ5{&4?>vkdB6uA|x89Ab_` zUC?y&Jp-7Bc(ogQoa5GT-n@ajk_VU-pQ08RddD@wEPz^A8H?*!+`{6XsELPQ5Kgvy zocX0s?*AG~Y(;J9UW+fGCb)~$@s;H(-E{}9k6Ku?#XT{IcsOdDvDgC>E%v|X=EG4t zQ3`{Y-}!`!2C88;MNQnn;sK_|oNgwXt5E}bQ49Fd@&_;p@fp-Dx`2i8mbHi8=T+58 zBdBNrrBMS^HS1siabt^{VK8x9i@TbA%z>zJMxY+bSPaBPmS1jeMqS{p`@H|EoFbux z+%jKV$Mg@}0V7fUqRc9&g*LOeEo$PvsBuPGJjdFXVN3E`El%;!9WVPs_MbP)DPf7Q zNA5rc%ra&*v$5IE>}3u$Ct@nbn~i$-mZBE=jkSM|5yS^9f74?P_sr*}|6_L{p{M~O zEY4*X!$|TUTYCr0PuvZ2;!N{f)QloCj3YA>gSy;g_gSzV%o{ zC!!vv)X&_%ddZ6eiJPLn6%V2B*}=5LuQ3!;{q6oFlnrYWm&O`627~bc2J!qkC#m>W ziv4J~g$J?eKYY<(rswWot!}}pYRBf7=YQ_c`y;V4@o8+0CI5B*F-sg)AijrMSne0@ z-;R~VG{p6#-v9PgbdUR^7BbYFXwJ6w#i;jr73#HIZ~4s_LcGo5y{HL~;0U~o$+5*t zcb?9u9q5T3RR&Vg38SsUEbA~IwUx`vEvNv@l9)gf_k|Av-a>;?lTjGI|e2r`bx zxlBb{`4DyDGt|@l#$tZd@U@4a21sLOvwR`5gjvq4j9Ne~9FA?!gXd7=H}msjJ~FMS zXyDGMh4jN>I0WUKJ=WX{(im>mMQ^$zP}BhiW>MZM&U6G$5*Hw4GVPR z>ZpZvMBnfK163h07C*r_Y=+0N4Mrx>O8FfTb>d`H|3qAXtF66Kke}}tj5?@W)DHcy zDP^5197S2-$5#KxpZ%{+q6d{oN?#ftQ*uzEh;>9#FX>jD5%kp+b+)(^ZEeV9xA;8~ zRI-!bMf+f!MA5^o;~R>8ejG?!vH(6(U)?8j>Bo&i#keTYf4fE zJ%-xa507K?ZACtU_E?IJoa7FXD?|MVWdU^^3BD(S%4Is7#5=fwa+P{zI;FxmioOqY zyrZorMW5d~3Nk?g{W4-V^6!uS)T@!}Vhebmmsx46Z+&lS+sj#}u^;s6PQD5QrwB+m z(=g1lgr-Dmo<`GY%2AqIQ0`Io5Whce5PK|cNHQJujUTkXAor3!mENCVrlHRc@;ZvJ zq)u+t`9p81zCojC{Dz`u^uuGQ4W0~NQJ!CBK{#S|5T78Q4SYH%6hI2xHtdBp@={xImk6d|j(Y{08a+Q6Jl-$t9tE9p!)2eLo42cV3aWNWw$M!x(}^QO7OX-XDvp%qGtl zqw^X0N7S!VDq7!z_>_EI&e!n~-Y3_adRa(cl!_n5>)tpPaJ}rNxJf!_c%f}LbZgr}TCybypl^S%?5pIqA z`sPfwIzJjZvD8OlY9`D?Uw+u}9qEb7(pHtIH+g+$d}Zf3HfB%aCiK(C`TL_Dail&8 zE0QTpu+2J;H`Q?(r3U3DWf`Rm{d5G;hp!1|JN4rD6ILeIpSq5f)U#j-i`Nr3aYY_n(Bzt)spHzoCVQMqI%6fnn;A4X|RDNU{qC#A(q#5$5v_@Z-CP&U{kz38Lk zEd6%4RsOA?d!!~eof1I#@Tl^$MFXs11cPau{Wd5+2sv4)e@c69%juM_i2KoT2A?7s zJ$H$YDa}#SmQk7dDax<3jmFO?ix{C7@dWEb%4tV#2=M~y4Q+-q^wBYgcnT$e_FKeX zTYG)#^QphVPxTai!U_Btjqez2o%UdNPMl9Rj`~>27@K$m{nJyn+BsWkn?hSP;{M2Q zHO_g;Ci=|8N0bKCb!5cvC_OmmHKlR@ckwNW8Jw-Z>QX0_k3;sxXLSrKa+)jxh zet&Eu|2O3Tr7Ug9@FAs^br`@HIjJ|KZ2);4_bGq+YVLn3(DwfD&9DEL#_t~_t57e* z$^4w=JF?JTmePu%e^Hj7@)6}GWjTF|k#A3(UmTsz)O9?kn`7bo8YBN&O4#P2X#{ zn|Kapz<#LTI(u;53EJmT-}L@dgu0WI@7r>zO~JLE4~ zzYGk1z}m-<`;xXCtL|8H=u1Kac%ldCU=>*GxZ;+_oK`rzC+RR2k~3lnp3V)mJzR}d{6nE_87*QKt0x< z=f6EcE|TN0Ek(yt8g&#l-G~opD(M(d$G6xH57FmaJYan%GDceK(?uOQej~n)$teYu z;3!WnpMHv1Pw+Z0bqJLNH^qTyRQ==c&h(cvYgC$5f3Xn%&Q$$v`jI`#ii`cg(x-X9g{ zx5t8s=3ksMn?7f7EoBVlyg&EbRAA8Y9|Gn>YkGNAQtu? zPN4rR%3(EdVRL+XYG-^~p4ROg$sU+c_(!`#$rryz0#uumTkw z9qDuq$CC@DoTAjH6r<>2K*E)TqvpFi^EplV1f5H{)v%K0m5C_nI908_Abr}26#s9h2{M*pS2yKExqM;llz2v zTS{x{^J&xZ3;uw^n4>)P4sPD#R3XvCP9CNcY52-_3O~sZXQI6+r37U=aiaBAmm$=D zp!`OCFXaK}cBJ1E>RTvRh$CokjrS>w$X%jzqztF{u0M>14s;rajYwsu-juS6`gjJb zr+yqwX^){yp(Lk$6#hubOnFNCT>P1Q4ot~;tElT(P8m$uVsRYpe^CEkaRendr5Ptg z;VY6S>Clq;Q}3ciyMw(eTSo>YT!}8}&C||5&^xTtF#m*iF`s&Sbm`&mE!TaXzxP(p z6@Ce`dwac|`=kx>t{Koic|wXYKY34$xe}D{!=(NRk)Gx41`BEQw-+Y@Y#9RNz zcm4^j_7wEa+!GVvt$Lt}e?r2cR^Atfs``7U9F6n$<~lybFJZ@t_1$&KU+F^ zLiqI~-Urvu2PK@i(;(s5(<})M@3u{MXVHZFiL>r*T6TBVWarM5X?MQb=?%D-A;6pG pVU&MDo5yv%TOMCY?Opd@{UqN91o}-4{yr|1UuM7gJ3{>q{~vO0UsM19 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 928042d92..9c40a44b2 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: 2019-03-22 16:48+0800\n" +"POT-Creation-Date: 2019-03-22 17:12+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -33,6 +33,7 @@ msgstr "测试节点下资产是否可连接: {}" #: assets/templates/assets/asset_detail.html:194 #: assets/templates/assets/asset_detail.html:202 #: assets/templates/assets/system_user_asset.html:95 perms/models.py:31 +#: xpack/plugins/change_auth_plan/models.py:69 msgid "Nodes" msgstr "节点管理" @@ -72,6 +73,9 @@ msgstr "网域" #: perms/templates/perms/asset_permission_list.html:57 #: perms/templates/perms/asset_permission_list.html:78 #: perms/templates/perms/asset_permission_list.html:128 +#: xpack/plugins/change_auth_plan/forms.py:101 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:55 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:15 #: xpack/plugins/cloud/models.py:123 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:63 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:66 @@ -98,6 +102,8 @@ msgstr "如果有多个的互相隔离的网络，设置资产属于的网域， #: assets/forms/asset.py:92 assets/forms/asset.py:96 assets/forms/domain.py:17 #: assets/forms/label.py:15 #: perms/templates/perms/asset_permission_asset.html:88 +#: xpack/plugins/change_auth_plan/forms.py:92 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:84 msgid "Select assets" msgstr "选择资产" @@ -119,6 +125,12 @@ msgstr "选择资产" #: terminal/templates/terminal/command_list.html:73 #: terminal/templates/terminal/session_list.html:41 #: terminal/templates/terminal/session_list.html:72 +#: xpack/plugins/change_auth_plan/models.py:65 +#: xpack/plugins/change_auth_plan/models.py:401 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:40 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:54 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:13 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:14 #: xpack/plugins/cloud/models.py:187 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:65 #: xpack/plugins/orgs/templates/orgs/org_list.html:16 @@ -167,6 +179,10 @@ msgstr "SSH网关，支持代理SSH,RDP和VNC" #: users/templates/users/user_list.html:23 #: users/templates/users/user_profile.html:51 #: users/templates/users/user_pubkey_update.html:53 +#: xpack/plugins/change_auth_plan/forms.py:84 +#: xpack/plugins/change_auth_plan/models.py:58 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:61 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:12 #: xpack/plugins/cloud/models.py:49 xpack/plugins/cloud/models.py:119 #: xpack/plugins/cloud/templates/cloud/account_detail.html:52 #: xpack/plugins/cloud/templates/cloud/account_list.html:12 @@ -215,6 +231,8 @@ msgstr "密码或密钥密码" #: users/templates/users/user_profile_update.html:40 #: users/templates/users/user_pubkey_update.html:40 #: users/templates/users/user_update.html:20 +#: xpack/plugins/change_auth_plan/models.py:90 +#: xpack/plugins/change_auth_plan/models.py:252 msgid "Password" msgstr "密码" @@ -276,6 +294,7 @@ msgstr "使用逗号分隔多个命令，如: /bin/whoami,/sbin/ifconfig" #: perms/templates/perms/asset_permission_asset.html:55 settings/forms.py:133 #: users/templates/users/user_granted_asset.html:45 #: users/templates/users/user_group_granted_asset.html:45 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:51 msgid "IP" msgstr "IP" @@ -291,6 +310,7 @@ msgstr "IP" #: perms/templates/perms/asset_permission_list.html:77 settings/forms.py:132 #: users/templates/users/user_granted_asset.html:44 #: users/templates/users/user_group_granted_asset.html:44 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:50 msgid "Hostname" msgstr "主机名" @@ -409,6 +429,8 @@ msgstr "标签管理" #: ops/templates/ops/adhoc_detail.html:86 orgs/models.py:15 perms/models.py:36 #: perms/models.py:89 perms/templates/perms/asset_permission_detail.html:98 #: users/models/user.py:95 users/templates/users/user_detail.html:111 +#: xpack/plugins/change_auth_plan/models.py:103 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:113 #: xpack/plugins/cloud/models.py:55 xpack/plugins/cloud/models.py:127 msgid "Created by" msgstr "创建者" @@ -424,6 +446,7 @@ msgstr "创建者" #: perms/templates/perms/asset_permission_detail.html:94 #: terminal/templates/terminal/terminal_detail.html:59 users/models/group.py:17 #: users/templates/users/user_group_detail.html:63 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:105 #: xpack/plugins/cloud/models.py:56 xpack/plugins/cloud/models.py:128 #: xpack/plugins/cloud/templates/cloud/account_detail.html:68 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:79 @@ -454,8 +477,11 @@ msgstr "创建日期" #: users/templates/users/user_detail.html:127 #: users/templates/users/user_group_detail.html:67 #: users/templates/users/user_group_list.html:14 -#: users/templates/users/user_profile.html:134 xpack/plugins/cloud/models.py:54 -#: xpack/plugins/cloud/models.py:125 +#: users/templates/users/user_profile.html:134 +#: xpack/plugins/change_auth_plan/models.py:99 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:117 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:19 +#: xpack/plugins/cloud/models.py:54 xpack/plugins/cloud/models.py:125 #: xpack/plugins/cloud/templates/cloud/account_detail.html:72 #: xpack/plugins/cloud/templates/cloud/account_list.html:15 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:71 @@ -503,11 +529,13 @@ msgstr "版本" msgid "AuthBook" msgstr "" -#: assets/models/base.py:29 +#: assets/models/base.py:29 xpack/plugins/change_auth_plan/models.py:94 +#: xpack/plugins/change_auth_plan/models.py:259 msgid "SSH private key" msgstr "ssh密钥" -#: assets/models/base.py:30 +#: assets/models/base.py:30 xpack/plugins/change_auth_plan/models.py:97 +#: xpack/plugins/change_auth_plan/models.py:255 msgid "SSH public key" msgstr "ssh公钥" @@ -647,6 +675,9 @@ msgstr "每行一个命令" #: terminal/templates/terminal/terminal_list.html:36 #: users/templates/users/user_group_list.html:15 #: users/templates/users/user_list.html:29 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:60 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:18 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:20 #: xpack/plugins/cloud/templates/cloud/account_list.html:16 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:18 #: xpack/plugins/orgs/templates/orgs/org_list.html:23 @@ -926,6 +957,7 @@ msgid "Update asset user auth" msgstr "更新资产用户认证信息" #: assets/templates/assets/_asset_user_auth_modal.html:23 +#: xpack/plugins/change_auth_plan/forms.py:88 msgid "Please input password" msgstr "请输入密码" @@ -946,6 +978,7 @@ msgstr "如果使用了nat端口映射，请设置为ssh真实监听的端口" #: assets/templates/assets/asset_update.html:21 #: assets/templates/assets/gateway_create_update.html:37 #: perms/templates/perms/asset_permission_create_update.html:38 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:37 msgid "Basic" msgstr "基本" @@ -967,6 +1000,7 @@ msgstr "自动生成密钥" #: assets/templates/assets/gateway_create_update.html:53 #: perms/templates/perms/asset_permission_create_update.html:50 #: terminal/templates/terminal/terminal_update.html:40 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:61 msgid "Other" msgstr "其它" @@ -997,6 +1031,7 @@ msgstr "其它" #: users/templates/users/user_profile_update.html:63 #: users/templates/users/user_pubkey_update.html:70 #: users/templates/users/user_pubkey_update.html:76 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:65 #: xpack/plugins/cloud/templates/cloud/account_create_update.html:33 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create.html:35 #: xpack/plugins/interface/templates/interface/interface.html:88 @@ -1033,6 +1068,7 @@ msgstr "重置" #: users/templates/users/user_password_update.html:72 #: users/templates/users/user_profile_update.html:64 #: users/templates/users/user_pubkey_update.html:77 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:66 #: xpack/plugins/interface/templates/interface/interface.html:89 msgid "Submit" msgstr "提交" @@ -1062,6 +1098,7 @@ msgstr "关闭" #: perms/templates/perms/asset_permission_asset.html:18 #: perms/templates/perms/asset_permission_detail.html:18 #: perms/templates/perms/asset_permission_user.html:18 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:106 msgid "Detail" msgstr "详情" @@ -1072,6 +1109,7 @@ msgstr "资产列表" #: assets/templates/assets/admin_user_assets.html:29 #: perms/templates/perms/asset_permission_asset.html:35 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:31 msgid "Asset list of " msgstr "资产列表" @@ -1146,6 +1184,8 @@ msgstr "更新失败" #: users/templates/users/user_profile.html:177 #: users/templates/users/user_profile.html:187 #: users/templates/users/user_profile.html:196 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:29 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:54 #: xpack/plugins/cloud/templates/cloud/account_detail.html:25 #: xpack/plugins/cloud/templates/cloud/account_list.html:38 #: xpack/plugins/orgs/templates/orgs/org_detail.html:25 @@ -1178,6 +1218,8 @@ msgstr "更新" #: users/templates/users/user_group_list.html:45 #: users/templates/users/user_list.html:84 #: users/templates/users/user_list.html:88 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:33 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:56 #: xpack/plugins/cloud/templates/cloud/account_detail.html:29 #: xpack/plugins/cloud/templates/cloud/account_list.html:40 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:32 @@ -1193,6 +1235,8 @@ msgstr "替换资产的管理员" #: assets/templates/assets/admin_user_detail.html:91 #: perms/templates/perms/asset_permission_asset.html:116 +#: xpack/plugins/change_auth_plan/forms.py:96 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:112 msgid "Select nodes" msgstr "选择节点" @@ -1259,6 +1303,7 @@ msgstr "资产用户" #: assets/templates/assets/asset_asset_user_list.html:51 #: assets/templates/assets/cmd_filter_detail.html:73 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:109 msgid "Date updated" msgstr "更新日期" @@ -1267,6 +1312,7 @@ msgstr "更新日期" #: terminal/templates/terminal/session_detail.html:81 #: users/templates/users/user_detail.html:138 #: users/templates/users/user_profile.html:146 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:128 #: xpack/plugins/license/templates/license/license_detail.html:93 msgid "Quick modify" msgstr "快速修改" @@ -1801,7 +1847,9 @@ msgstr "文件名" #: audits/templates/audits/ftp_log_list.html:76 #: ops/templates/ops/command_execution_list.html:65 #: ops/templates/ops/task_list.html:31 -#: users/templates/users/user_detail.html:458 xpack/plugins/cloud/api.py:62 +#: users/templates/users/user_detail.html:458 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:14 +#: xpack/plugins/cloud/api.py:62 msgid "Success" msgstr "成功" @@ -1879,6 +1927,8 @@ msgid "MFA" msgstr "MFA" #: audits/models.py:100 audits/templates/audits/login_log_list.html:57 +#: xpack/plugins/change_auth_plan/models.py:405 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:15 #: xpack/plugins/cloud/models.py:172 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:69 msgid "Reason" @@ -1902,6 +1952,10 @@ msgstr "登录日期" #: ops/templates/ops/task_history.html:58 perms/models.py:34 #: perms/templates/perms/asset_permission_detail.html:86 terminal/models.py:165 #: terminal/templates/terminal/session_list.html:78 +#: xpack/plugins/change_auth_plan/models.py:238 +#: xpack/plugins/change_auth_plan/models.py:408 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:59 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:17 msgid "Date start" msgstr "开始日期" @@ -2229,6 +2283,10 @@ msgstr "完成时间" #: ops/models/adhoc.py:326 ops/templates/ops/adhoc_history.html:57 #: ops/templates/ops/task_history.html:63 ops/templates/ops/task_list.html:33 +#: xpack/plugins/change_auth_plan/models.py:241 +#: xpack/plugins/change_auth_plan/models.py:411 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:58 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:16 msgid "Time" msgstr "时间" @@ -2252,7 +2310,9 @@ msgstr "结果" msgid "Adhoc result summary" msgstr "汇总" -#: ops/models/command.py:22 xpack/plugins/cloud/models.py:170 +#: ops/models/command.py:22 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:56 +#: xpack/plugins/cloud/models.py:170 msgid "Result" msgstr "结果" @@ -2286,6 +2346,7 @@ msgid "Run as" msgstr "运行用户" #: ops/templates/ops/adhoc_detail.html:94 ops/templates/ops/task_list.html:28 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:18 msgid "Run times" msgstr "执行次数" @@ -2444,6 +2505,8 @@ msgid "Versions" msgstr "版本" #: ops/templates/ops/task_list.html:63 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:137 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:52 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_list.html:52 msgid "Run" msgstr "执行" @@ -2522,6 +2585,9 @@ msgstr "用户或用户组" #: perms/templates/perms/asset_permission_asset.html:27 #: perms/templates/perms/asset_permission_detail.html:27 #: perms/templates/perms/asset_permission_user.html:27 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:20 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:23 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:20 msgid "Assets and node" msgstr "资产或节点" @@ -2536,6 +2602,7 @@ msgstr "添加资产" #: settings/templates/settings/terminal_setting.html:95 #: settings/templates/settings/terminal_setting.html:117 #: users/templates/users/user_group_detail.html:95 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:93 #: xpack/plugins/orgs/templates/orgs/org_detail.html:93 #: xpack/plugins/orgs/templates/orgs/org_detail.html:130 msgid "Add" @@ -2547,6 +2614,7 @@ msgstr "添加节点" #: perms/templates/perms/asset_permission_asset.html:125 #: users/templates/users/user_detail.html:230 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:121 msgid "Join" msgstr "加入" @@ -3090,20 +3158,22 @@ msgid "Have user but attr mapping error" msgstr "有用户但attr映射错误" #: settings/utils.py:60 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:86 msgid "No" msgstr "否" #: settings/utils.py:69 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:84 msgid "Yes" msgstr "是" -#: settings/utils.py:134 +#: settings/utils.py:137 msgid "" "Import {} users successfully; import {} users failed, the database already " "exists with the same name" msgstr "导入 {} 个用户成功; 导入 {} 这些用户失败，数据库已经存在同名的用户" -#: settings/utils.py:139 +#: settings/utils.py:142 msgid "" "Import {} users successfully; import {} users failed, the database already " "exists with the same name; import {}users failed, Because’TypeError' object " @@ -3112,11 +3182,11 @@ msgstr "" "导入 {} 个用户成功; 导入 {} 这些用户失败，数据库已经存在同名的用户; 导入 {} " "这些用户失败，因为对象没有属性'keys'" -#: settings/utils.py:145 +#: settings/utils.py:148 msgid "Import {} users successfully" msgstr "导入 {} 个用户成功" -#: settings/utils.py:148 +#: settings/utils.py:151 msgid "" "Import {} users successfully;import {} users failed, Because’TypeError' " "object has no attribute 'keys'" @@ -4666,6 +4736,193 @@ msgstr "MFA 解绑成功" msgid "MFA disable success, return login page" msgstr "MFA 解绑成功，返回登录页面" +#: xpack/plugins/change_auth_plan/forms.py:20 +msgid "Password length" +msgstr "密码长度" + +#: xpack/plugins/change_auth_plan/forms.py:40 +msgid "* Please enter custom password" +msgstr "* 请输入自定义密码" + +#: xpack/plugins/change_auth_plan/forms.py:50 +msgid "* Please enter a valid crontab expression" +msgstr "* 请输入有效的 crontab 表达式" + +#: xpack/plugins/change_auth_plan/forms.py:86 +#: xpack/plugins/change_auth_plan/models.py:60 +#: xpack/plugins/change_auth_plan/models.py:397 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:65 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:53 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:12 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:13 +msgid "Asset username" +msgstr "资产用户名" + +#: xpack/plugins/change_auth_plan/forms.py:102 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:54 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:81 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:17 +msgid "Periodic perform" +msgstr "定时执行" + +#: xpack/plugins/change_auth_plan/forms.py:106 +msgid "Tips: (Units: hour)" +msgstr "提示：（单位： 时）" + +#: xpack/plugins/change_auth_plan/forms.py:107 +msgid "" +"eg: Every Sunday 03:05 run (5 3 * * 0)
Tips: Using 5 digits linux " +"crontab expressions (Online tools)
Note: If both Regularly perform and " +"Cycle perform are set, give priority to Regularly perform" +msgstr "" +"eg：每周日 03:05 执行（5 3 * * 0）
提示： 使用5位 Linux crontab 表达式" +"（在线工具）
注" +"意： 如果同时设置了定期执行和周期执行，优先使用定期执行" + +#: xpack/plugins/change_auth_plan/meta.py:9 +#: xpack/plugins/change_auth_plan/models.py:110 +#: xpack/plugins/change_auth_plan/models.py:245 +#: xpack/plugins/change_auth_plan/views.py:31 +#: xpack/plugins/change_auth_plan/views.py:47 +#: xpack/plugins/change_auth_plan/views.py:68 +#: xpack/plugins/change_auth_plan/views.py:82 +#: xpack/plugins/change_auth_plan/views.py:109 +#: xpack/plugins/change_auth_plan/views.py:125 +#: xpack/plugins/change_auth_plan/views.py:139 +msgid "Change auth plan" +msgstr "改密计划" + +#: xpack/plugins/change_auth_plan/models.py:52 +msgid "Custom password" +msgstr "自定义密码" + +#: xpack/plugins/change_auth_plan/models.py:53 +msgid "All assets use the same random password" +msgstr "所有资产使用相同的随机密码" + +#: xpack/plugins/change_auth_plan/models.py:54 +msgid "All assets use different random password" +msgstr "所有资产使用不同的随机密码" + +#: xpack/plugins/change_auth_plan/models.py:73 +#: xpack/plugins/change_auth_plan/models.py:141 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:100 +msgid "Cycle perform" +msgstr "周期执行" + +#: xpack/plugins/change_auth_plan/models.py:78 +#: xpack/plugins/change_auth_plan/models.py:139 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:92 +msgid "Regularly perform" +msgstr "定期执行" + +#: xpack/plugins/change_auth_plan/models.py:83 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:45 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:69 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:57 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:16 +msgid "Password strategy" +msgstr "密码策略" + +#: xpack/plugins/change_auth_plan/models.py:87 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:74 +msgid "Password rules" +msgstr "密码规则" + +#: xpack/plugins/change_auth_plan/models.py:249 +msgid "Change auth plan snapshot" +msgstr "改密计划快照" + +#: xpack/plugins/change_auth_plan/models.py:264 +#: xpack/plugins/change_auth_plan/models.py:415 +msgid "Change auth plan execution" +msgstr "改密计划执行" + +#: xpack/plugins/change_auth_plan/models.py:424 +msgid "Change auth plan execution subtask" +msgstr "改密计划执行子任务" + +#: xpack/plugins/change_auth_plan/models.py:442 +msgid "Authentication failed" +msgstr "认证失败" + +#: xpack/plugins/change_auth_plan/models.py:444 +msgid "Connection timeout" +msgstr "连接超时" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:17 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:20 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:17 +#: xpack/plugins/change_auth_plan/views.py:83 +msgid "Plan detail" +msgstr "计划详情" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:23 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:26 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:23 +#: xpack/plugins/change_auth_plan/views.py:126 +msgid "Plan execution list" +msgstr "执行列表" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:76 +msgid "Add asset to this plan" +msgstr "添加资产" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:104 +msgid "Add node to this plan" +msgstr "添加节点" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:76 +msgid "Length" +msgstr "长度" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:134 +msgid "Execute plan" +msgstr "执行计划" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:179 +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:101 +msgid "Execute failed" +msgstr "执行失败" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:31 +msgid "Execution list of plan" +msgstr "执行列表" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:104 +msgid "Log" +msgstr "日志" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:61 +msgid "Retry" +msgstr "重试" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:96 +msgid "Run failed" +msgstr "执行失败" + +#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:5 +#: xpack/plugins/change_auth_plan/views.py:48 +msgid "Create plan" +msgstr "创建计划" + +#: xpack/plugins/change_auth_plan/views.py:32 +msgid "Plan list" +msgstr "计划列表" + +#: xpack/plugins/change_auth_plan/views.py:69 +msgid "Update plan" +msgstr "更新计划" + +#: xpack/plugins/change_auth_plan/views.py:110 +msgid "plan asset list" +msgstr "计划资产列表" + +#: xpack/plugins/change_auth_plan/views.py:140 +msgid "Plan execution task list" +msgstr "执行任务列表" + #: xpack/plugins/cloud/api.py:61 xpack/plugins/cloud/providers/base.py:84 msgid "Account unavailable" msgstr "账户无效" @@ -4702,7 +4959,7 @@ msgstr "选择管理员" #: xpack/plugins/cloud/views.py:41 xpack/plugins/cloud/views.py:57 #: xpack/plugins/cloud/views.py:71 xpack/plugins/cloud/views.py:84 #: xpack/plugins/cloud/views.py:100 xpack/plugins/cloud/views.py:121 -#: xpack/plugins/cloud/views.py:136 xpack/plugins/cloud/views.py:179 +#: xpack/plugins/cloud/views.py:136 xpack/plugins/cloud/views.py:187 msgid "Cloud center" msgstr "云管中心" @@ -4833,7 +5090,7 @@ msgstr "同步历史列表" #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:28 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:31 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:29 -#: xpack/plugins/cloud/views.py:180 +#: xpack/plugins/cloud/views.py:188 msgid "Sync instance list" msgstr "同步实例列表" @@ -4942,7 +5199,7 @@ msgstr "界面设置" msgid "Interface" msgstr "界面" -#: xpack/plugins/license/meta.py:11 xpack/plugins/license/models.py:95 +#: xpack/plugins/license/meta.py:11 xpack/plugins/license/models.py:94 #: xpack/plugins/license/templates/license/license_detail.html:50 #: xpack/plugins/license/views.py:31 msgid "License" @@ -5073,121 +5330,6 @@ msgstr "创建组织" msgid "Update org" msgstr "更新组织" -#~ msgid "Password length" -#~ msgstr "密码长度" - -#~ msgid "* Please enter custom password" -#~ msgstr "* 请输入自定义密码" - -#~ msgid "* Please enter a valid crontab expression" -#~ msgstr "* 请输入有效的 crontab 表达式" - -#~ msgid "Asset username" -#~ msgstr "资产用户名" - -#~ msgid "Periodic perform" -#~ msgstr "定时执行" - -#~ msgid "Tips: (Units: hour)" -#~ msgstr "提示：（单位： 时）" - -#~ msgid "" -#~ "eg: Every Sunday 03:05 run (5 3 * * 0)
Tips: Using 5 digits linux " -#~ "crontab expressions (Online tools)
Note: If both Regularly perform and " -#~ "Cycle perform are set, give priority to Regularly perform" -#~ msgstr "" -#~ "eg：每周日 03:05 执行（5 3 * * 0）
提示： 使用5位 Linux crontab 表达" -#~ "式（在线工具）
" -#~ "注意： 如果同时设置了定期执行和周期执行，优先使用定期执行" - -#~ msgid "Change auth plan" -#~ msgstr "改密计划" - -#~ msgid "Custom password" -#~ msgstr "自定义密码" - -#~ msgid "All assets use the same random password" -#~ msgstr "所有资产使用相同的随机密码" - -#~ msgid "All assets use different random password" -#~ msgstr "所有资产使用不同的随机密码" - -#~ msgid "Cycle perform" -#~ msgstr "周期执行" - -#~ msgid "Regularly perform" -#~ msgstr "定期执行" - -#~ msgid "Password strategy" -#~ msgstr "密码策略" - -#~ msgid "Password rules" -#~ msgstr "密码规则" - -#~ msgid "Change auth plan snapshot" -#~ msgstr "改密计划快照" - -#~ msgid "Change auth plan execution" -#~ msgstr "改密计划执行" - -#~ msgid "Change auth plan execution subtask" -#~ msgstr "改密计划执行子任务" - -#~ msgid "Authentication failed" -#~ msgstr "认证失败" - -#~ msgid "Connection timeout" -#~ msgstr "连接超时" - -#~ msgid "Plan detail" -#~ msgstr "计划详情" - -#~ msgid "Plan execution list" -#~ msgstr "执行列表" - -#~ msgid "Add asset to this plan" -#~ msgstr "添加资产" - -#~ msgid "Add node to this plan" -#~ msgstr "添加节点" - -#~ msgid "Length" -#~ msgstr "长度" - -#~ msgid "Execute plan" -#~ msgstr "执行计划" - -#~ msgid "Execute failed" -#~ msgstr "执行失败" - -#~ msgid "Execution list of plan" -#~ msgstr "执行列表" - -#~ msgid "Log" -#~ msgstr "日志" - -#~ msgid "Retry" -#~ msgstr "重试" - -#~ msgid "Run failed" -#~ msgstr "执行失败" - -#~ msgid "Create plan" -#~ msgstr "创建计划" - -#~ msgid "Plan list" -#~ msgstr "计划列表" - -#~ msgid "Update plan" -#~ msgstr "更新计划" - -#~ msgid "plan asset list" -#~ msgstr "计划资产列表" - -#~ msgid "Plan execution task list" -#~ msgstr "执行任务列表" - #~ msgid "Monitor" #~ msgstr "监控" diff --git a/apps/settings/utils.py b/apps/settings/utils.py index c0b90cfdf..c7dcf45b6 100644 --- a/apps/settings/utils.py +++ b/apps/settings/utils.py @@ -123,7 +123,10 @@ def save(users, exist): def set_default_item(item): item['source'] = 'ldap' if not item.get('email', ''): - item['email'] = item['username'] + '@' + item['username'] + '.com' + if '@' in item['username']: + item['email'] = item['username'] + else: + item['email'] = item['username'] + '@' + settings.EMAIL_SUFFIX if 'is_imported' in item.keys(): item.pop('is_imported') return item