diff --git a/avatar/locale/zh_CN/LC_MESSAGES/django.mo b/avatar/locale/zh_CN/LC_MESSAGES/django.mo index 06c99e55b0..f8deb01108 100644 Binary files a/avatar/locale/zh_CN/LC_MESSAGES/django.mo and b/avatar/locale/zh_CN/LC_MESSAGES/django.mo differ diff --git a/avatar/locale/zh_CN/LC_MESSAGES/django.po b/avatar/locale/zh_CN/LC_MESSAGES/django.po index dcb75ddcc9..ac5ffcdcf7 100644 --- a/avatar/locale/zh_CN/LC_MESSAGES/django.po +++ b/avatar/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-30 13:31+0800\n" +"POT-Creation-Date: 2012-10-30 21:32+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -64,7 +64,7 @@ msgstr "上传头像" msgid "Your current avatar: " msgstr "当前头像：" -#: templates/avatar/add.html:9 +#: templates/avatar/add.html:9 templates/avatar/set_avatar.html:12 msgid "Upload New Avatar: " msgstr "上传新头像：" @@ -88,6 +88,22 @@ msgstr "" msgid "Delete These" msgstr "删除" +#: templates/avatar/set_avatar.html:8 +msgid "Avatar Change" +msgstr "头像修改" + +#: templates/avatar/set_avatar.html:9 +msgid "Current avatar: " +msgstr "当前头像：" + +#: templates/avatar/set_avatar.html:10 +msgid "Current Avatar" +msgstr "当前头像" + +#: templates/avatar/set_avatar.html:16 +msgid "Submit" +msgstr "提交" + #: templates/notification/avatar_friend_updated/notice.html:2 #, python-format msgid "" diff --git a/avatar/templates/avatar/set_avatar.html b/avatar/templates/avatar/set_avatar.html index 15e2ee491b..04f54933e2 100644 --- a/avatar/templates/avatar/set_avatar.html +++ b/avatar/templates/avatar/set_avatar.html @@ -1,19 +1,19 @@ {% extends base_template %} -{% load group_avatar_tags %} +{% load group_avatar_tags i18n %} {% block nav_group_class %}class="cur"{% endblock %} {% block main_panel %}
-

修改群组 {{ group.group_name }} 的图标

-

当前图标：

- 当前图标 +

{{ group.group_name }} {% trans "Avatar Change" %}

+

{% trans "Current avatar: " %}

