From 6b7744c3e8416883a3ad8f2f43540162870d4010 Mon Sep 17 00:00:00 2001 From: zhengxie Date: Mon, 29 Oct 2012 23:12:06 +0800 Subject: [PATCH] Fixed bug in i18n --- locale/zh_CN/LC_MESSAGES/django.mo | Bin 12908 -> 13081 bytes locale/zh_CN/LC_MESSAGES/django.po | 33 ++++++++++++--- profile/locale/zh_CN/LC_MESSAGES/django.mo | Bin 1139 -> 1154 bytes profile/locale/zh_CN/LC_MESSAGES/django.po | 43 +++++++++++++------- profile/templates/profile/profile_base.html | 2 +- profile/templates/profile/set_profile.html | 14 +++---- templates/org_admin_base.html | 7 ++-- templates/org_base.html | 11 ++--- 8 files changed, 73 insertions(+), 37 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo index f2bc3b3d65077c0147341bedd60c3a6febace54c..9b252cf61a60f4d8759be274b10f38e7f15f1412 100644 GIT binary patch delta 4782 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 t*Q)(qU*+hu#AXq%@BZg8f5V=Y*H%~g3p4UVZ| delta 4636 zcmYk;4Nz899>?*6BJm`sfKpLzkO=me2!^hPDM+UIx~yrbk%FWsURlzFEUqt`jg7vv^#GRC={QO-RduU_X;6P=62G)%ytwFl!bXb;B@ScaW(4tB#Q zQA4ajjr%g{`h9pE9!I9~+<7~2!S8VY#V(xCA<4OGF&QHZz-Zb*)P#MpBlbs4RDfE* zcnsh)YtOdhORy9DE6rMrVSe{26@J`yJ~YrF)Icq$2~J}Q{vEThL)Xa4T`pcjI}bHs zA!>rL<^$GWfx3Z3s2f;{x`E}`h521ImFsbn9SEZa-fJGlINC>03u;9TbQaU`8`J{g z*mvz*GHQZMWX-ORwF{6fcOy{Ok3&xrO`xI)reZ3VqjsViHQ{<|*P|wQ6E$Hoj=*Es z8@nd^3(rSAx{;^}Cs_X!)I6ouo|nx2Yb8(6!A-a-)E2HqZP`}T@kZ1m*Q3jQCSHb`U@dCE z&DajNqRy|!8*nGi!Xv2ja(J$~egJAm?zVOjYQ7SWitcz0_QE9?#5&Z#$59u4g<8

w+Qbt$NcbId`gohZP_4xkoNggiRWmD+)FJMgHrSD+?bjhbKs zYN4-KyAd_;F4Q})8?~@~sEIzZ<0nuH`V#dHoI#EE6UOQLf0+tDE^wp2mFYNy_Fd+3 z97wwvd*aWShiUv;dkTxO3{T-0%csFGim`xFBWB;B3^_rwX;zYfz753u?iyp%&PLTF_zC0zW`D%^gEM`)^S@ zaVgcl|50iFfHA0Nlw|g@{yWW4s5`n3HPCd_0v4E+s5^ZIHBL3oh~keAYRB63@L%Rc zR6D(g=l`|Jr9*c($_^AG-!S)xwV$=)wPqtSrrVEtG^bHJavrsyAFX}a45a)0$*A*F z%}kGqF3du$C=a!e(boT<^;ejcW{tTSHQ+XDH<`_-aXz!-=dFDK`Emc_L-Q7;^T0Jg zjyVu@2SZUO+++Qd%wn_5tU!MKyM?HCXjLd7Hp$bi?6xECo2O7S{S);zTtv;#HN!Uz zbvz5T^#0Z!X^uyoKgrrN%sHrMu>du1D1*03C)U#;ccH!)2T-^6F%HGgu@833^!p1@ z=a0o0oMM((f4Q|6S-Z-tMlHA&HGX3zZOt3Tm5 z)cGZ-3CgX#7b&Rte$Q>O0}XzM+hOh9sEH0*`xt6rt*8NiwBwho9n;%CKOQwf z3hKN*)}Lz@*zs`~&|j4jD%!FNJE0PF;VN@AYUQ=4fw!U-7B&x=$L;uEQP+QG{r^Ud zA9b5=0_M|Blg#f*sc;jn9<}8yI2^yj<#;=<{=K*d$6{QT|3A?b)WVjbCa6J8ycy%L z4z=K&*57RXN6c3Abiz41;XkN>u9)$C{eilp1`b*~2er^4s09?;@maW$_FSBavDy6E z!g;9g{b3w{=Wr0FwII+r>HfMqvTGaqTi${8+=@4sHAg}cZAlj$ZMpN z9a(37WQvEao`~zo@2nlhKanZq9`ZiZ~NPIi$Q zWFC2tWRq5sL3)w4@*I^9$!t@?x3B}*M_wfZ zh{^+`mK-E2NIfYedb_VBX+&ibDJ9paaaHL{ePgI7A;~*ty?gLJvfSEj+|^dW1o8$s zKsu7o$y}nc-N%hGi?I)>ARky?XB=mBFEXwN^|Aj4qOi27 diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index 4a0642f005..9abdb17f84 100644 --- a/locale/zh_CN/LC_MESSAGES/django.po +++ b/locale/zh_CN/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-29 20:24+0800\n" +"POT-Creation-Date: 2012-10-29 23:01+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -50,6 +50,7 @@ msgid "Password should be less than 15 characters" msgstr "密码太长" #: forms.py:89 +#, python-format msgid "Name %s is not valid" msgstr "名称 %s 含有无效字符" @@ -186,15 +187,17 @@ msgstr "已用空间" msgid "My Home" msgstr "我的页面" -#: templates/myhome_base.html:12 +#: templates/myhome_base.html:12 templates/org_base.html:12 msgid "Public Library" msgstr "公共资料" -#: templates/myhome_base.html:16 templates/pubinfo.html:22 +#: templates/myhome_base.html:16 templates/org_base.html:15 +#: templates/pubinfo.html:22 msgid "Groups" msgstr "群组" -#: templates/myhome_base.html:19 templates/snippets/my_owned_repos.html:35 +#: templates/myhome_base.html:19 templates/org_base.html:18 +#: templates/snippets/my_owned_repos.html:35 msgid "Share" msgstr "共享" @@ -202,10 +205,26 @@ msgstr "共享" msgid "Contacts" msgstr "通讯录" -#: templates/myhome_base.html:26 +#: templates/myhome_base.html:26 templates/org_base.html:21 msgid "Public Info" msgstr "公共信息" +#: templates/org_admin_base.html:7 +msgid "Org Info" +msgstr "团体概况" + +#: templates/org_admin_base.html:10 +msgid "Library Management" +msgstr "资料库管理" + +#: templates/org_admin_base.html:13 +msgid "Group Management" +msgstr "群组管理" + +#: templates/org_base.html:9 +msgid "Personal" +msgstr "个人页面" + #: templates/pubinfo.html:8 msgid "Users" msgstr "成员列表" @@ -499,7 +518,7 @@ msgstr "前一页" msgid "Next" msgstr "下一页" -#: templates/repo_history.html:52 templates/repo_view_snapshot.html:56 +#: templates/repo_history.html:55 templates/repo_view_snapshot.html:56 msgid "Per page: " msgstr "每页：" @@ -624,6 +643,7 @@ msgid "Processing..." msgstr "处理中..." #: templates/repo_view_file.html:150 +#, python-format msgid "You have not downloaded %(repo.name)s" msgstr "您还没有将资料库 %(repo.name)s 下载到本地" @@ -731,6 +751,7 @@ msgid "You're receiving this e-mail because you requested a password reset" msgstr "您收到这封邮件是因为您请求了密码重置。" #: templates/registration/password_reset_email.html:3 +#, python-format msgid "for your user account at %(site_name)s" msgstr "" diff --git a/profile/locale/zh_CN/LC_MESSAGES/django.mo b/profile/locale/zh_CN/LC_MESSAGES/django.mo index ecfd8683e63acc1f810772629647938956193b0d..0bb6cd2b1707d354b845d0d503e42e50545052eb 100644 GIT binary patch delta 571 zcmX}oJ4?e*6bJCrG_6+aqYgfb)(k?ci$xJMlU*I8ATDmPjZ)C2wAU971zkiD3s)B_ zI4FWk77OBg@B=uwi8!^XAmSkI{%;dKaPqq++;i_qzUw!9`L{OtfDo<7ZsZZNL#$nR zAXcFduE7?#3F{ztEW&owC$JY@Lvhv%6n!5~{o~YL$?k83I4@6~Sa`890z+`nsV89q zP18^ubmg`Oc!c$+pP_jF3jNT6o$wn5pkKE4g`lXzPz*i>#l9Hy<9?dKLJTlpdqI?T z>UD_wYfXTfk>bllG$KWh_#+}PV=cr$O-PSj5{{@1hnfDP0W0wV6q_}cdYH1Ps}xHn z6=o<2Bh9n~%Ta7uV_H__Tdr~b=?V_hq`~xvkzpw#tu6Gc3dOZtZpFwZRf=bgxzvLG zr!u88mP*g_J}K;-&LlOa^9gCjGc>G5M=#DLugh1y*{R;_e%&5&(;ehb?kFFSM|eQ) nioBQ3Dtnjj=6&_fBx|owzCNY$gK6zwSzCq5_Ayz-5(@eSK2BuF delta 577 zcmXZXIYSc;S^T6b~$nXcH_9Vj-f~h*-&zO-w-cNp@AN;?Z~@Q8qS; zXc56mi&$t<*rv0TAXx2g(pcH6|7w4$xMS73`=jSTTk>J&GI z(Yz!o$_`IRK|vd|4{FQyRaamlI6jum+TAw4adM}>eRx@?3=Q2!xdql5!bZ(s7vVU?Ya902T diff --git a/profile/locale/zh_CN/LC_MESSAGES/django.po b/profile/locale/zh_CN/LC_MESSAGES/django.po index 84981804b8..0b252d9ecf 100644 --- a/profile/locale/zh_CN/LC_MESSAGES/django.po +++ b/profile/locale/zh_CN/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-29 14:20+0800\n" +"POT-Creation-Date: 2012-10-29 23:08+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -30,31 +30,35 @@ msgstr "修改失败" msgid "Has not accepted invitation yet" msgstr "他还未接受邀请。" -#: templates/profile/set_profile.html:9 -msgid "Modify Personal Infos" +#: templates/profile/profile_base.html:4 +msgid "Profile Setting" +msgstr "账号设置" + +#: templates/profile/set_profile.html:6 +msgid "Profile" msgstr "个人基本信息修改" -#: templates/profile/set_profile.html:11 -msgid "Avatar: " +#: templates/profile/set_profile.html:8 +msgid "Avatar:" msgstr "头像: " -#: templates/profile/set_profile.html:12 templates/profile/set_profile.html:13 -msgid "Change" +#: templates/profile/set_profile.html:9 templates/profile/set_profile.html:10 +msgid "Update" msgstr "更改" -#: templates/profile/set_profile.html:13 -msgid "Password: " +#: templates/profile/set_profile.html:10 +msgid "Password:" msgstr "密码:" -#: templates/profile/set_profile.html:14 -msgid "Nickname: " +#: templates/profile/set_profile.html:11 +msgid "Nickname:" msgstr "昵称: " -#: templates/profile/set_profile.html:19 -msgid "Introduction: " -msgstr "一句话介绍: " +#: templates/profile/set_profile.html:16 +msgid "About me:" +msgstr "介绍：" -#: templates/profile/set_profile.html:24 +#: templates/profile/set_profile.html:21 #: templates/profile/user_profile.html:36 msgid "Submit" msgstr "提交" @@ -74,3 +78,12 @@ msgstr "名字(可选)：" #: templates/profile/user_profile.html:34 msgid "Note(optional): " msgstr "备注(可选)：" + +#~ msgid "Modify Personal Infos" +#~ msgstr "个人基本信息修改" + +#~ msgid "Change" +#~ msgstr "更改" + +#~ msgid "Introduction: " +#~ msgstr "一句话介绍: " diff --git a/profile/templates/profile/profile_base.html b/profile/templates/profile/profile_base.html index 1d246be9f1..b97e5dfa27 100644 --- a/profile/templates/profile/profile_base.html +++ b/profile/templates/profile/profile_base.html @@ -1,7 +1,7 @@ {% extends "myhome_base.html" %} {% load i18n %} -{% block title %}{% tran 'Profile Setting' %}{% endblock %} +{% block title %}{% trans "Profile Setting" %}{% endblock %} {% block subnav %} diff --git a/profile/templates/profile/set_profile.html b/profile/templates/profile/set_profile.html index d3eec3c076..002727472b 100644 --- a/profile/templates/profile/set_profile.html +++ b/profile/templates/profile/set_profile.html @@ -3,22 +3,22 @@ {% block right_panel %}

-

{% trans 'Profile' %}

+

{% trans "Profile" %}

- {% avatar request.user.username 60 %} - {% trans 'Update' %}
- {% trans 'Update' %}
- + {% avatar request.user.username 60 %} + {% trans "Update" %}
+ {% trans "Update" %}
+ {% for error in form.nickname.errors %} {{ error|escape }} {% endfor %}
- + {% for error in form.intro.errors %} {{ error|escape }} {% endfor %}
- +
{% endblock %} diff --git a/templates/org_admin_base.html b/templates/org_admin_base.html index 6d42ee2d14..08332836ff 100644 --- a/templates/org_admin_base.html +++ b/templates/org_admin_base.html @@ -1,16 +1,17 @@ {% extends "base.html" %} +{% load i18n %} {% block top_bar_org_manager_class %} class="cur"{% endblock %} {% block nav %}