From e9fd5d7b0eb8970753a06632b037b451d561183e Mon Sep 17 00:00:00 2001 From: llj Date: Tue, 30 Oct 2012 16:43:22 +0800 Subject: [PATCH] [shareadmin]translation and css modification --- share/locale/zh_CN/LC_MESSAGES/django.mo | Bin 1697 -> 3250 bytes share/locale/zh_CN/LC_MESSAGES/django.po | 152 ++++++++++++++++++----- share/templates/repo/share_admin.html | 38 +++--- share/views.py | 39 +++--- 4 files changed, 159 insertions(+), 70 deletions(-) diff --git a/share/locale/zh_CN/LC_MESSAGES/django.mo b/share/locale/zh_CN/LC_MESSAGES/django.mo index 21ac221cf95af480079b4c6ec72f4cd78dd229aa..4a8e1aae65a4fa0f3bff5089c0852243a58d9357 100644 GIT binary patch literal 3250 zcmb`H+fNi%9LG;v+bX?T?cLg*Qmq&rTx_+vq7`AGL~h|`HBFjv=des2W;Qdk>OPnd zm5W*ggCdI&e4tV?p+y!|TUgqbufZWbW+}46;Kpx)|$m9PW+ztK! z29c|5IQ=Z-RvZQu>Gs$ME`vPi@jA%k{thew?}0oY?;!}TuLIYC3b+F71-ZTJ;AU_N z#6^C^ji2`i$e%Ak@B+9LN;QLa8V)2eAphcX){dmn=uLM_N zzKzNA!Fz+-=i^08UaQwJ;U;+w6J>M;_wgmn<(NEfK6qdA9>~T-+6iy%7cf(U*EcoZ zz=GE!HQvJFT~9#B2#_hvWD+$Z!5}k?hKQm>bD=eYx*RrTO(g+IHk})75M_l)?%LVU zB#6b1mYNzh8bzJ)#cG4*F05ZqMT0Ums7J&6R7Kvei@MAV8WdGkGwFWjT9LRJ)&$cA z)gq=LOEBDshqB2YX1bAWFtDu=r*LyR3(1DbbS6FEr3a{gy7L7r$R?FE_{J@i4!$5H|S(nXRQi%s5ubDxr(pyM16D5Hgbys_Iq!7y{?I6cN?EoV+ zPT^`bcOlVqASnf}X^vBlwZ^Ik)LFy!?A19=JFGRbcR1$r zH;6lO|Ir>2|KAOUbS)D8n}d&F5Ow{xvCa>&US@|#y^LNp$X;}Uh_Av)hJ+q48>#5^ zeU!>7tzlxJqD3Sk$vO*~nhtFcpB=+zm-^xq-W@c=&<`U2Z1zWKP?3@IHI7-BQxB}+ z#v0Iu!a*EQ!(xan*l|_5_BqZGN+qElU5Re-)2f2P-3289S|6ycDXpx?s%BwLH-&N| zBum1sNXQUsH9yU&s;m_Xb>_5~Py|o>bfYhCqmbtl-uKbGP5w<=*ZH>ieAp4S7nGLm zEGR0f4%F1_z*aRBK}Z=hs_OPMU>TTXkSq`n7O^KwpiGb*~i^#V7d@cgPJ6(AwS)+UpBL*OV3cXlRc#!2E%PjdPUu`eE*jdjIm zM(wk=t)Xkl>%;R@-aA&ywfN+f#8iy`O5JTgHXkJmsL|ilIyqpCwI=$GCvP0Ldt%mP zcYLBFdF*a_d*VvW8tR!nI+_^0_Fy~7v0-e9Pu;Y}`|SS9_BSI|>lY8$o>5!v;~6L6 z4Xjw>or$UA@WJ}J*Xkdcx7TX93b#B*z4&|Da44~lj-(y7T5iUtdg7ClbAz(RTkYQI z#Ly&cCTC)^ZH{y4n2GJ!;emEf6RQiSpC?x5WxM}GdXIf-n2XIV_K6NG-1FR$a4+rd zj`-bvk{p||T4S!7Td+FE>>HiQui7DuxevV(L(ya3YqLh&-Mrv0)U!4^nCNQde^P2+8cy_|%B0rmmGm$A|FY^7Hz)O9OYXf literal 1697 zcmZvaO>7%Q6vu~Bz6|A~fVhA(3MW);up&E+1eAcWW8&4*9n$D zN<)Z^($*&71fB z@9o|^eDET{cntGN%uURvFkim|3&sube((qIAo!EZZP(reJ+S`)z6<^h=D>Fj5ONRr z3&`L74syRgT^_iTko#~x1akWm;N4&c_yG6}crW-o_%Qe~$o&!^fA<=gMlJ^Oci$rk z=M9%Xf)C+*6XfxJ1((6Uz|-L3T~3^*@rb_@Tt4Tr$K`R5=L@^%A&|#A>Dsg4<2b+N z+Dk4kfRJbR4zR}~Sb0zQ`$uhyv!DdKR(^UAlYa}Ilj}#j>~R1j>M8dZsW)Zq|iRK zpcu}U_nag&^-Y#Ggm6X}VH!{6r-?w{D}jL!9SJ3e!tt0V$?~dZ2vI#NWrX8}tS+Qf zKlLQyDWOkewpJmCn*6lO>+2GHUZLwn>ht-1FC6i9d%bWJl5AY!!Ck)-p+HiI#)V*j z4#xe_@R5`8SjZC*bwfyLqN2;9p=y5GKOBkBSRfjrM?=v-IC3ly3?@TELodNq$rjL3 zA;rX;pGE?)fnhHBXe4q>mO51}yXOO`(Qq`hSD&xb>*-S!gDFT?%tN=q-Zq}i%c7+8 z&@}!Uof*BuseYk*&yUL*WttFD(rN}@)K9xlNropO7c@~8`c*Bb`>B$*k9x1KhdSF{ zuZLKbO6&R>X>L|qTjz;YE$uX}xiFWi?fI?WHZT9@Oj_4#?a~=@ZN~a&tGTpcO|6*k zf4#Hud9zW&-m1@DKzRRjrvD^FL2cai7ZSPGh+_^{rWIY){s$@_G2Q7uVYh zpKMPq>@*tIbY=I6b?G#2;pRk!gZc56b+yEkPOa<@zCShWPIhGcKb7Sft`bgmkxq5{ z#hLXL=gL~Iv_366;&v6c&V6H6s-_*ptgo31laOVd`JnybSIrAotn%C~VaaYa#GE^8 zetC&l^JjOys}pPCy>@Mmn3d03s|{ckFlTDSEMINcmSCt_*UC;^#DQ5}BWRdg>%P_! Y>&kMoK5KokXkCPheZVKP&MlLF0Gp;+wg3PC diff --git a/share/locale/zh_CN/LC_MESSAGES/django.po b/share/locale/zh_CN/LC_MESSAGES/django.po index 8a2019961b..75dcb3a02e 100644 --- a/share/locale/zh_CN/LC_MESSAGES/django.po +++ b/share/locale/zh_CN/LC_MESSAGES/django.po @@ -3,12 +3,11 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-29 11:17+0800\n" +"POT-Creation-Date: 2012-10-30 15:59+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +17,75 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" +#: views.py:59 +msgid "Only the owner of the library has permission to share it." +msgstr "只有资料库拥有者才有共享权限。" + +#: views.py:71 +msgid "Failed to share to all" +msgstr "共享到公共资料失败" + +#: views.py:75 +msgid "Shared to all successfully, go check it at Share." +msgstr "共享到公共资料成功，请前往 共享管理 查看。" + +#: views.py:95 +msgid "" +"Shared to %(group)s successfully，go check it at Share." +msgstr "共享到 %(group)s 成功， 请前往 共享管理 查看。" + +#: views.py:101 +msgid "Failed to share to %s，as it does not exists." +msgstr "共享到 %s 失败，该小组不存在。" + +#: views.py:114 +msgid "Failed to share to %s ." +msgstr "共享给 %s 失败。" + +#: views.py:126 +msgid "Failed to share to %s, as he/she has not registered." +msgstr "共享给 %s 失败，该邮件尚未注册。" + +#: views.py:130 +msgid "" +"Shared to %(email)s successfully，go check it at Share." +msgstr "共享给 %(email)s 成功，请前往 共享管理 查看。" + +#: views.py:170 templates/repo/share_admin.html:27 +#: templates/repo/share_admin.html.py:40 +msgid "Read-Write" +msgstr "可读写" + +#: views.py:172 templates/repo/share_admin.html:38 +msgid "Read-Only" +msgstr "只可浏览" + +#: views.py:254 +msgid "" +"Failed to share to %s, as encrypted libraries cannot be shared to emails " +"outside the site." +msgstr "共享给 %s 失败， 加密的资料库不能共享给站外邮箱。" + +#: views.py:269 views.py:291 +msgid "Failed to share to %s." +msgstr "共享给 %s 失败。" + +#: views.py:287 +msgid "You are shared with a library in SeaCloud" +msgstr "有人通过SeaCloud共享了一个资料库给您" + +#: views.py:294 +msgid "" +"Shared to %(email)s successfully, go check it at Share." +msgstr "共享给 %(email)s 成功，请前往 共享管理 查看。" + +#: views.py:319 +msgid "Deleted successfully." +msgstr "删除成功" + #: templates/repo/share_admin.html:14 msgid "Shared Libraries" msgstr "我共享的资料库" @@ -28,11 +96,11 @@ msgstr "名字" #: templates/repo/share_admin.html:20 msgid "Share To" -msgstr "共享到" +msgstr "共享给" #: templates/repo/share_admin.html:21 msgid "Permission" -msgstr "权限" +msgstr "读写权限" #: templates/repo/share_admin.html:22 msgid "Description" @@ -42,33 +110,25 @@ msgstr "描述" msgid "Operations" msgstr "操作" -#: templates/repo/share_admin.html:27 templates/repo/share_admin.html.py:40 -msgid "Read-Write" -msgstr "可读写" +#: templates/repo/share_admin.html:27 +msgid "directory icon" +msgstr "目录图标" #: templates/repo/share_admin.html:33 msgid "Edit" msgstr "编辑" -#: templates/repo/share_admin.html:38 -msgid "Read-Only" -msgstr "只读" - #: templates/repo/share_admin.html:47 templates/repo/share_admin.html.py:50 #: templates/repo/share_admin.html:54 templates/repo/share_admin.html.py:56 -msgid "Remove Share" +msgid "Revoke" msgstr "取消共享" #: templates/repo/share_admin.html:64 -msgid "" -"Here will show libraries you share to your friends. You can click \"Share\" " -"icon in \"My Home\" to share library to your friends." -msgstr "" -"这里将显示您共享给您朋友的资料库。您可以点击“我的页面”任意资料库旁的“共享”图" -"标将您的资料库共享给您的朋友。" +msgid "Libraries you shared to others will be shown here." +msgstr "您共享给其他人的资料库将显示在这里。" #: templates/repo/share_admin.html:67 -msgid "File Links" +msgid "Links" msgstr "文件外链" #: templates/repo/share_admin.html:71 @@ -80,25 +140,53 @@ msgid "Library" msgstr "资料库" #: templates/repo/share_admin.html:73 -msgid "View Count" -msgstr "查看次数" +msgid "Visits" +msgstr "访问次数" #: templates/repo/share_admin.html:82 -msgid "View Link" -msgstr "查看链接" +msgid "View" +msgstr "查看" #: templates/repo/share_admin.html:83 msgid "Remove" msgstr "删除" -#: templates/repo/share_admin.html:89 +#: templates/repo/share_admin.html:90 msgid "" -"Here will show your file links. You can click \"Get sharing link\" in file " -"viewing page to generate file link. " -msgstr "" -"这里将显示您分享的文件外链。您可以在文件浏览页面点击“获取分享地址”按钮生成文" -"件外链。" +"links generated by click 'share link' in file-view page will be shown here." +msgstr "您在文件查看页面点击‘获取共享链接’生成的链接将显示在这里。" -#: templates/repo/share_admin.html:91 -msgid "File Link: " -msgstr "文件外链：" +#: templates/repo/share_admin.html:132 +msgid "Edit succeeded" +msgstr "权限修改成功" + +#: templates/repo/share_admin.html:135 +msgid "Edit failed" +msgstr "权限修改失败" + +#: templates/repo/share_admin.html:141 +msgid "edit failed" +msgstr "权限修改失败" + +#~ msgid "Remove Share" +#~ msgstr "取消共享" + +#~ msgid "" +#~ "Here will show libraries you share to your friends. You can click \"Share" +#~ "\" icon in \"My Home\" to share library to your friends." +#~ msgstr "" +#~ "这里将显示您共享给您朋友的资料库。您可以点击“我的页面”任意资料库旁的“共" +#~ "享”图标将您的资料库共享给您的朋友。" + +#~ msgid "View Count" +#~ msgstr "查看次数" + +#~ msgid "" +#~ "Here will show your file links. You can click \"Get sharing link\" in " +#~ "file viewing page to generate file link. " +#~ msgstr "" +#~ "这里将显示您分享的文件外链。您可以在文件浏览页面点击“获取分享地址”按钮生成" +#~ "文件外链。" + +#~ msgid "File Link: " +#~ msgstr "文件外链：" diff --git a/share/templates/repo/share_admin.html b/share/templates/repo/share_admin.html index 685b1b7616..c42d115d54 100644 --- a/share/templates/repo/share_admin.html +++ b/share/templates/repo/share_admin.html @@ -16,15 +16,15 @@ - - - + + + - + {% for repo in shared_repos %} - + @@ -61,16 +61,16 @@ {% endfor %}
{% trans "Name"%}{% trans "Share To"%}{% trans "Permission"%}{% trans "Name"%}{% trans "Share To"%}{% trans "Permission"%} {% trans "Description"%}{% trans "Operations"%}{% trans "Operations"%}
目录icon{% trans {{ repo.props.repo_name }} {{ repo.props.user }} @@ -44,16 +44,16 @@ {{ repo.props.repo_desc }} {% if repo.props.share_type == 'group' %} - + {% endif %} {% if repo.props.share_type == 'personal' %} - + {% endif %} {% if repo.props.share_type == 'public' %} {% if not org %} - + {% else %} - + {% endif %} {% endif %}
{% else %} -

{% blocktrans %}Here will show libraries you share to your friends. You can click "Share" icon in "My Home" to share library to your friends.{% endblocktrans %}

+

{% blocktrans %}Libraries you shared to others will be shown here.{% endblocktrans %}

{% endif %} -

{% trans "File Links"%}

+

{% trans "Links"%}

{% if fileshares %} - - + + {% for fs in fileshares %} @@ -79,16 +79,16 @@ {% endfor %} + {% else %} -

{% blocktrans %}Here will show your file links. You can click "Get sharing link" in file viewing page to generate file link. {% endblocktrans %}

+

{% trans "links generated by click 'share link' in file-view page will be shown here." %}

{% endif %} - {% endblock %} {% block extra_script %} @@ -129,16 +129,16 @@ $('.share-permission-select').change(function() { }, success: function(data) { if (data['success']) { - feedback('权限设置成功', 'success'); + feedback('{% trans "Edit succeeded" %}', 'success'); select.prev().children('.share-permission-cur-value').html(select.children('option[value="' +select.val() + '"]').text()); } else { - feedback('权限设置失败', 'error'); + feedback('{% trans "Edit failed" %}', 'error'); } select.addClass('hide'); select.prev().removeClass('hide'); }, error: function(jqXHR, textStatus, errorThrown) { - feedback(textStatus + '，权限设置失败', 'error'); + feedback(textStatus + '，{% trans "edit failed" %}', 'error'); select.addClass('hide'); select.prev().removeClass('hide'); } diff --git a/share/views.py b/share/views.py index f66dcf185c..909a582ef5 100644 --- a/share/views.py +++ b/share/views.py @@ -6,6 +6,7 @@ from django.core.urlresolvers import reverse from django.http import HttpResponse, HttpResponseRedirect, Http404 from django.shortcuts import render_to_response from django.template import Context, loader, RequestContext +from django.utils.translation import ugettext as _ from auth.decorators import login_required from django.contrib import messages @@ -55,7 +56,7 @@ def share_repo(request): # Test whether user is the repo owner. if not validate_owner(request, repo_id): - return render_permission_error(request, u'只有资料库拥有者有权共享该资料库') + return render_permission_error(request, _(u'Only the owner of the library has permission to share it.')) to_email_list = string2list(email_or_group) for to_email in to_email_list: @@ -67,11 +68,11 @@ def share_repo(request): try: seafserv_threaded_rpc.set_inner_pub_repo(repo_id, permission) except: - msg = u'共享到公共资料失败' + msg = _(u'Failed to share to all') message.add_message(request, message.ERROR, msg) continue - msg = u'共享公共资料成功，请前往共享管理查看。' % \ + msg = _(u'Shared to all successfully, go check it at Share.') % \ (reverse('share_admin')) messages.add_message(request, messages.INFO, msg) @@ -91,13 +92,13 @@ def share_repo(request): group_share_repo(request, repo_id, int(group.props.id), from_email, permission) find = True - msg = u'共享到 %s 成功，请前往共享管理查看。' % \ - (group_name, reverse('share_admin')) + msg = _(u'Shared to %(group)s successfully，go check it at Share.') % \ + {'group':group_name, 'share':reverse('share_admin')} messages.add_message(request, messages.INFO, msg) break if not find: - msg = u'共享到 %s 失败，群组不存在。' % group_name + msg = _(u'Failed to share to %s，as it does not exists.') % group_name messages.add_message(request, messages.ERROR, msg) else: ''' Share repo to user ''' @@ -110,7 +111,7 @@ def share_repo(request): seafserv_threaded_rpc.add_share(repo_id, from_email, to_email, permission) except SearpcError, e: - msg = u'共享给 %s 失败。' % to_email + msg = _(u'Failed to share to %s .') % to_email messages.add_message(request, messages.ERROR, msg) continue @@ -122,12 +123,12 @@ def share_repo(request): # 'is_encrypted': is_encrypted, # } # anonymous_share(request, **kwargs) - msg = u'共享给 %s 失败，用户未注册。' % to_email + msg = _(u'Failed to share to %s, as he/she has not registered.') % to_email messages.add_message(request, messages.ERROR, msg) continue else: - msg = u'共享给 %s 成功，请前往共享管理查看。' % \ - (to_email, reverse('share_admin')) + msg = _(u'Shared to %(email)s successfully，go check it at Share.') % \ + {'email':to_email, 'share':reverse('share_admin')} messages.add_message(request, messages.INFO, msg) return HttpResponseRedirect(reverse('myhome')) @@ -166,9 +167,9 @@ def share_admin(request): for repo in shared_repos: if repo.props.permission == 'rw': - repo.share_permission = '可读写' + repo.share_permission = _(u'Read-Write') elif repo.props.permission == 'r': - repo.share_permission = '只可浏览' + repo.share_permission = _(u'Read-Only') else: repo.share_permission = '' @@ -250,7 +251,7 @@ def anonymous_share(request, email_template_name='repo/anonymous_share_email.htm # Encrypt repo can not be shared to unregistered user. if is_encrypted: - msg = u'共享给 %s 失败，加密资料库无法共享给站外邮箱。' % anon_email + msg = _(u'Failed to share to %s, as encrypted libraries cannot be shared to emails outside the site.') % anon_email messages.error(request, msg) return @@ -265,7 +266,7 @@ def anonymous_share(request, email_template_name='repo/anonymous_share_email.htm try: anon_share.save() except: - msg = u'共享给 %s 失败。' % anon_email + msg = _(u'Failed to share to %s.') % anon_email messages.add_message(request, messages.ERROR, msg) else: # send mail @@ -283,15 +284,15 @@ def anonymous_share(request, email_template_name='repo/anonymous_share_email.htm } try: - send_mail(u'您在SeaCloud上收到一个资料库', t.render(Context(c)), None, + send_mail(_(u'You are shared with a library in SeaCloud'), t.render(Context(c)), None, [anon_email], fail_silently=False) except: AnonymousShare.objects.filter(token=token).delete() - msg = u'共享给 %s 失败。' % anon_email + msg = _(u'Failed to share to %s.') % anon_email messages.add_message(request, messages.ERROR, msg) else: - msg = u'共享给 %s 成功，请前往共享管理查看。' % \ - (anon_email, reverse('share_admin')) + msg = _(u'Shared to %(email)s successfully, go check it at Share.') % \ + {'email':anon_email, 'share':reverse('share_admin')} messages.add_message(request, messages.INFO, msg) def anonymous_share_confirm(request, token=None): @@ -315,7 +316,7 @@ def remove_anonymous_share(request, token): if not next: next = reverse('share_admin') - messages.add_message(request, messages.INFO, u'删除成功') + messages.add_message(request, messages.INFO, _(u'Deleted successfully.')) return HttpResponseRedirect(next)