+ {% trans -

上传新图标：

+

{% trans "Upload New Avatar: " %}

{{ form.avatar }}
{{ form.avatar.errors }} - +
{% endblock %} diff --git a/avatar/urls.py b/avatar/urls.py index 326757ba99..7186397ea5 100644 --- a/avatar/urls.py +++ b/avatar/urls.py @@ -2,7 +2,7 @@ from django.conf.urls.defaults import patterns, url urlpatterns = patterns('avatar.views', url('^add/$', 'add', name='avatar_add'), - url('^group/add/$', 'group_add', name='avatar_group_add'), + url('^group/(?P\d+)/add/$', 'group_add', name='avatar_group_add'), # url('^change/$', 'change', name='avatar_change'), # url('^delete/$', 'delete', name='avatar_delete'), url('^render_primary/(?P[^/]+)/(?P[\d]+)/$', 'render_primary', name='avatar_render_primary'), diff --git a/avatar/views.py b/avatar/views.py index 4e30b7fccf..bb0d17e403 100644 --- a/avatar/views.py +++ b/avatar/views.py @@ -1,5 +1,5 @@ # encoding: utf-8 -from django.http import HttpResponseRedirect +from django.http import HttpResponseRedirect, Http404 from django.shortcuts import render_to_response from django.template import RequestContext from django.utils.translation import ugettext as _ @@ -90,15 +90,11 @@ def add(request, extra_context=None, next_override=None, ) @login_required -def group_add(request): - group_id = request.GET.get('gid', '') - try: - group_id_int = int(group_id) - except ValueError: - return render_error(request, u'group id 不是有效参数') +def group_add(request, gid): + group_id_int = int(gid) # Checked by URL Conf if not check_group_staff(group_id_int, request.user): - return render_permission_error(request, u'只有群组管理员有权设置群组图标') + raise Http404 group = ccnet_threaded_rpc.get_group(group_id_int) if not group: diff --git a/group/locale/zh_CN/LC_MESSAGES/django.mo b/group/locale/zh_CN/LC_MESSAGES/django.mo index 5801ef3616..8f1fbbeac5 100644 Binary files a/group/locale/zh_CN/LC_MESSAGES/django.mo and b/group/locale/zh_CN/LC_MESSAGES/django.mo differ diff --git a/group/locale/zh_CN/LC_MESSAGES/django.po b/group/locale/zh_CN/LC_MESSAGES/django.po index 07e07d2d44..74f7a1219f 100644 --- a/group/locale/zh_CN/LC_MESSAGES/django.po +++ b/group/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 10:41+0800\n" +"POT-Creation-Date: 2012-10-30 21:46+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -104,7 +104,7 @@ msgid "Recommend failed" msgstr "推荐失败" #: templates/group/group_info.html:14 -msgid "Basic Infos" +msgid "Group Info" msgstr "基本信息" #: templates/group/group_info.html:17 @@ -169,7 +169,7 @@ msgid "Last Update" msgstr "更新时间" #: templates/group/group_info.html:79 -msgid "Share From" +msgid "Shared by" msgstr "共享来源" #: templates/group/group_info.html:87 @@ -208,12 +208,14 @@ msgid "has new comment:" msgstr "有新的评注：" #: templates/group/group_info.html:161 +#: templates/group/group_reply_list.html:10 +#: templates/group/group_reply_list.html:16 msgid "Reply" msgstr "回复" #: templates/group/group_info.html:162 -msgid "Hide Reply" -msgstr "收起回复" +msgid "Hide" +msgstr "隐藏" #: templates/group/group_info.html:164 templates/group/group_manage.html:40 #: templates/group/group_manage.html:63 @@ -264,6 +266,10 @@ msgstr "管理员列表" msgid "Add Staffs" msgstr "添加管理员" +#: templates/group/group_reply_list.html:17 +msgid "Reply can not be empty and maximum length is 150 characters" +msgstr "输入不能为空且应少于150个字符。" + #: templates/group/groups_left_panel.html:3 msgid "Tips" msgstr "小提示" @@ -312,11 +318,11 @@ msgstr "添加成员到 " #: templates/group/grpmember_add_form.html:4 #: templates/group/grpmember_add_form.html:16 -msgid "Type Emails" -msgstr "输入邮箱" +msgid "Type Emails, Seperate by ','" +msgstr "输入邮箱，以','分隔" #: templates/group/grpmember_add_form.html:7 -msgid "Tip: System will send an email to him if the email is not registered." +msgid "Tip: An invitation will be sent if the email is not registered." msgstr "Tip：可以是未注册邮箱，系统会向他发送邀请邮件。" #: templates/group/grpmember_add_form.html:9 @@ -327,5 +333,14 @@ msgstr "Tip：必须是已注册的邮箱。" msgid "Add staffs to " msgstr "添加管理员到 " +#~ msgid "Type Emails" +#~ msgstr "输入邮箱" + +#~ msgid "Basic Infos" +#~ msgstr "基本信息" + +#~ msgid "Hide Reply" +#~ msgstr "收起回复" + #~ msgid "Update Time" #~ msgstr "更新时间" diff --git a/group/templates/group/group_info.html b/group/templates/group/group_info.html index 5f3bc3f9c2..924250765d 100644 --- a/group/templates/group/group_info.html +++ b/group/templates/group/group_info.html @@ -11,7 +11,7 @@ {% block left_panel %}
-

{% trans "Basic Infos" %}

+

{% trans "Group Info" %}

{{ group.props.group_name }}的图标

{{ group.creator_name|email2nickname }} {% trans "created in " %}
{{ group.timestamp|tsstr_day }}

@@ -76,7 +76,7 @@ {% trans "Name" %} {% trans "Description" %} {% trans "Last Update" %} - {% trans "Share From" %} + {% trans "Shared by" %} {% trans "Operations" %} @@ -159,7 +159,7 @@ {{ msg.message|seahub_urlize|find_at|linebreaksbr }}

- + {% if is_staff or msg.from_email == request.user.username %} {% endif %} diff --git a/group/templates/group/group_manage.html b/group/templates/group/group_manage.html index d3f77ccca3..c4e24fee92 100644 --- a/group/templates/group/group_manage.html +++ b/group/templates/group/group_manage.html @@ -13,7 +13,7 @@

{% trans "Operations"%}

diff --git a/group/templates/group/group_reply_list.html b/group/templates/group/group_reply_list.html index dd4d068ed8..13d91c2101 100644 --- a/group/templates/group/group_reply_list.html +++ b/group/templates/group/group_reply_list.html @@ -1,4 +1,4 @@ -{% load seahub_tags avatar_tags %} +{% load seahub_tags avatar_tags i18n %} {% load url from future %} - -

输入不能为空且应少于150个字符。

+ +

{% trans "Reply can not be empty and maximum length is 150 characters" %}

diff --git a/group/templates/group/grpmember_add_form.html b/group/templates/group/grpmember_add_form.html index bf36f52009..c23c93022d 100644 --- a/group/templates/group/grpmember_add_form.html +++ b/group/templates/group/grpmember_add_form.html @@ -1,10 +1,10 @@ {% load i18n %}

-
+
{% if cloud_mode and not org %} -

{% trans "Tip: System will send an email to him if the email is not registered."%}

+

{% trans "Tip: An invitation will be sent if the email is not registered."%}

{% else %}

{% trans "Tip: The email should be already registered."%}

{% endif %} @@ -13,7 +13,7 @@

-
+