Modified i18n for avatar and group

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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 ""

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 %}
 <div class="narrow-panel avatar-op">
-    <h2>修改群组 <a href="{{ SITE_ROOT }}group/{{ group.id }}/">{{ group.group_name }}</a> 的图标</h2>
-    <h3>当前图标：</h3>
-    <img src="{% grp_avatar_url group.id %}" alt="当前图标" class="avatar" />
+    <h2><a href="{{ SITE_ROOT }}group/{{ group.id }}/">{{ group.group_name }}</a> {% trans "Avatar Change" %}</h2>
+    <h3>{% trans "Current avatar: " %}</h3>
+    <img src="{% grp_avatar_url group.id %}" alt="{% trans "Current Avatar" %}" class="avatar" />
 
-    <h3 class="upload-new-avatar-hd">上传新图标：</h3>
+    <h3 class="upload-new-avatar-hd">{% trans "Upload New Avatar: " %}</h3>
     <form enctype="multipart/form-data" method="post" action="">
         {{ form.avatar }}<br />
         {{ form.avatar.errors }}
-        <input type="submit" value="提交" class="submit" />
+        <input type="submit" value="{% trans "Submit" %}" class="submit" />
     </form>
 </div>
 {% endblock %}

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<gid>\d+)/add/$', 'group_add', name='avatar_group_add'),
 #    url('^change/$', 'change', name='avatar_change'),
 #    url('^delete/$', 'delete', name='avatar_delete'),
     url('^render_primary/(?P<user>[^/]+)/(?P<size>[\d]+)/$', 'render_primary', name='avatar_render_primary'),    

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:

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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\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 "更新时间"

group/templates/group/group_info.html

@@ -11,7 +11,7 @@
 
 {% block left_panel %}
 <div class="info-item">
-    <h3 class="info-item-top">{% trans "Basic Infos" %}</h3>
+    <h3 class="info-item-top">{% trans "Group Info" %}</h3>
     <div class="info-item-bottom group-basic-info ovhd">
         <img src="{% grp_avatar_url group.props.id 48 %}" alt="{{ group.props.group_name }}的图标" title="{{ group.props.group_name }}" class="avatar fleft" />
         <p class="txt fright">{{ group.creator_name|email2nickname }} {% trans "created in " %}<br />{{ group.timestamp|tsstr_day }}</p>
@@ -76,7 +76,7 @@
         <th width="20%">{% trans "Name" %}</th>
         <th width="34%">{% trans "Description" %}</th>
         <th width="16%">{% trans "Last Update" %}</th>
-        <th width="14%">{% trans "Share From" %}</th>
+        <th width="14%">{% trans "Shared by" %}</th>
         <th width="12%">{% trans "Operations" %}</th>
     </tr>
 
@@ -159,7 +159,7 @@
                 {{ msg.message|seahub_urlize|find_at|linebreaksbr }}
                 </p>
                 <button class="reply op" data="{% url 'msg_reply' msg.id %}"><span class="reply-cnt">{% if msg.reply_cnt != 0 %}{{ msg.reply_cnt }} {% endif %}</span>{% trans "Reply" %}</button>
-                <button class="replyclose op hide">{% trans "Hide Reply" %}</button>
+                <button class="replyclose op hide">{% trans "Hide" %}</button>
                 {% if is_staff or msg.from_email == request.user.username %}
                 <button class="msg-delete op" data="{% url 'group_message_remove' group.id msg.id %}">{% trans "Delete" %}</button>
                 {% endif %}

group/templates/group/group_manage.html

@@ -13,7 +13,7 @@
   <div class="info-item-top"><h3>{% trans "Operations"%}</h3> </div>
   <div class="info-item-bottom">
     <ul class="with-bg">
-      <li><a href="{{ SITE_ROOT }}avatar/group/add/?gid={{ group.id }}">{% trans "Set Group Avatar"%}</a></li>
+      <li><a href="{% url 'avatar_group_add' group.id %}">{% trans "Set Group Avatar"%}</a></li>
       <li><a id="group-remove" href="#" data="{{ SITE_ROOT }}group/{{ group.id }}/?op=dismiss">{% trans "Dismiss Group"%}</a></li>
       <li><a href="{{ SITE_ROOT }}group/{{ group.id }}/">{% trans "Back to Group"%}</a></li>
     </ul>

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 %}
 
 <ul class="reply-list">
@@ -7,11 +7,11 @@
 <a href="{% url 'user_profile' reply.from_email %}" class="pic fleft">{% avatar reply.from_email 28 %}</a>
 <div class="txt fright">
     <a href="{% url 'user_profile' reply.from_email %}">{{ reply.from_email|email2nickname }}</a> : {{ reply.message|seahub_urlize|find_at }} -- 
-    <button class="reply-at op" data="{{ reply.from_email|email2nickname }}">回复</button>
+    <button class="reply-at op" data="{{ reply.from_email|email2nickname }}">{% trans "Reply" %}</button>
 </div>
 </li>
 {% endfor %}
 </ul>
 <input type="text" name="message" class="reply-input" />
-<button class="submit">回复</button>
-<p class="error hide">输入不能为空且应少于150个字符。</p>
+<button class="submit">{% trans "Reply" %}</button>
+<p class="error hide">{% trans "Reply can not be empty and maximum length is 150 characters" %}</p>

group/templates/group/grpmember_add_form.html

@@ -1,10 +1,10 @@
 {% load i18n %}
 <form id="member-add-form"  method="post" name="member-add-form" class="hide">
     <label>{% trans "Add members to "%}{{ group.group_name }}:</label><br />
-    <textarea id="added-member-name" name="user_name" placeholder="{% trans "Type Emails"%}"></textarea><br />
+    <textarea id="added-member-name" name="user_name" placeholder="{% trans "Type Emails, Seperate by ','"%}"></textarea><br />
     <input type="hidden" id="group_id" name="group_id" value="{{ group.id }}" />
     {% if cloud_mode and not org %}
-    <p class="tip">{% trans "Tip: System will send an email to him if the email is not registered."%}</p>
+    <p class="tip">{% trans "Tip: An invitation will be sent if the email is not registered."%}</p>
     {% else %}
     <p class="tip">{% trans "Tip: The email should be already registered."%}</p>
     {% endif %}
@@ -13,7 +13,7 @@
 </form>
 <form id="admin-add-form" method="post" name="admin-add-form" class="hide">
     <label>{% trans "Add staffs to "%}{{ group.group_name }}:</label><br />
-    <textarea id="added-admin-name" name="user_name" placeholder="{% trans "Type Emails"%}"></textarea><br />
+    <textarea id="added-admin-name" name="user_name" placeholder="{% trans "Type Emails, Seperate by ','"%}"></textarea><br />
     <input type="hidden" id="group_id" name="group_id" value="{{ group.id }}" />
     <p class="error hide" id="admin-add-error"></p>
     <input type="submit" value="{% trans "Submit"%}" id="admin-add-submit" />