From f64740c2db9a39dd342dfecc414f8ed51e456026 Mon Sep 17 00:00:00 2001 From: feng626 <1304903146@qq.com> Date: Mon, 13 Sep 2021 17:07:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E5=8F=8A=E5=BB=BA=E8=AE=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/mixins/views.py | 3 +- apps/locale/zh/LC_MESSAGES/django.mo | Bin 94985 -> 94647 bytes apps/locale/zh/LC_MESSAGES/django.po | 45 ++++++++++++++------------- apps/settings/serializers/other.py | 3 +- 4 files changed, 28 insertions(+), 23 deletions(-) diff --git a/apps/common/mixins/views.py b/apps/common/mixins/views.py index 65950bdca..a4bc32b76 100644 --- a/apps/common/mixins/views.py +++ b/apps/common/mixins/views.py @@ -57,11 +57,12 @@ class PermissionsMixin(UserPassesTestMixin): class SuggestionMixin: + suggestion_mini_count = 10 @action(methods=['get'], detail=False, permission_classes=(IsValidUser,)) def suggestions(self, request, *args, **kwargs): queryset = self.filter_queryset(self.get_queryset()) - queryset = queryset[:10] + queryset = queryset[:self.suggestion_mini_count] page = self.paginate_queryset(queryset) if page is not None: serializer = self.get_serializer(page, many=True) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 5217e3e638f0a8d329478dd58b805f0c1cb7cd86..f5ecd7eb66a64394363cb7f5c80594275a9d3ff7 100644 GIT binary patch delta 27588 zcmZ|X1)Nn?+xPK(hVB@0h8ViLyFt1eB!`BfkvxEONE~ng1t}#Jkr)~Q6%YiZqy^~? zK@=3;-~X(O`}Td__t~F&^Ihv&xz}EMpECouQ*XtIxgN)VC1vdS9>?w2o|gfevqi&zp(;aRk1>N|X=p?|JoUw|#); zy(AuQu;;ZP{}!*1Z!ygCx`uduufzwQ_ng2YT2I4SBRy{{hK+I^e}Zes=NavJpV09s zTuwg9?|FmCr=)Uf@{`AT9`p7VV-j46iSQdtgL^Owo-toyX2$o@kLRSI46+DbQ!Ik5 zumDa&HQa`I@B-$=*dKacQ7nW7v9mb`&yoKYb)^d@xPCsE$YjZXfyrfglV_z*Sl8`MNXCp$Btt~3v3#qy|rJD^suua!qnX8qYO-dd{= zHpNxUjj@QA#N1dGb72?MM5bdLoR2N>6VxsH9W_vnscr(rFa`OVm=Rl{`W=c%al};C zKLLrU1XMAATDs3sPs2vciN{cT;00<4)3Q^w0{Kvzt32kwrl=Jgj;c2ab*~qp_Sjlf zyYEmdcg9abOLY&!@gLMc>8IO0MGeph)v!CN;}1~nW?1=Wr~$TG`~>QPuA}O|K;6;= zGh9DeQ1$&qNodCPP#w0$FzjRT$*7smLp^3|P*=1U6XJ1HM;B1-pQCO;yqRvVq()sp zMpV2w>O!g_{rbJ8B;ph3ftu+6)MGdi)8RDKz$;J_+m4#hX)C{L zn8nLu67r2P5q7}rdj5NpNJ?Nf>WV(Y0=O0v;5kf;zoBOS7&D_c%RNRBsE%`CQY?Yl zu{x@KPt>g#gdsQ)Ua8=TH;4jGDl0ER27lCXjay>#r*=LPA$i9yL%MRKt#_j(S;nlsOu;nWm!#T!HFv zkNG{uBYzb2*quhL$TL*Cv~yj&&|KDE1J);?-QNXuZ~dr_=UILOY9imECUzJ#;3-sx z7f{djGt>(Hfhq8+$uP`|lpXV;1hMz=k0`*W!HU!o2XjH{Xm<*#)n`;$n_inZF{iu~X zg?bDhp)Mr;e0KqvQ2pjc^;6iajD^Vi8Xl!3flqjYqwJ=At@Shq|H| z)RlaPn%GgxUqr3kbyU5FSPWmGHfzBJZY4^f>NUpnjPJEo0*7E~oQ0bC=cuLHhMn;M zs$R~8ZUU82SNtAofX1kaw?a+02kKS~M%}XUsDY!+W$2F}u#SW}I*Mv|2DQ}JFb%#y zJ${K7xhqS7s-Ma7xljWYN42ktnn(lG3cZgSxG(C0hG7_vU&Q(=u-GcBMlIbps1Em{ z2KouLx`^aVwA#HDG$ohq*C7HbY&&I8=X=Q2o#Pg!Na0#RN*@dQ6Wu zQMckPhGFVY-2@7wCRp06f$FdcYC>&MR~lswM_u5DSO-5s)jyA#&~JVcx_7rxOZUip zg{l~LG4~Ubp=R6zGvH9HiUG@?#meM=$Lv^qiEG~)^>}v1JlF%Zf^$(9;$Kc89f=JX zfrn5Nx{Ip#1hsj*&)lX=je1&gqvB;O-oWgHy5hm8_I}i3Hw$%v%TO!(C1%p|e}IIR z{5RCD{~I--WJ}$x$&I@ArLYQC!lF11%i?CFBkwV4#gZ;_rbWF^B2W{lhU&j5hGRF( zspo$@iOdAnU=ciw+B~mO_cYgX*RUMw${V0M?10)kQRW!b05ee&UTX2xs1=B@_+eDN zpD`}udpAgE=J&0_b5w)BRRNQ(a37bcF@k(C)D<_g_#jmKIjH)JFu2sHd;BG)#T}>% zI*D50Tj*DXwwp3{DJn zA$QFOs4IMo>L>mh*Deed&yCs>{wgH2gsm|v_A+N;W%6HR1$>HnN(!xY4I83vL3fOc zBe4jMNB-w+=8ufnVV%1bqfr+!(el$>-tPrS6rx}u>K+}&M0geB;{()^zd&7i?DcMm zQ=%TDLa2IG&AMhYj7PjZYO_XS9-NGNgKorxdj5}*P{-#{OMDx(XDQd!9F!(;e;^fDm>TNs$9>1$X9L&lVCRTsW1VS##mSt z^}N?a-J(cy3TohWsHKfT-HP3q1iwSA=tfw4d$fV|*NozP?HXo54O{?o zVtG`)PU11KMytF5>)+fQ1y4CF6;#A)?K#p$L6cAS${Q*v(fG9^r$5) zf@)A2HK97FP1G9o*o;KongD7d(Wr?nwftJtX4`~Xk;|xY?xHU2AB$)Af8%Ca7;{ii z4b`A0>Pm)S3LI^`wIBI1cn}47t`VZ<&mteDdgC<4ok?dw()aEUWdLJ}Iy@2{U{oW)JsR(?AdIfLB zl=vfRZ(PPy_!sKRlWuYO9A;V6N;E`WaR=0ddZOz0L$#lXMR5^og?VJgVD*=lyN3Fy+sD8Jho|f-X{hY!gdj7AF z(9$N4arY!G>Pm`QzC3EiEio5%L=8Lzbqf|?2(CmurmIi`Y(NdT16BVJCdYHA@$O>q z_kT}FsDnRIGkuM^1@X7JiG-t;Fb8Tgmc<2F57qHaRJ#|b0YbLBTN#RJ$mc<=U}a2) z?NKW>bUV*~DH0I&oUa4QpvYL~(C*-jA{#q`(!b%i}p9ricJq3X@W?D!RG)15NU zqbB?->H;2G{tpZz?~lFP-RsP#Kv7hO^-&%6MBTHGP!m~&1#ll`z{jZ1ki>i3FQp1$ zaq^LMOi>E~0yzHnYD39u|C2A9NLd~!b>J2jL zTeht_+&~~V?!(M@54BAb?sHR)F!N(U;-yhHyE|%tp{ScR7B$c$)b5*Ofm*1EH9_^$4pqM& zYMc*I^{4qQ@G+{R#i(t$9wTr!YL{F=U18z_?%QEXRQ>9xThtWuV=vT1qfs|~DeBgJ zg&O#%c?vZ_{{<47@eR~AdyE<=@JRG%BSur0LKy}<2wZuKKI!;DC z_(xGIa|d;co}n%v!9lmuX)*YfV2cdS#u!xESZKizh~1Ksr=E#ZW6=?=bg24~g~!O5$YHmG41K=rF3I>pkIP}ItVp{_VDYT%-luZ!xZ>5trh&Ab%>y_CD68ji7wAE8$0W7L2v zQCAX!3GgIpf|tzesQ&Jup7%dc6Hj!+^%I6F&y9)~_mj}QuZHTlC2DB~TKq#)N70xN z*PAh@E7*^^6$eqb;xuYvmo0xAHSs5?da;hWev+eB*dI8KwVI(pWMe<4$MlvEpkDAZwv`7#Z*j;3sASA3}f_24B%k=3-e;X)9!DH7NVZ2A5kmv6tiQp zGpq>Xd&Nm)!(LbzKSEvEUaWxku|DQG>t;R-RX-Z_ak~>s;wfy534h_y#CE89iO#v- zpBF+ceHT=_N$A(EUqV6^w^_j@)D=F*+L-LTdyHCRYVw^hIS#{6oPxS#pJEDJkBM*( zrpF&K6W+ii80&(&)hRBp{;HUXfOdCY)bm;bwYw{zHe*#xiuJH7w#6LyEe^z6SOr^O zbbI3y)ZRIaHSrm?!7`Wl?tt@9yZ@(4tiP_{6oGVj8?`jvW%tfbhuV~dP*+$UHQ{;| zZ-ts*Bx=G@79WgSsd1=@N2B`v0=05`%;SC%n(0+kM+vStL-8^BjMx^F{OVSyCypXN z7&Wn{sENHntz6Qp?iQp$O*A*^78FOls2Z5fF^s&w9SPl=VVD^|M(y6M7=hPNGY`4u zCJ=_|C6Sah|Q5|@{Ipd@DMsn0r zhNJ4|#SB;((_nkl<{FH89LHlmyn~uxs_U+O1O{&@rqJ_Wo`kNj0cON*SPUni2Hu8Q z@c?STTc{3W-EeQtWT-uq6*a+ z^X5}5K|aAvcdII)cJKSBE9r`AHvlW4AJyMpjDv?zx9k{d;%Cfj=+`}bNJ2~gj}^qZ z<*pzF_9h;V*>N()#r2pHH(?z70ku*`Q3L#fn(%cjjOlN?TT}W0ROc zKvy!yT!IzJufw=_56j?FEQrOoeCf zvi>KMRycn($nD(V7X zpe{J%0ei_u9X|l_!RY2 zc#qslr9}-~2GxH>%!B^wByyAJhq*8sHKDzjAAiGqnC!88FO)+K+zs`#%s@RAYfDKQ1>d~Q@8XPQ3Dl2z0n$>R;Cwf zGfhO*UyRA|Yplo;@59IF{m!pP@X2#-3HJFzpQ_ydaW6FuzGPxoZ1^V~QeiXh#iM`m zV;J!nuep*CuHbLC>3YB6ucRr@_?Ehqr}O!|;rJ7d$66siZvy^^Q?Owy^3*?vlgPJ^ z3EUu|nb(i!3*MuSn23BN#>WAe0!N@W;S6&*YDu?Q`8ibmdzcr0$D)`izAt#I z8e>lKQ5bdN9JNXF zqn?6NsCt!9PeFaNO(LKBYwPY77>Ih_{g$6(2F#`Am#BI>%zdb*<&c%1MD3+tE&r#L z$4TtkB{S0`X8qMsMgp2ycC!fTmQ+M-#>S`t`eJSzhPo9?u?=pu@)Sv2y>L{&IZ*BM zoA05<>1yQz{3IF>_yCLHL96f@bp`R0`hw4O7SygUf$F%S*#b4O_LvO2qXrm;YCpkT zY;LvkJ|J4s$IgAZh|Syyr>nbX8Fz-t{2Zp z3q+e=qdGW@>i7g|0vAwM`o!X1s4w`cO^Cr;gj#{}s7+ei@&ir3IRkaU3(>EEwphU~ z^Dt_rXHgS)fg0c~#=>O0KQ&OO8G-7s0II**7H?#>H+!L8*~3tuDRWct{Odzw4}pSs z4fTRap4xSk1vOA^vjl2lRjs^}#d}~<;zP^{Rvs`Hp*G(#RDYXLd*s{HJpbB6r>x=w z)D`}Yy7HH(4;Nn=H*k7X!_uhF^}3etX!${?{-&U=beZLMp;qP$Y66!~{onPI(7pW~ zHE;qxdGzW`g1Vw~W-ha&Sp)S-ZDw}1cz;yKesiiBFc+JvP!sZRB%yn|%{*kDGw+yx zVrA;ZPv<6F8`VJv)MrRH)WCBr{t4H^Q1cTg+-XE4w6mo&@`kO_4KIm|++j>@1qsEL|L z3yZf$-Kt&|AA&i_kFxR==GUn9yHOYLlf|z}J^v3a@XCxA?gmPQnn1Xj8#TcaR$j^C zHO;0L?}!?xJ8ES{pxOmc{VlfqS`7ZPmCYn{W&5ncA@dB@BL16|=jAJ_Ixd3husZ6> z8lXCU-}1dt-wj8i>Mg|fxB~T5_%gb9hKxM_8aSr~3ZObHW!6G<+!8f#S5*CBsE)^= z-Um}GzY5iUBkIccVerj~YWD=y-%B%gCZ2xPG+2nb!kwsr4qN;LYU!S#CK{5}-Q#3t4pjYesCRx<)QU7S zyPG30wZ8bzw7?3~JAEtaxjuq=_n$>A;UiQ>@v=F?Q1Jq0O^bKH;4QJdA2p%5SQi&! zA-stN^!%sJ?yjgBs$o-9gN~RPyIXuRYS+(0esuDdV17J+ET#7Z^+wE+!@Y=Fp}wa3 zQ4{?b^)zfiUC8(7SK^!n?xQ}(-=GEx%jqVR-7I2OM767nn&|sxB&uB>)P)SS_=l+a z(@^~{Hn->G`PaQZLqH8*qB`{Da`!$ys-rZh4ziggQCC#k$~&XlN14M>{d{OnGv}cC zTYy@@&vW@*;72R?1@#5w25Pszz{Xf8x6k_&$KeLdl*dirn0Xu3v6t7G1T}#$%V)8C zLCcpwT|iYo30+xRE9hsAM0GF)^(vi(dUbw@+LVV-Pr+4Gy(bu4LDWQi`P?Q>ipr-) z)z4{`M73*O(-QSj6`P@E)(O?&2rHjpPDj<7Ykr2>r0Y@jkD>-T8|YLr)UUPt$7&|c z?`njjYUIEWEMb;LZO?M3AM_iezA^Me{Wv@tHRY+OC7X?faD{ma>ywXFz~?o=#s%12 zs<@JX)+`2bup?sE@h7F+PSDb}N`2^@=Nwnn+F58>}^| z-+q1)TGAn?n>O9@3oQSYxfAs~9J2gFREMun4{VYm?wyR#SP&G2_rhp$ir#w+R?hM@*1j=F$~sPbm0-Ps-0Zmc=e z;)_uAHX-f(-VZL}oj?tE0oCvtYAGLC{w1nm>|$)y;evVFe2yBxSKJMp3YE`d`Qm03)Kk^K>|pW!=4e#AX_!}^ zE{jR%9eW7%*xf^YuD(Kj%*8L^mNXRg>5(6`CsDW;xCh{6pKW-^kKP&1Mlr*cMc6TE)(i~yVGFO`0 zOWC)}V+3^X&!9TIgt{enQA_o^#p9NC^+HkcFtdPJ*=&lskZ$Hsi%&v5rVCMUKxfpKx*@0uFGj88D$DOQzc-I#0m{##9_M)e zvaVr%)XYkvI&O{{um|c&qEHi3eZ^;3K4302zr>uB??BbNhU)K*mA^(k_wmcQas63I z=$__B4fG!B`EP|9u&X)19D{nJO-H>i7Mq(<10FF?n&(mdTt!XfA?nxLUio02pDsvf z;Pf~X^Pn2UnBSQ{qi)p|^CfC?Ca>VkiJCxp%!k!1A7u_j^*h>}7L?~N+5#(49c)D1 z%Wan5ZyrWX^n{gPwfsHvm6@=jyV5YMOZ@_&13yRIs@RoWJ_5BOg;DitquwL!Q2mWDr=!|0K($|uYWE!mf4g*V;yVO0D3m3jX4xcI8L0aK%vr~>MW zYM~ytHmDcUMASsLqB=f+TFO(XiQTjEr>ORCES{pO>o=X5)y!Yj?;4gQppGk`I;w+u zhc`xb)EPCgA*gzOi_btUd6}k+^RM5dxD z22c}RYWYp5j=r_{L5p87Z(IC1Y6aufa;8P?`dp}fD=4n#zYYoA%QmQvd#C`TP(NAt zEx#BCkpB|(iq8C=GoM+?tcKbX4N?8HL2c$8uw&vo_`H+$pQ~h4gWyJW7To_ zP}IN?sIO?bEM6Ej(F&-K)5fR)hg$h8^HXz;xz#*Shv#1do*J6&n z*mYgKjAnM!MDv;DP*+yh^374VA`{5;dGh)$ zo(;8f#Zd9es0(Ro@jj@5hNC9@p~a`6`i*w_y;USsF~%zFvkJ#h9bZBHu=&*TNgKF$ z7PC02eJ!&wYQVOr33fK4%u(jlpgeycTVRFxHL8Q%sDZz;{58}-cg$zz-&P*Cp{t(+ zwGw$PUk&xMWk=M6K0y6QHW8ES`Cm#xKbdUA%yMEAPvgA8pXiHAs9P`=^N*D2-RVt)~-A|Y67KDdt!veCtz@QTYi=0cUb;M)E>BO`Fnm6di?&eg0yX1 zh3sY#v!YoSwK-d%2JT?-p4fo=P}FC}_c#f!<9pbvt-HmWP%ol~SP%W-?R>%i*L4rn z$Lc=R0RNy?B6fRsPt&5l+2l7XqOPP7s$P4`_cuqQ-kj4={mr&`G-}0HBDdD>9VVfB zeFt^#lE3e+EI(?Kl(c*Y)Tdrg+=fGN1QzVzK0Vi9XYw(qdSM;iFQ;;%CQt(P;Z`2C za`iEde*SN1fqtlpAE54`A9e3%nd>nt`NOEa@BsDYGfpShVFuKS*3yj6)^|#DAXHrKCZwR)MMMW zr+XaxqCR{Ep`JGXMVO|XH<>EE582Q$y4rW?>4eHgs3)Su< zR>aq+H)Yx0zTm&R8;zRye&m99{$0X5YX#RajgOz@FdG$pece-#1GOTRP%BamHPQNJ zM~e?aJ*J~kE4CDMVP9JLZqx)1Vz{3FCnPkZ#Qod=p_re1TFi&lQ7h0NwZxxT`93Ru zWaVK|uDk|DP_H-Y<9vq2*P~YYq{Uxi1mk;Y`@4#zQ3JF>RUBjS6{w{?VE&3)>ept9 z0q#YW3-!LJZu$2uKN3}cKI+Z54q4#fKOFV9(wcGh34~9qB(TUV(ZUV+Vg%#Xn0Vn9c@Oqr@~= z&Y7DA^NITc0~&_L8APO|QvRjX|C%x#8%>wvhY!jskvUDfuQ@*z^b=|^iX0G zIWy9}4Y5tc3R<0-s>E@a@^?pb(m5$l8kP&@=E-gTGi>O?7t?%$AdS5vRIrQ zXuN>34V){e`yTn_*7J{~JG~nP7m?QyA7|rg%a@^T68cK(V^<|0F_pqQ_<(^TDAX?3 zkv*`iQF!VYYDlvXAE8R`3+Kap-jD;@1^P+l|MEApE; zH*!XD{$)KTrEY+FW61McJ?{t3p2SuXJH@%*`shu+p`4F6|KTGi_}?<*8<^LX3h@a3 zMq0;jq;-5jz6xbUNY5sgi?qH^#&9+v-^V&WVfFKxB^bPv^)-p~mlmg)w~Tx(Ou|P_ z@EAhj0XoV;gD}o0>r{o6sjTA!XFSqBa&{*jLz~^!=_>M@N#CYz9nw2UU!vX`D<6QF ztsjbm|3{R{#QJF893b$3vpng&bWohZ$5L4z1s~%NxCHsnMtZkMzdPy>>r35nHrem2 zpgQ&HQq~_I(qCsQFGh@y9`6Huclg^-X$ZlsR7%GAh{7mh{58RUjuPZ`bfkQo#XnXX z;=@t@oy^JB=??1XGp08Fjh89c7o!@~X>4sh(l=b818t7%0 zm~%8&1BndWBI(5#sy*bybRuqHHvA9bJ%b3*I2ob*&BGg*mwYyJ@(N;1_tA zio38Ro+ZZDN-rBG3RYHw{~n2~b47}BeoTH4ZAV*`B%~|Qt|IE_{;&G_0V{Zv=Fj|8 zxM7uY)1aMIJZW`)W&)3F0$r$Ait_gY%bJDyi;}8Bt@_kBX0^NFR%-c)jpx*n+*-Tb zfB(E_@l@3R%feS^qi?!8>Jh*2uW837?{VsjW20DJpjh+Nt!GpJI&~VW0mn(o<8U_R zJWl)tW1QivL%reTm$_=*=Qeg8>dhd&oN|3TT1WaQjtMMlp4PvQXeDasSVW6Gls2-K zis{Fk52$mEcumd^DLZN9l_~p}G93x%;}EXKnVfHfQEr^o-DYECC;y65KTH(Y_9$i* z?$db_Yc!tp5E^7d9iLDq2kH2vS72@O1sHg)b^0N(KRF*#{yXY;!?`z@VyTF=#{4?^~U;*q^@lxwzlkN8o!aRK;2}JZ$+Z zRQim{V{r}Yc%Sn=`L)!`gZ0TzR{=)?>SQCv)M%$3yai>EjR54RL%h%0FhpY4p>X zvpeTa`l!oUfciQL>-8O*Q(tbMa;~>Qy3xrA($|RnO8QgMp>&WJo08Yj$joAnvQG8& zGPR|TQolRp7is&}VrrYt(q(Q@n2*AhRQ!s9Zlntl%fmT_N=3*=Smk}#hx}>ko(W`W z9qwOFPDf2@zdMGL$Yt?M7B4`HZ;5rG>QTJ0`hU` zV=C!#ocy5WeH7w_cs&EVTW9k>rFa-29Tn;3E9<7B#nurYN$d>gzF;l)M}Eqmaqc93 zlXj1BHu=<~Lpg7e{*d9);Z{zMSP$|;Nq{fn#5U0;4zWta=4v>OQJgu*kHc~baQsf$AnJ!x{~~1* zIFs=0>Gw7%^28yoBQE6VePGWGX?e{f1LCb z(x>nq>Nrf@^NjEp=W*&(BYuZiDJyricmYzTW0u23lwBkL8b7D3G3P+iIK4HWn^8yVj3+;kIv>U2i62aZg9JBGp&scH!HR)l@fi;(ycb9Oq+VzjDqX7R?!# zSOs;)F^_W%WeJHdCEb%gF309WNJkPf3tiItlS(?4(|9-WwVa>PC@t!kPx%$f{(U?r z^P2c0JW0KDq<`Z)VQp0ROY(1M*PFgpy^EKpAPoWKYf|Am5?_$cNlZsZ8k8cI*=0R` zMd6jT!K(%KbqEb!z)ecCQgXmrox-g2_KKPV@CfFn&d;O|TkBuQpX1Cxehl#*7GF$S z$3@NojJ$wz5@!zUdosR9onq9#uHRLEM_>jO;$w?oQ+|I(h3lNZa~>kDS!Sk=j(B*P z_;g%ovG3@tDfKo7mURp*ag6A5YOJO9GSc5ux`ooOIdwFkY(23ClpV4j{tVphn5{-6 zxmnb@O|4wim_zz0=QiT6$^V3Bu|Bb$!M=EENT(+@m9l)KI|UkdO6yO^7&=;GGD>yy z=Zv;=U-NFT#Qo8Z)^~{)pv^d3LpT+&BJ|vk{1ehytluuAYY=~Tyd}Pq{0;&s^mLIV@@>qY zsMCbAE#;n%&%4{!aW4YRNq6JS!Wqt)os<80`K&QXufG~{%ndB-9GZSHC6lRAm@cc6 zeh;sbzZv+cbK3T!shg9!&oBW_{#QRW)CtG$oUMruva-F@4I_41g&dveE%(3LHFaTc zT%byqP=6CjMp$VTO_k%W&2Tky8Akq?v)QL@f9c4Ki5<7z> ziMPXfwE3I#Fzf3jdguUagYU0rKj$T^Za*D0HenXIo3j}O) z=2)YFl+7c324`_jpx#+3{Xyd}@-N7zCw&X=VQXure(IBMM;#q?C|kpsh4i=ot<%IC zL2x30U#y}kFW|h#8AGSt}8DkZxw_r-3Zp(zgDU9t%>t8MXhh zUQ!bKikjD`Ss6P}R?J!*qpT14A1wbZj-(EM4eBi>u45?u+z-s@7Mi37rB7%vmC{v# zjom{1V~HdrvWPPw=|--J*PI&ZNgu}$;yR*~rmwYFn)5E_*R=c56?^M#zDIG3rLW*f z&M{W!w#6^eE>>)QU4NE9Sq5l_N32qL(!Wrl0|V$NPJVWvZ})J2j7>$+IsZyGqxNv} zE3C!$_>fi`iOnZHNyE{mEa_gPo0G1KwFs`D&P?)cITKr-sYzF|zMfOh4!_rh3fn9& z6i=zwe;q9-PfEi@#53bJlzl_`N9(MV)!jwCtHh6U)}m|+eWkI%8xuRg`6*{4r;c;f z$s7_+XaAjz*MOj(3e#vh_>vxud# zp;J(&1^MLk^EYW7)i`f#%GmQ!#Z8%3{~Z>XejwMTTL%Ut4s6`kebcTJ3F4L+)FZM_ zpNPT3`$t9$85G$yVpxyJei1Eu_UjroY*0j}L4zU(4~pm?Ij~#Qz`hZk`VH#Yxld%o z;7)^j58CwY*?)WqI!97{P-MTso0gv&pERUw#HP%**T#!grF!+iu}8UNbonS>&S0W% zlrKlHq~YU;xJ_!*Z`h)SDp@jE?_F9|-&OHF2@AH0coH78vdc%$9^i`z_PcX{FLSVj zn(rD>`CXFw@48i!cWJds?`9D(viYFMfup^VRdl_hBbfEa1AS@Ubui~?YCoX}EA~b< zi0T?SI^tbh*T{2yMAT_myFm@=HXPW!Q@@@gIt}g_)sLQo1N^5@xmp9GhV=hWNxd31 zoBc11RJ5tcv(Gc6Z>oFsc-NG7x98552{(4Edc13D%>AUkI~ihb<@1dWi(XyRmnP<7 zP2U&3e78UQ^2Xj}w?3VDbK0_-^Cx-#BY$Jt%v&g zx(@CROKW$$tD=V1hZm(|DDfT_qtcvYwvx|A^ATsH{wr-jqhFwiZ|2YxEs%LLa<9N z$61)balWpnsN;n7aGWV|948B|_c_kSo{sY~cI@pqEom>&*KsD}RQv=p_j8u>J7XTS5vP& z+;QeJ@H1RWeTwTi1F07wIW_fFQI5m9on4p|zsDqa8q?qv%z`h>w4+!I^E;&}q^F@J zvI$Nk7RDi%AJ?Edp2u)}g?TXhXeP({SO7jjz%qHEyl-hu{rKU-Ll{bUjOQ-1vJK#*cCJ35Y)J{ zFd5F9!2Tzqu$q7pH>0-hAnI*6g*ovd>KRDQ6RIsNiQ0h=P!Crd%z=@p9h-~FTZy{Y zJ5bNqF;u^ssGWP^QqW2hf6jfzOsI)UqyL_wCg_Li_!(;8IjDYLTl*f=1m`UN7T_=)40DTRmr*8?mSb zJjYZRca}F`I@Ify8+AnmQ2E7C4{=r0t!;o>NH5fm4MY~?I<7TLL48@w_8OcWsI5DO zn)nh1<2`GCVrDGoW^+9%?6=qVoD-xewhi0>>$6p!=wf zFHl?Uo9BHnrAEDe`A|Dh7?oea>NQalH9__7gjz@+)DDe6O*|QOL9;OfE}h5zE3nHF zj-VzujT-POYN7|IE&l^G@V}@9CY$fov!ZsO2x`L8m=|kdJ{*X;fF-E$R-(pVKcD?q zhg}3p;R#HS@fUcvA`~-FFOFJ31JnXrm=UM}2cQ--40WYb%(%0!F3#1yE9Ck*va7Dv4;wJhG!;(g30)D_P_O|%&G+O0=j;6Btt zeiAe5{l7s$TOQ|2Z-Nlif(oK;O)b>cH^<7@9*f`-EQ3EI13Af;cvoD&EQ$I&sf1cc zXVe8mVn!T?IraW8r4UNsC>F-MsD~%xQtzJDM0IS9y7E4#0bSGrro?rszcj7JcR-OdaF%_yq2}>xiU(Re8g;KXqVjj3f2&dV z_#~#qi>Qb6DQbrkEaxJW5K2J<gRF%1qzP5cFF2Ntbj|Km`IA)u#n2WkO7q2A+5r~zY93w@5dcZt68 z77~K-sOL2cq4JBPUel@;?|>RF!s>ld^9*z;=*mZ87*56jTxanZ)U)tC>ODS(x`Ion ziSDENzd|iA;cD-KLd;Oqm1aeaQx?^)uEpKf6!dTmL~Z3H%!&)my;zC*4J?n@*LZJB zCse;ts9P})b*t84Vf+^PKj$|8(8D`@t#?Z{pe|&aS9hJ=7C3|jX*hwpSN~uV4F1~N zkxk9d%1OVE_&?N0^^sLgG_V5A7Tb#~m1=_x~n^!~}fbcmoHbwm1Xo z;mL#g4ycBSusv!kd!YIaL*cZk~^ln`WRD0Hq?7s^6 z38-T!)KmQ-Y74tyO6-YR&~Vg4Gzpcr4s~k|p%!uswXic*zl`D3V^J5DVv{#d2k9?iWms4>1h?MO|s=W^Y0HPzx%Kx`2viJ=1MV zK~Hxt^D_*kzSP`r{$|G6;_XaUGaPjRg;1Y_XpgJs;}ID_gyV*&DSJqfl2o9krkZsQe|U@wZ_SJc$8% z|DCN~Ln72Y%#7N?T&MwxVO}ha`oM`m-I7tL*K{&!;*F^MeW_a5qP z`3wDj{!b9&ePpIYJ#b0`)NV#yRMs22Qu#>z5lfL2*ot zH82gfLG559ro*Y**?(=>Y62y39cn?bs0BSh4g3Oih4FWI1E$1a>bX!?SQfQ2HBkNP zTfI4I;T^305$eJsF$0d=!Tr}2%_pE0ZonFN7`2dO{9MrlsZn`hsELZBwzLB3ZTS$j zpkA03N1AgmC-n`e9r?w)W9=_p3Sl&){LXu5ilDZ(ve_6jQjfs&7=^mR`KSSxnOjhK z2QfQdM?G{2c6kP(7951SfH14O;S{tLB~kafk<}wm1CB%uxBzv}_MsMX5%c4748g3s zz3-5USe$w%EQWJXmzhQ2Cj-i-opZA!SM_oW;vpp7|-V^l+F%LEVYShizjGAZrKG%Ev zzPE(qsDaL67+y#1NSys%$Hb_|H3cf37PYWYix)=iSShnI>T#}vT1b1;_GvxvAt{1^@;w?~5&nPU48&ErN6APpJ zI|U6G^1XMj@?t*fRZv&b7xjz`LEYPNsD&*z*P%69*1tdP`4U`^r#o18LKtYRFL@lVc)f-`4>TQsLoDQgmvp1^WMEn%zS$o<; z-uT&37gWGs=l++YpnF-v8tS1|+6FaYZ`4Q5$LJpzwcvTyzS`oOQ2q8}0z6}0MBUo! zR)2=tsaNR#SsMSaH*jIp7FWh<*dF!CupG6;dr`09G1L`YM{V^Z)PQl0cneL638`m6 z#lukxE{1yBs-o_FJ9PE6F_nU@Y$YmjD{6v+7C(al)Ni1+`aWucmlpRO_3{&AeB$Xa zCuYWYSRE5#9n?o#6SMbG?!N{cM?e!qqwf6z)MwgPm;f(Z{3hxO9-{_Ia?IQE>=;hH zIF`Wnm>6fF7PJI4&MMReu0t(s*D>zDws5~CoVA2YR=ir#tx`H|8X4G5p1L}(IqrUfE zV^%EsgSU`os2%Evf!Ggq3x;EEoQzp;E9S!Un4kIi8#(W1X8}AzwG~dr0zY~G`uRI- zOZ~Q4{S@Dn)R$o>COz%_rpk|Ps7GKG+>d$~<1=VMEQk597na4jm_hTOr7#2^V+8j2 znZG5#A2APBJIjNGeNnH~m#7^%jM?!P7RSWryx+-{Q2AXjFV4iexDU19_ zaAOK3uqQUerMM2CV^Lgo-rMS5FfH|0sHZ&Wf;Uh;RJ;M|)^*3)I2!fzpTyL77E|Co z490&hu>Z*^q`2sPM24ZB>LQpPD_~}9fk|;N>fVk;K1*08fPwQN4`Ynah(kmw4(1&3pr|@LjM+-H_Qjvk-R@q zJJs?xZwLFL`VTZeMNK>gwUbj&`HL_Fw_qB*|EDPE;ktu*{r%s~G= zMeWoE)D`Z>On4FXw)};fINwe0ttp9`uoY@&2V)S9#$e`mW>L@tYfx9b9kqZ1R)2(g z$X=qJfuLL70NGF8Yt2SeNJdL`L^XUKme~Usz0?$wb7LD~1 z%c1UB71YXWn@v&oup?^A`&)b{>H@}MPn?3;@o&@>hu!wZEsENq(zn@v4P1?YR@wmd z$u$o38pWVG{(!o&>lhDTqORayGszu3E2yW#1lSx)V>>K@b1(}Y$Bp;^HSXfO?0eEi@SgXuQEPTg`H4W+!sT9Jl&X;`m_h$#9L4oa1yokXHW~cjCxl7!o-;9 zp||iD|>uCy!a^@~F7 z++x(TvIX_jpTLZG5A_-*eCmC$Wyc`B{}m{tprIjFV2eB9BV6)~A0s&J1p{N!KfSNf ztbb|Q{J_92_!!gD-t;B+6MMhnhb8g+|M0}eVPf1!J@5_RoV4%8E!4OBe9lk})F+P5 z8HIOn4EBucbH?Li97Bhp@qErW>i@>~Io+v`P2lrCy$=)m{I|##;Pbyl2{3@XAWVrF zQJ;AE&8iqmy`{AeMOPg@r=WW}1B>7u)RsO)ZF!1BJ|_%IqVigx+DD^)H!Q&;cpf*a zp4jKVg-w(A{5v}Y^=wVRr1+(|E{V_eCwxahPw7cai03Wg8U|8-X#S1L3kdY$!Kn8= z%<8$!VrFHt9xAW3*$MTw^aymlfg%a$JsydgaIPh+M0MO?#+bWNc?ZqY7)1Rl>S23| znjl$HpZ{w*9qLw8##Y!I)xOEK!gr{N4xt7(Y2HOm6hE2Q9)$I%r$>F+bVs!>KwZFU z)O)=jHQ_nbxcALxsEJ=;a&+S*_XbFX8X${V#%yfuz09HJIMhO;t-jv;4mI#m)Q()R z`hC=b{xO46`1E?ZPHwN@)I@dYib@=cdWxr5eTf-kodTkrzJ#jm)!(2dP8aOu6*KFi`gcVQ+#9uk!Kf>pZ1IJdh59Os zA4UJamcBqCHx03FPjmlkM3_!M;|C5oBg@6VqWR^rdd=*dwHb6ZiZBe(VA1Z$W>I$c#u6zdS%V!a4;;pED zXHj2HcdY)}>M2~lIW%An)VEm$tG7f=FaWiHp{NPQq3-Qe)Wj=MpNMNv7xJz7y?Ms` z4fWCc#C&6MH)%R=;1DyXS;#D7RzoeQ9_rpUH6zSH=2&wkRw8c&YQeFn{{Nu9L*l0Q z&+9q`D5#+n>Pjn`AEK_PrPaHegHT&K%A9F_h1#K=sPPV3{DgTG^=0)Gwd3I#B=3I} z3YxgJ*&TI-gUqq0E0}5ZwWtYpq9)vLoUo)f=KFY-jZda{$&P?ppg{)VM#O#=DNXuzRR+{|@2(S0Esh_k$uGDzOB% z#Y(8RVv)tSqb5FJ^<$|1KbtpE13yPi?91%sr$UXJ5%pT;uzI!3y#E@Y9syl>JM@2a zq9&S*8gPcW#9U|YG>@PrJZs*u_}^wgs5gFU)OZEVvaS_snN3j>cQSjR-rIhtg^oZC z@P)O{xB61lXZw2dl(j!IU!lhFg?asxqkdJpAr!RoYG!lPPJDz~$Y|7r6V2HcUyfSP zT8r;AkCLFRY@xskQ$hfXk(knRC%!XKnj_s_z1hv3*SP1u7{i)UCXZ5bU z1nLS~pcdZM;=NG|or1cM#i(2SwO`)9{S?&UJnA$5Dr&+fX1r`(JuRwZ9;;VEeWo`? zz1Q7QpZ$@j9sC?M&T=!x;>XMzitGLVhk{m?JiFH+1ht@o_yLx{f;bBE<0jMI)-()N;yVKJ0+n$;s&IBXKu{ocIFuJ3S<)cLhaJSNtLBN;;W? z%<-u2@%gBUVo(d(XZ~RRit2v{wa~xKIJtQL)iF^nuVXMOAq>?a7ixksW;4`NJ^fWzFEnqXM|6cP9>XyV>`x{jMz}&7^NR!(pHglN;Py-f6ZDAFwcQXf~et<-w zp7!b35KrI&%pC4>*5gjp0($209D^Enp=*UTs4I!F`fjTqxB6++09R30_Ls$zr&s0jnG%X%WHz#yKYu@3-GjP zpy>qkdwDJ{#r>!SL=^Pehnb_y3FcI+Ox|qNLN1`L@V>Rbw7OHsizh`bAcNJ5xD>P% z6;TVRZ8k8QV^-qrP(QMwP~Uf7qyC_O9JS>?qdw|xq89Q8>Z2@CVQ<{bs0+%0T3}hL zyR|IP&g_YLFNRosA!@)is26t^>V>^v?SG>#AfSl%cm|>VxSAjJbG9<3$Lbh{?NOgd zBavI_I0nozdD!2?e{y2pL=E)>)gG^yH)Sd_3+m}9VD;vx{4S`e2cu?) zvi6DQY;!p(e`7J;2VKke7C2=IH_a!g7wKO!d2w$cVP<~RKxI%*OI_5>8iHE*Jk+P^ z8q`O_Hq>X(0o2#VrQ*B~+T`F8-rWvIeX&$W4e+tW$D#hRVyV^7q53_wdO%69e|FT< zPzlw)32MA9sQj7e|BOOCU0YoW>Tnvh6S3wq)bs3=@=R^!F)Nx)%pRz_Ji;7{8gCNn zmdr)%)G~{2MdiB(tl^k>*?erqE$v-N8Z#$qpc1GTvo>l=yPHwgKF{jkpcZn-JcF9} z8gk2A=Qafm7*xjlJ(mNu;<~7vX>RqN<{;BW{g#-3dVymsehIa(Sk$=j%X$;0L*0^4 z)Pf57q873c^%vV4tiBaB@ll+N7f|`#%6kqpqfoc( z3v^XjML|#JUh^Dk0rxR4KC^mg1uvcxHE@2jj9Jrcg6iK9wKLtVKEND`TIk3M_Umb? z1?HJ+%pIsJJ%%6PWz@jo6}^EAp?0neD&7#auokFiAj0ZnP~%KPO}rd+tF}~hy}(Zd zv=i4*i7!zfB!QK@0SlOAQ3KRM4bTGBZy;&`lTizpVJ<=aA!QvZ|D462qVnIk6twjT zDtjG6%y3k^gw;PpP2AG#fm+~DRNj2l+p-Zg;X%~aKR{j3pQumB#8tcxq~fTBx?L$~ z;7HU~jz+C)o+T_n4Y1DQ`%nWPF;AP9tUVSr@B^#ALVbk$s(RxDq59`Q@?58&HIzeb zWqq%~>5lq_A7u5K$Pzzd&%HM?kUk0dwe?~3f3hEiSXZ6I@ygxgnMg794hRK=V z=|(|c5`$3_j79y`+*H&6dr$*kLG8>P)HnSjt3NYeq4Ipyz0ZXtsQetL9nNR@0%|zo}iYu#p%s()P$u`3#f1LHmFi##;&kdeQJ>-UYJ0XayP5+~&&&waJ)VGi+UKHf!5Y*8wpe|ic^s8@)}^5LHWoF& zD^!QXb-Wd(MeRsts~1L1SPFH8RZ;mZQMaxuc1PFhchLV(e&CIt1Xa(7>gVRLh9VZI zg4&w;sMo5Q#oMD6+6(n{I}$bF3TxkO9yiaMx6G&J8`SuLANm*II>BDS2}6CG@&a(JItFN*8M%3rQZmaLN_8(CTJZJT5sNV~>t?sMGzx>quA3#A@mK61wo(Xl& zD_Xn}YC)YW-WPQxqbxojHPKh71#hzWcGS3s%yX!`SZjZb{@?$vDQLo^^}Y8z3{@|0 zHZVJ*2Kd+z4+6VM0DGgLiA18<_VW)?Fqs=YWW zzZ_~OT3USo>W`aKPzzdx`a6UzsMqaB%#GJD6caV%{nr+SH}oux>R8)shU(B6^`$Y% z>g!Rr>b&_1cTo>%fco>n7uXz^;VAqYBXC4BpZ~u7jVJsHHfEM1?mPReCA!_S;qdpJDp}sZO;&i-d@!l=H38$l;sio$($Sri8 zBNQ~yEo=A}t58qb%6kTypgOigt-Qb0qpUu|>dR5LF2?HLqh7aPEdIp&*G$q{`MiJW z`~|+JQ4d!U)KgyC;#IL8^#-WFm|BeEa2M9XYHhrGIvI6q4&#UT0$X5}wm$!VEjb@G z{x7Htx`L_n{y(9hUpfied8R{MNgh;UNvqc}o1;D{yPyXA$m0D`w_*h9RxU%`+Wn|o z_B-mr614Z8i4^Giuattm<*MQ~tdE~yKnL&JaWrsR0Gj(QuSPz(DKwXo&rfB)A}&>t>$qOKre5APE%8Rno~5%ozJfy?kS)a#n}BkwgV zkNT3Sih9l3pM#`b3`|0GT#6O& zIO-EJaW9|$zr3r9TKII-4$U=JT6{C6@$vu0jM->E)!TdeU!bckN#4iXl3>)tnan~K zuZns->!K#;hq|)i);<}vz}ct^*o#`wCDiygurS_6eV3%~>;3h0oxZ&P+KNvIC}9OE z;TKB?=x2YRK;4SYsI8q~@pTwZ{es2g_V@B~qw?yZ#*akhEwcC#45R*_KkvT^$p(1$ zu%KB7{r4R8@O)qiuD`9EIa~|5@My>ZvK~s7JYnwfh6Q z|KG>)7oEL~aMa3*WFWB&^{I4@#OBsEm-u6H_mgv!@}Cy3L|&Lpl#N(MD{HJk@|SXk zlRuky9P1O^qJCifNE%v1H>@A*E+PCaDLS^AUX5#@t)f*nF~oc;=dqzwT}*i>ZR0sJ z)4vt5EyN01P7UjGoOT_Tu?1%?+Ed2k+qf7@8EMHYa05xT7^v)fi{abH8Ae+?&Q5e* zNZS_9W#oQ9eW^y~I6=9iSM>jL0d*aLI2G4ey$pSmF;-e%C@&R-2{hit2TYWOMm_5~ zazsZp$e8+XB2DO8l~x_RMNX^ejSWKGBlOXcMXi(t<?%JTD?C78S*TGm_5m11 z{j7~Ugq+I6db|AN0G0ck3$F2yP=Oi1V2SC03l+Pu8&nbse3lM-kUC3uA~6 z#i=;S2K|nll(c_{|KMfX^|Po3ISs9^k8&(0hwD_J5M`b9V_e5-Vn1`%r-MG6lTy}a zVHBof;4Pf|l68urjv~Yl+ZexE%*7GJb#y^~j5v{$>sdQLsX4g+`|0=%!L@jW#C=%O zI`Zq&$w^xh`~hp&BHc26{ygPBO7YM9B;2*6 z+;nJ5VomC&Ek`^euA@8gQnc5Oj%pI@7Nt~~Xakn^gTI|Sj62C1MQkkRDat9Vw^D8r zdwcw9@zmtJd>cglzSYr?_^S3B9w1tY3?1|6v4_?M)>AS4 zA!islzY(v=IhwZ9)?SIWIkf3W%os=T8=TJh#vkRzS?(@k7s<^|{cleFQKFb0kD``v zpTQehr_q!@p+k1mF`t~AlmjR)$J*2jG1zQ!bc`YPlJf!O=cwaf&OQDTpUlMCa2DrW zO`o~+oxvEF;_~p1r1FA9et9_`V>0SG@)TTVKRWbA!j+;t8SIA)DXtVPEktbT>0 zB_xl;wWy;V=Y7@53&*qy(s_r?q+{ul9coH};Xrk_^Ft) z4XPi1X{>yL z{Euk6Mqfv#9qFyT^c@=W(XgDvbu{**TtqQWEv^XlES9_<`&0j!+>6n^mKohu)O6G) z`|UB5LT-z{jpe7uL1LW=yg>bZ)f3CfVST$`TAQg5-XZ4-IfXgrQcu7bUr;W`$uC&_ zuP(=NK8jx0GMoF9=D~z?RA!jjuQN?bS6euZWZj_CA5H0Lxx#F+9%W}P+o{%;$eRW z9#_ix)7v*z7Y~SSqfdOwRmh*t6gocT%uPKC%PPR}oVJ1Fhmf!1Guo5#hsHClQidlW zt|K)$Gbn#X&RNbxk08BJ_7=Rh@bJY$X#wC|-ni}K$Ja-7!xx^*?L>@imu%zqq~pv($=yC6Hre{Yb`Q^ur}w9lqcgEe1tlVl6#REUfC?w zh~Fhv%G$jwF2}zdo@omtqJ8hXoC?lWOZdYEQeI2SnJun*Tx3`?O3UXA4&eAs6 z{f%k2Q9Da(2hK${{1AFHqb-*DKe&>%Mx6ZN&VO9T-IOMAhEUE(TTXI!;m`ElNbEz) zEsWW0MG@qTqCS9r(Q$d>2hrgK!EZ^ZOSu%@h!=gVZDzN$^~sNINcoO_AJH$IH2)vg zDbFIFoii`xrQ~JCRkZ6UO*|8){&IK|u|1S^#3gTutxfe%>SL(yCFd%3S5RNl|I*>A zbsB1es^uqQmZ znE02JdohOQcg|5r!8uoTj@KmVSVreP#J}cTOs5Q}V;=2SX?y>8t_tlB;S{DP=eCXW zHg6O4H}vCgQ=HW{mjAE3(hyMn0}>8VSV=i2F&&xdP=;8jS9SOs4X3P4UL$%*`(QVg z)?2h@rR9M2I)m95?Qb$a#uJ#EoO6_qS?^z{pXba(eKheN7GFwP$FH0N8G9b*1kM~b z_Geg^oMPnP)ZbKpPhbiO0ocsnm7f_T+~NF-^9XUa*~vfNbLA?r3-xyhJD`6=fP z;{Q%6-hc{w(hwZRq_w z@dET2g{ujtB36u%`%-^GIjfD^nQ|@SZ;yDCcX93@5TuXiKoT#I^p|DCqy8P`U>w3= zCpqKO{sHP}hs$ZJgfppMr0oS~9R|&WWo@!Jc2;S($EWF0_6-Fo^ue#LD3T#z@PVhVzY$m)RCa ziqnPIC4XODxS0%k)COLU9Y{!|M$SGkp0k1tvXk~{oaH#bqJ4nHNpUt%UXP#B_V!3f z;Uw`dEHKV2PEIcM)eAqC^Irx#z!_nytV3DHLC!fgNn#tg3$ZU~-|*fiN?!;b0JX%KBQtvsFb1oF<2^Cz7%QGZ1} zJ>`3N4_lFYi@1(@l-pB2%~^-G)tp&~@3ZkJHgY~8IPP6Q{rvxnbidmaw)TY3oJ(h}HMw zFmm{}rOrZi;26eukE8o{4NlsV)+h9sKRDp20if zaZ4&s`8)~j8AwNQ>NBJ3cFX8)C-dzw(sFl`cZ>MXoHc3N%2?^WNt|ZHj&LsF{D@P>d2+(yWaNr$as}%V97DonI#!I1 z>YlCTaau1Esl(Y$OCc*GSxu;K$J40e8s~Z16W|PDX>ID1pX%908`Tte?UH+>@XL+2#23_(fqYc`ipU;A`PxbSq zihlek&~n~93bhjb-VH+6|0=W9`(5qr0RKgz86(r%RfY{~8W}NQxHGJBB-=hb%zq`C zG)<#-DUF9l4vgq+iS_z+iLksd>*Wlypk4aAxW7+Wo;vkw*Q;JFPjsaxX#?I?W;g8b zOO+tcht+E|@i$m;^VBCRLQ+@m6WOB^H+yi8K3)0_jtq`f<0vjJmUK_w8NloVyD~-dP!S%L}adF^3$$4-vDUf0kU z7Wc-;Q8A|)`Vz*E$=KZ2-xssEg|Bq7nBThk>LyH*CpKp1t%+aW+%ZlM()(3COYhhH zk5kh3^1bIUNuJxQcHW)4{J#<2RlO13)%_#9pRZ@~{VAe(yxy<-pRoT4ynV>t59&Gl zpSpk4chh>KzN_1)?*-nC`YxzZbG~fADZtZz~H|@J7 od!)HJx5lo}?&_&dlILCB|6sG7D|g=dZsfa!clFuh`}+$1AE}3g2LJ#7 diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 043509386..a7ea0e278 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: JumpServer 0.3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-10 19:00+0800\n" +"POT-Creation-Date: 2021-09-13 17:05+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -119,7 +119,7 @@ msgstr "系统用户" #: acls/models/login_asset_acl.py:22 #: applications/serializers/attrs/application_category/remote_app.py:37 #: assets/models/asset.py:357 assets/models/authbook.py:15 -#: assets/models/gathered_user.py:14 assets/serializers/system_user.py:201 +#: assets/models/gathered_user.py:14 assets/serializers/system_user.py:207 #: audits/models.py:38 perms/models/asset_permission.py:99 #: templates/index.html:82 terminal/backends/command/models.py:19 #: terminal/backends/command/serializers.py:13 terminal/models/session.py:40 @@ -278,7 +278,7 @@ msgid "Applications" msgstr "应用管理" #: applications/models/application.py:168 -#: applications/serializers/application.py:82 assets/models/label.py:21 +#: applications/serializers/application.py:88 assets/models/label.py:21 #: perms/models/application_permission.py:20 #: perms/serializers/application/user_permission.py:33 #: tickets/serializers/ticket/meta/ticket_type/apply_application.py:20 @@ -287,7 +287,7 @@ msgid "Category" msgstr "类别" #: applications/models/application.py:171 -#: applications/serializers/application.py:84 assets/models/cmd_filter.py:53 +#: applications/serializers/application.py:90 assets/models/cmd_filter.py:53 #: assets/models/user.py:206 perms/models/application_permission.py:23 #: perms/serializers/application/user_permission.py:34 #: terminal/models/storage.py:55 terminal/models/storage.py:116 @@ -308,14 +308,14 @@ msgid "Attrs" msgstr "" #: applications/serializers/application.py:59 -#: applications/serializers/application.py:83 assets/serializers/label.py:13 +#: applications/serializers/application.py:89 assets/serializers/label.py:13 #: perms/serializers/application/permission.py:16 #: tickets/serializers/ticket/meta/ticket_type/apply_application.py:24 msgid "Category display" msgstr "类别名称" #: applications/serializers/application.py:60 -#: applications/serializers/application.py:85 +#: applications/serializers/application.py:91 #: assets/serializers/system_user.py:26 audits/serializers.py:29 #: perms/serializers/application/permission.py:17 #: tickets/serializers/ticket/meta/ticket_type/apply_application.py:31 @@ -324,7 +324,7 @@ msgstr "类别名称" msgid "Type display" msgstr "类型名称" -#: applications/serializers/application.py:101 +#: applications/serializers/application.py:107 msgid "Application display" msgstr "应用名称" @@ -735,7 +735,7 @@ msgstr "全称" msgid "Parent key" msgstr "ssh私钥" -#: assets/models/node.py:559 assets/serializers/system_user.py:200 +#: assets/models/node.py:559 assets/serializers/system_user.py:206 #: users/templates/users/user_asset_permission.html:41 #: users/templates/users/user_asset_permission.html:73 #: users/templates/users/user_asset_permission.html:158 @@ -834,7 +834,7 @@ msgstr "节点名称" msgid "Hardware info" msgstr "硬件信息" -#: assets/serializers/asset.py:98 assets/serializers/system_user.py:218 +#: assets/serializers/asset.py:98 assets/serializers/system_user.py:225 #: orgs/mixins/serializers.py:26 msgid "Org name" msgstr "用户名" @@ -883,7 +883,7 @@ msgstr "密钥指纹" msgid "Nodes amount" msgstr "节点数量" -#: assets/serializers/system_user.py:53 assets/serializers/system_user.py:202 +#: assets/serializers/system_user.py:53 assets/serializers/system_user.py:208 msgid "Login mode display" msgstr "认证方式名称" @@ -911,11 +911,11 @@ msgstr "路径应该以 / 开头" msgid "Password or private key required" msgstr "密码或密钥密码需要一个" -#: assets/serializers/system_user.py:217 +#: assets/serializers/system_user.py:224 msgid "System user name" msgstr "系统用户名称" -#: assets/serializers/system_user.py:227 +#: assets/serializers/system_user.py:234 msgid "Asset hostname" msgstr "资产主机名" @@ -1954,7 +1954,7 @@ msgstr "退出登录成功,返回到登录页面" msgid "One-time password" msgstr "一次性密码" -#: authentication/views/mfa.py:50 notifications/backends/__init__.py:15 +#: authentication/views/mfa.py:50 msgid "SMS" msgstr "短信" @@ -2575,15 +2575,11 @@ msgstr "企业微信 认证" msgid "SSO Auth" msgstr "SSO Token 认证" -#: settings/serializers/auth/base.py:18 settings/serializers/basic.py:15 +#: settings/serializers/auth/base.py:19 settings/serializers/basic.py:15 msgid "Forgot password url" msgstr "忘记密码 URL" -#: settings/serializers/auth/base.py:21 -msgid "Health check token" -msgstr "健康检查 Token" - -#: settings/serializers/auth/base.py:24 +#: settings/serializers/auth/base.py:25 msgid "Enable login redirect msg" msgstr "启用登录跳转提示" @@ -2994,9 +2990,13 @@ msgstr "启用周期任务" #: settings/serializers/other.py:21 msgid "Ansible windows default shell" -msgstr "Ansible windows shell" +msgstr "Shell(Windows 资产)" -#: settings/serializers/other.py:25 +#: settings/serializers/other.py:22 +msgid "The shell type used when Windows assets perform ansible tasks" +msgstr "windows 资产执行 Ansible 任务时,使用的 Shell 类型。" + +#: settings/serializers/other.py:26 msgid "Perm single to ungroup node" msgstr "直接授权资产放在未分组节点" @@ -6158,3 +6158,6 @@ msgstr "旗舰版" #: xpack/plugins/license/models.py:77 msgid "Community edition" msgstr "社区版" + +#~ msgid "Health check token" +#~ msgstr "健康检查 Token" diff --git a/apps/settings/serializers/other.py b/apps/settings/serializers/other.py index f8ebaeceb..6ca55009c 100644 --- a/apps/settings/serializers/other.py +++ b/apps/settings/serializers/other.py @@ -18,7 +18,8 @@ class OtherSettingSerializer(serializers.Serializer): PERIOD_TASK_ENABLED = serializers.BooleanField(required=False, label=_("Enable period task")) WINDOWS_SSH_DEFAULT_SHELL = serializers.CharField( - required=False, max_length=1024, label=_('Ansible windows default shell') + required=False, max_length=1024, label=_('Ansible windows default shell'), + help_text=_('The shell type used when Windows assets perform ansible tasks') ) PERM_SINGLE_ASSET_TO_UNGROUP_NODE = serializers.BooleanField(