From 7241f7509fec9909c739918bfc24844002eac945 Mon Sep 17 00:00:00 2001 From: ibuler Date: Mon, 5 Sep 2016 20:27:44 +0800 Subject: [PATCH] Update nav --- apps/locale/zh/LC_MESSAGES/django.mo | Bin 8840 -> 8934 bytes apps/locale/zh/LC_MESSAGES/django.po | 92 ++++++++++++++++----------- apps/templates/_foot_js.html | 2 +- apps/templates/_nav.html | 26 ++++---- apps/users/forms.py | 2 +- 5 files changed, 69 insertions(+), 53 deletions(-) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 08bde2ecf08285d72387dbc136d365065aea1254..e6457f782439fe50578c1a100eb53a7e47fe1b4d 100644 GIT binary patch delta 3167 zcmZA2drVhl9LMno1SGrwDr8>Zhsm`PZ>V`IMM_gM^HSbYQ4kV^K)mabQbeIy{T8i@ zGeOgTT)G9hp=~;InMLWcw5e=eTrFF!_vd%M{?jwQyq@oK&Uv2idCu?rel>Yl z^SmFrMZE54bwnRxV}x@juq~Q@v~M~&cRtLyi?|yPb#bmE<5Oati^7@M0q3E{7h+dj zhB3Grxx`grChoHFqZsL&=UV8*bKn%RhHJw(`~^GX-*^v3F{nJw?2B3;3sp#tIU03- zF808wHlA6{8AYFInGhqoX@}1$E(W?oqw9L1uFFC_ifq(6W6(>ZGl`B)EJK~R#oUJa80D#&&B^G>K6i|@|!`$|l(fvrq-iM?H$gr~-;ng_W3< z=4RA<+mTIh^{DIjqY61_Hre>m?(DxNKF)w9Jc)V~XHXNhp)S0EL-02nPvw)9NIn!F z#L1|wU5i?<8nvUfsCnK--SGibVU4JDnmrphixU|55%pn8Pw*$qMHM(5Rp1;{LHVc& zi%<)eTD}UkgBvgvw_{H{h_D&SRQ9?$KiGnFrv!`Om%?&X!l=KK5$7qA_gV5zy> zEJsbW4z-m#PzBaw2EJ?Kt*Gn2w)}h4dDk&k@Bb|uh~PFfQCG9KnPKLb<53e%vwSvE zt6O5@o6N1qCc0Y7_o5!be$+Z2NxlC^>8PTUs5?4~THvxyz-xB=7V;*!JE-&G`})UI z%mJ9j_$buzeAK+mV73pCKtf`{$Erv7P&<)p`5e@Fg-PtcDqO*UTw@2SQ15vSK904hLcc=oz-99f)Rsmi`xC~X&WpD^ z$?{axb%QYr^HA%RC42sb>lsi*Rb~xpqFtyH-$A_v`|S9~s0ojtwz}2EFQTryY(>WWKn4!OY}7=BsD&y}l~<$28&T&UM-}*mc?LCp5krNT?WjU; zV-d#i{PexxRnXA{b*KyL&E2T?`8~@IpuR8~Ek9y@hAOZH`R;NTP>kov!N}s2nN36E7yM$Y(4wJ3F6ju;>*7JxGLTwu{nV7BQ zf9+Yz*Xa4HO(Lce*~G)dKq5elBeoJx6KV^I4Me&U+C-v;*r9~B-N!93d*KwKtL4w& z{lsFTFR@eW4g=Q|M0Lt(}8X^;jya DY=0jo delta 3109 zcmYk;drVhl9LMnoTUHnTS8s;R4uC~dWthPKA0tNwCJ?fp5wFI&(2{$9`b`JMBe?|GizIe2SU z<1FvjxQMqLt%*n?R!2DZCARkDgVxf=xsEXBPT*0jk997Z@ua@aMPUZ^z>%o&JbVZz zU~im_oZ?DwIIgtuCX95>a|h}4=ZhoQ4_h$?&tosVWO;{q9X0W7Q~`HQovh=daRBy5 zeV=9HqcD?v0&-zjjy<@(tDvKb*C78~Eg#J3_M`5o8TI`;mY>8SP#3t2 zI`2o+dACqY--RmhE@ojQRqMDM^mJe$9a)6h_SvXCU5Meh81t|cRX_vk&JLg^I)*y_ zV^m?MQ3ai|{43OrT|uqn_n3w^;#hxG77-shpdYG`MD%}Tr~)!jg=L$g%}J;UXCOD{ zN>JxlpbA-QZnE(j)Vy`5`F6*%{@ROI7|=w`s1rZH0&KPM-!Osv4(4DKzc4Lr0s1S4 zT8Y`Hc}h`t96%Me0d<{v%U{Kr+ z^I}m2CSWQiqb@uZHO~TE!TX~eFXGum=MIOl|2qeVPE2GOG(n1)Y386NDnKn^F{>L${dRVl<~ms`HhtVT~0?684-sOR!E)c8sBoPGa|<=>gVpjO~d%O9XF7?TnzFy2f? zjc21C=UjXY^HbP=U8s%$tw4i$7`2qGs1r}2jyq%dMawUv&bx*qunV=<2}48YrJC7h zE^3}}sN-e~^+Lbi`F6k()P!ZIt*Ekb4|QUL)qq6&Q%*WxME^FNq<)cIpj=M|d8sK<7m z<=!GXdNC|TO*YdHb3l!lD`A$eYWYK7QgR> zUcXC8wiAWKGGZ(-no!d|s*NF56Ele#Vg}Jjj3c^RJ{_&5-uY^JrR#P6Fi}dpKm>>a zVh1st>$^2XHKDeVs32ZaVl4}`^lI9Qt;91*Xgdkbp{75{^Zj1vN3HH8qBk*_m`KzT z&l9@{{UE(3_{b)-*Lt0Hw+!nH!ztFEii?Rd%e5`tty8|x;# zyY?nVQfzb;t|zqD%ZYV_+8$yq@stwUtPuWZ{r~#v>gDn{F^ZT##{O>GI0Myw=wJG=cv9O3w-*-@yh;66s}1}A>CjW6wtz?{^f(1SjLm5Kw@+7(;6Ht@wzc<53U9j;*BBm? zx@2o$i(6c`wI;AJ*f6j*7@g1=Te)i6hQOBT)z!HbRU3m{2}2|E$4t&IXzQEU84\n" "Language-Team: Jumpserver team\n" @@ -82,7 +82,7 @@ msgid "VALUE" msgstr "VALUE" #: assets/models.py:55 assets/models.py:77 users/forms.py:12 -#: users/models.py:106 users/templates/users/login.html:58 +#: users/models.py:106 users/templates/users/login.html:54 #: users/templates/users/user_detail.html:73 #: users/templates/users/user_edit.html:5 #: users/templates/users/user_list.html:13 @@ -90,7 +90,7 @@ msgid "Username" msgstr "用户名" #: assets/models.py:56 assets/models.py:78 users/forms.py:13 -#: users/templates/users/login.html:61 +#: users/templates/users/login.html:57 #: users/templates/users/reset_password.html:52 #: users/templates/users/user_add.html:8 users/templates/users/user_add.html:10 #: users/templates/users/user_edit.html:12 @@ -162,7 +162,7 @@ msgstr "端口" msgid "Asset groups" msgstr "用户组" -#: assets/models.py:107 +#: assets/models.py:107 assets/models.py:109 templates/_nav.html:24 msgid "Admin user" msgstr "管理用户" @@ -170,10 +170,6 @@ msgstr "管理用户" msgid "Admin password" msgstr "管理员密码" -#: assets/models.py:110 -msgid "Sys User" -msgstr "系统用户" - #: assets/models.py:111 templates/_nav.html:23 msgid "IDC" msgstr "机房" @@ -318,8 +314,8 @@ msgstr "欢迎使用Jumpserver开源跳板机系统" msgid "Help" msgstr "帮助" -#: templates/_nav.html:9 users/views.py:102 users/views.py:115 -#: users/views.py:159 users/views.py:176 users/views.py:201 users/views.py:214 +#: templates/_nav.html:9 users/views.py:100 users/views.py:113 +#: users/views.py:153 users/views.py:170 users/views.py:195 users/views.py:208 msgid "Users" msgstr "用户管理" @@ -327,12 +323,18 @@ msgstr "用户管理" msgid "User" msgstr "用户" -#: templates/_nav.html:13 users/models.py:109 -#: users/templates/users/user_detail.html:181 -#: users/templates/users/user_list.html:15 -msgid "Usergroup" +#: templates/_nav.html:13 +msgid "User group" msgstr "用户组" +#: templates/_nav.html:22 +msgid "Asset group" +msgstr "资产组" + +#: templates/_nav.html:25 +msgid "System user" +msgstr "系统" + #: templates/_nav.html:26 msgid "Label" msgstr "标签" @@ -385,8 +387,12 @@ msgstr "注销登录" msgid "Play CAPTCHA as audio file" msgstr "" +#: templates/captcha/text_field.html:4 +msgid "Captcha" +msgstr "验证码" + #: users/forms.py:31 users/forms.py:50 -msgid "Join usergroups" +msgid "Join user groups" msgstr "添加到用户组" #: users/models.py:102 users/models.py:225 @@ -397,6 +403,11 @@ msgstr "管理员" msgid "Email" msgstr "邮件" +#: users/models.py:109 users/templates/users/user_detail.html:181 +#: users/templates/users/user_list.html:15 +msgid "Usergroup" +msgstr "用户组" + #: users/models.py:110 users/templates/users/user_detail.html:93 #: users/templates/users/user_list.html:14 msgid "Role" @@ -434,16 +445,16 @@ msgstr "Administrator是初始的超级管理员" msgid "System" msgstr "系统" -#: users/templates/users/_user.html:18 users/templates/users/user_list.html:5 -#: users/views.py:115 +#: users/templates/users/_user.html:17 users/templates/users/user_list.html:5 +#: users/views.py:113 msgid "Create user" msgstr "创建用户" -#: users/templates/users/_user.html:34 +#: users/templates/users/_user.html:33 msgid "Account" msgstr "账户" -#: users/templates/users/_user.html:44 +#: users/templates/users/_user.html:43 msgid "Security and Role" msgstr "角色安全" @@ -455,11 +466,11 @@ msgstr "忘记密码" msgid "Input your email, that will send a mail to your" msgstr "输入您的邮箱, 将会发一封重置短信邮件到您的邮箱中" -#: users/templates/users/login.html:46 users/templates/users/login.html:66 +#: users/templates/users/login.html:42 users/templates/users/login.html:62 msgid "Login" msgstr "登录" -#: users/templates/users/login.html:51 +#: users/templates/users/login.html:47 msgid "Captcha invalid" msgstr "验证码错误" @@ -484,7 +495,7 @@ msgstr "生成重置密码连接，通过邮件发送给用户" msgid "Confirm delete" msgstr "确认删除" -#: users/templates/users/user_detail.html:18 users/views.py:176 +#: users/templates/users/user_detail.html:18 users/views.py:170 msgid "User detail" msgstr "用户详情" @@ -625,64 +636,69 @@ msgstr "" "
\n" " " -#: users/views.py:55 +#: users/views.py:53 msgid "Username or password invalid" msgstr "用户名或密码错误" -#: users/views.py:72 +#: users/views.py:70 msgid "Logout success" msgstr "退出登录成功" -#: users/views.py:73 +#: users/views.py:71 msgid "Logout success, return login page" msgstr "退出登录成功，返回到登录页面" -#: users/views.py:102 +#: users/views.py:100 msgid "User list" msgstr "用户列表" -#: users/views.py:111 +#: users/views.py:109 #, python-format msgid "Create user%s success." msgstr "创建用户%s 成功" -#: users/views.py:159 +#: users/views.py:153 msgid "Edit user" msgstr "编辑用户" -#: users/views.py:201 +#: users/views.py:195 msgid "Usergroup list" msgstr "用户组列表" -#: users/views.py:214 +#: users/views.py:208 msgid "Create usergroup" msgstr "创建用户组" -#: users/views.py:246 +#: users/views.py:240 msgid "Email address invalid, input again" msgstr "邮箱地址错误，重新输入" -#: users/views.py:257 +#: users/views.py:251 msgid "Send reset password message" msgstr "发送重置密码邮件" -#: users/views.py:258 +#: users/views.py:252 msgid "Send reset password mail success, login your mail box and follow it " msgstr "" "发送重置邮件成功, 请登录邮箱查看, 按照提示操作 (如果没收到,请等待3-5分钟)" -#: users/views.py:270 +#: users/views.py:264 msgid "Reset password success" msgstr "重置密码成功" -#: users/views.py:271 +#: users/views.py:265 msgid "Reset password success, return to login page" msgstr "重置密码成功，返回到登录页面" -#: users/views.py:287 users/views.py:300 +#: users/views.py:281 users/views.py:294 msgid "Token invalid or expired" msgstr "Token错误或失效" -#: users/views.py:296 +#: users/views.py:290 msgid "Password not same" msgstr "密码不一致" + +#, fuzzy +#~| msgid "Asset groups" +#~ msgid "Assetgroup" +#~ msgstr "用户组" diff --git a/apps/templates/_foot_js.html b/apps/templates/_foot_js.html index 1b81e3406..415244754 100644 --- a/apps/templates/_foot_js.html +++ b/apps/templates/_foot_js.html @@ -15,7 +15,7 @@ $('#index').addClass('active') } else { $("#"+s1).addClass('active'); - $('#'+s1+' .'+s2).addClass('active'); + $('#'+s1+' #'+s2).addClass('active'); } function getCookie(name) { diff --git a/apps/templates/_nav.html b/apps/templates/_nav.html index 969420674..2c3169361 100644 --- a/apps/templates/_nav.html +++ b/apps/templates/_nav.html @@ -9,30 +9,30 @@ {% trans 'Users' %} -
  • +
  • {% trans 'Assets' %}
  • {% trans 'Perms' %} @@ -47,8 +47,8 @@ {% trans 'File' %}
  • diff --git a/apps/users/forms.py b/apps/users/forms.py index 88b6ccd93..e388fa400 100644 --- a/apps/users/forms.py +++ b/apps/users/forms.py @@ -28,7 +28,7 @@ class UserAddForm(ModelForm): } widgets = { - 'groups': forms.SelectMultiple(attrs={'class': 'select2', 'data-placeholder': _('Join usergroups')}), + 'groups': forms.SelectMultiple(attrs={'class': 'select2', 'data-placeholder': _('Join user groups')}), }