haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-12 13:24:52 +00:00
Code Issues Releases Wiki Activity

Change group label name

Browse Source
This commit is contained in:
xiez
2012-09-24 10:10:01 +08:00
parent 07378acef1
commit 7f24c337c7
28 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
avatar/templates/avatar/set_avatar.html
View File

@@ -5,7 +5,7 @@
{% block main_panel %}
<div class="narrow-panel avatar-op">
<h2>修改小组 <a href="{{ SITE_ROOT }}group/{{ group.id }}/">{{ group.group_name }}</a> 的图标</h2>
<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" />

2
avatar/views.py
View File

@@ -98,7 +98,7 @@ def group_add(request):
return render_error(request, u'group id 不是有效参数')
if not check_group_staff(group_id_int, request.user):
return render_permission_error(request, u'只有小组管理员有权设置小组图标')
return render_permission_error(request, u'只有群组管理员有权设置群组图标')
group = ccnet_threaded_rpc.get_group(group_id_int)
if not group:

6
group/forms.py
View File

@@ -25,13 +25,13 @@ class GroupAddForm(forms.Form):
A form used to add a new group.
"""
group_name = forms.CharField(max_length=255, error_messages={
'required': u'小组名称不能为空',
'max_length': u'小组名称太长，不超过255个字符',
'required': u'群组名称不能为空',
'max_length': u'群组名称太长，不超过255个字符',
})
def clean_group_name(self):
group_name = self.cleaned_data['group_name']
if not validate_group_name(group_name):
error_msg = u'小组名称只能包含中英文字符，数字及下划线。'
error_msg = u'群组名称只能包含中英文字符，数字及下划线。'
raise forms.ValidationError(error_msg)
else:
return group_name

10
group/locale/zh_CN/LC_MESSAGES/django.po
View File

@@ -28,23 +28,23 @@ msgstr "创建失败。"
#: error_msg.py:11
msgid "The group has already created in this org."
msgstr "小组在该团体内已经存在。"
msgstr "群组在该团体内已经存在。"
#: error_msg.py:12
msgid "Failed to create org group."
msgstr "创建团体小组失败。"
msgstr "创建团体群组失败。"
#: error_msg.py:15
msgid "Permission error: only group staff can add member"
msgstr "只有小组管理员可以添加成员。"
msgstr "只有群组管理员可以添加成员。"
#: error_msg.py:16
msgid "Group not exists"
msgstr "小组不存在。"
msgstr "群组不存在。"
#: error_msg.py:17
msgid "Group is full"
msgstr "小组已满，无法再添加成员。"
msgstr "群组已满，无法再添加成员。"
#: error_msg.py:18
msgid "Failed to add member to group"

2
group/templates/group/add_member_email.html
View File

@@ -1,7 +1,7 @@
{% load url from future %}
亲爱的 {{ to_email }}：
{{ email }} 邀请你加入小组 {{ group.group_name }}, 点击以下链接加入：
{{ email }} 邀请你加入群组 {{ group.group_name }}, 点击以下链接加入：
{{ protocol }}://{{ domain }}{% url 'registration_register' %}?src={{ to_email }}
邮箱请填写当前邮箱，感谢使用我们的网站！

6
group/templates/group/group_info.html
View File

@@ -31,9 +31,9 @@
<h3>操作</h3>
<ul class="with-bg">
{% if is_staff %}
<li><a id="group-mgr" href="{{ SITE_ROOT }}group/{{ group.id }}/members/">小组管理</a></li>
<li><a id="group-mgr" href="{{ SITE_ROOT }}group/{{ group.id }}/members/">群组管理</a></li>
{% else %}
<li><a id="quit-group" href="#" data="{{ SITE_ROOT }}group/{{ group.id }}/?op=quit">退出小组</a></li>
<li><a id="quit-group" href="#" data="{{ SITE_ROOT }}group/{{ group.id }}/?op=quit">退出群组</a></li>
{% endif %}
</ul>
{% endif %}
@@ -41,7 +41,7 @@
</div>
<div class="main fleft">
<h3>小组里共享的同步目录</h3>
<h3>群组里共享的同步目录</h3>
<button id="repo-create">新建同步目录</button>
{% if repos %}
<table>

12
group/templates/group/group_manage.html
View File

@@ -6,20 +6,20 @@
{% block main_panel %}
<h2>{{ group.group_name }} 小组管理</h2>
<h2>{{ group.group_name }} 群组管理</h2>
<div class="side fright">
<h3>操作</h3>
<ul class="with-bg">
<li><a href="{{ SITE_ROOT }}avatar/group/add/?gid={{ group.id }}">设置小组图标</a></li>
<li><a id="group-remove" href="#" data="{{ SITE_ROOT }}group/{{ group.id }}/?op=dismiss">解散小组</a></li>
<li><a href="{{ SITE_ROOT }}group/{{ group.id }}/">返回小组</a></li>
<li><a href="{{ SITE_ROOT }}avatar/group/add/?gid={{ group.id }}">设置群组图标</a></li>
<li><a id="group-remove" href="#" data="{{ SITE_ROOT }}group/{{ group.id }}/?op=dismiss">解散群组</a></li>
<li><a href="{{ SITE_ROOT }}group/{{ group.id }}/">返回群组</a></li>
</ul>
</div>
<div class="main fleft">
<div class="w100 ovhd">
<h3 class="fleft">小组成员列表</h3>
<h3 class="fleft">群组成员列表</h3>
<a id="member-add" href="#" class="fright">添加成员</a>
</div>
{% if members %}
@@ -60,7 +60,7 @@
{% block extra_script %}
<script type="text/javascript">
addConfirmTo($("#group-remove"), '确定要解散该小组吗？');
addConfirmTo($("#group-remove"), '确定要解散该群组吗？');
addConfirmTo($(".member-remove-btn"), '确定要删除该成员？');

4
group/templates/group/groups.html
View File

@@ -4,8 +4,8 @@
{% block nav_group_class %}class="cur"{% endblock %}
{% block right_panel %}
<!-- 协作小组 -->
<h3>协作小组</h3>
<!-- 群组 -->
<h3>群组</h3>
{% include "group/groups_right_panel.html" %}
{% endblock %}

2
group/templates/group/groups_left_panel.html
View File

@@ -1,4 +1,4 @@
<h3>操作</h3>
<ul class="with-bg">
<li><a id="group-add" href="#">添加小组</a></li>
<li><a id="group-add" href="#">添加群组</a></li>
</ul>

4
group/templates/group/groups_right_panel.html
View File

@@ -1,7 +1,7 @@
{% load seahub_tags group_avatar_tags %}
{% load url from future %}
<button id="group-add">添加小组</button>
<button id="group-add">添加群组</button>
{% if groups %}
<ul class="group-list w100 ovhd">
{% for group in groups %}
@@ -21,7 +21,7 @@
</ul>
{% endif %}
<form id="group-add-form" action="" method="post" name="group-add-form" class="hide">
<label>小组名称：</label><br />
<label>群组名称：</label><br />
<input id="group_name" name="group_name" value="" /><br />
<p class="error hide"></p>
<input id="group-add-submit" type="submit" value="提交" />

2
group/templates/group/new_msg_reply.html
View File

@@ -14,7 +14,7 @@
<div class="msg-hd">
<span class="time">{{ msg.timestamp|translate_commit_time }}</span>
<a href="{% url 'user_profile' msg.from_email %}">{{ msg.from_email|email2nickname }}</a>
<span class="group">所在小组：<a href="{% url 'group_info' msg.group_id %}">{{ msg.group_name }}</a></span>
<span class="group">所在群组：<a href="{% url 'group_info' msg.group_id %}">{{ msg.group_name }}</a></span>
</div>
<div class="msg-bd">
<p>

4
group/tests/tests.py
View File

@@ -119,7 +119,7 @@ class GroupRecommendTest(GroupTestCase):
self.assertEquals(len(response.context['messages']), 1)
for message in response.context['messages']:
self.assert_('请检查小组名称' in str(message))
self.assert_('请检查群组名称' in str(message))
def test_recommend_file_to_unparticipated_group(self):
@@ -133,4 +133,4 @@ class GroupRecommendTest(GroupTestCase):
self.assertEquals(len(response.context['messages']), 1)
for message in response.context['messages']:
self.assert_('请检查是否参加了该小组' in str(message))
self.assert_('请检查是否参加了该群组' in str(message))

28
group/views.py
View File

@@ -170,7 +170,7 @@ def group_remove(request, group_id):
"""
# Check whether user is system admin.
if not request.user.is_staff:
return render_permission_error(request, u'只有管理员有权删除小组')
return render_permission_error(request, u'只有管理员有权删除群组')
# Request header may missing HTTP_REFERER, we need to handle that case.
next = request.META.get('HTTP_REFERER', None)
@@ -207,7 +207,7 @@ def group_dismiss(request, group_id):
# Check whether user is group staff
user = request.user.username
if not ccnet_threaded_rpc.check_group_staff(group_id_int, user):
return render_permission_error(request, u'只有小组管理员有权解散小组')
return render_permission_error(request, u'只有群组管理员有权解散群组')
try:
ccnet_threaded_rpc.remove_group(group_id_int, user)
@@ -256,10 +256,10 @@ def render_group_info(request, group_id, form):
joined = is_group_user(group_id_int, request.user.username)
if not joined and not request.user.is_staff:
return render_error(request, u'未加入该小组')
return render_error(request, u'未加入该群组')
# if request.user.org and not request.user.org.is_staff:
# return render_error(request, u'未加入该小组')
# return render_error(request, u'未加入该群组')
group = get_group(group_id)
if not group:
@@ -485,7 +485,7 @@ def group_members(request, group_id):
return render_error(request, u'group id 不是有效参数')
if not check_group_staff(group_id_int, request.user):
return render_permission_error(request, u'只有小组管理员有权管理小组')
return render_permission_error(request, u'只有群组管理员有权管理群组')
group = get_group(group_id)
if not group:
@@ -545,7 +545,7 @@ def group_members(request, group_id):
}
try:
send_mail('您的好友在SeaCloud上将你加入到小组',
send_mail('您的好友在SeaCloud上将你加入到群组',
t.render(Context(c)), None, [member_name],
fail_silently=False)
except:
@@ -590,7 +590,7 @@ def group_remove_member(request, group_id, user_name):
return render_error(request, u'group id 不是有效参数')
if not check_group_staff(group_id_int, request.user):
return render_permission_error(request, u'只有小组管理员有权删除成员')
return render_permission_error(request, u'只有群组管理员有权删除成员')
try:
ccnet_threaded_rpc.group_remove_member(group_id_int,
@@ -610,7 +610,7 @@ def group_share_repo(request, repo_id, group_id, from_email, permission):
# Check whether group exists
group = get_group(group_id)
if not group:
return render_error(request, u'共享失败:小组不存在')
return render_error(request, u'共享失败:群组不存在')
if seafserv_threaded_rpc.group_share_repo(repo_id, group_id, from_email, permission) != 0:
return render_error(request, u'共享失败:内部错误')
@@ -623,12 +623,12 @@ def group_unshare_repo(request, repo_id, group_id, from_email):
# Check whether group exists
group = get_group(group_id)
if not group:
return render_error(request, u'取消共享失败:小组不存在')
return render_error(request, u'取消共享失败:群组不存在')
# Check whether user is group staff or the one share the repo
if not check_group_staff(group_id, from_email) and \
seafserv_threaded_rpc.get_group_repo_owner(repo_id) != from_email:
return render_permission_error(request, u'取消共享失败:只有小组管理员或共享目录发布者有权取消共享')
return render_permission_error(request, u'取消共享失败:只有群组管理员或共享目录发布者有权取消共享')
if seafserv_threaded_rpc.group_unshare_repo(repo_id, group_id, from_email) != 0:
return render_error(request, u'取消共享失败:内部错误')
@@ -661,7 +661,7 @@ def group_recommend(request):
group_creator = e.split(' ')[1]
except IndexError:
messages.add_message(request, messages.ERROR,
u'推荐到 %s 失败，请检查小组名称。' % \
u'推荐到 %s 失败，请检查群组名称。' % \
group_name)
continue
@@ -704,7 +704,7 @@ def group_recommend(request):
break
if not find:
messages.add_message(request, messages.ERROR,
u'推荐到 %s 失败，请检查是否参加了该小组。' % \
u'推荐到 %s 失败，请检查是否参加了该群组。' % \
group_name)
else:
# TODO: need more clear error message
@@ -723,11 +723,11 @@ def create_group_repo(request, group_id):
content_type=content_type)
group_id = int(group_id)
if not get_group(group_id):
return json_error(u'创建失败:小组不存在')
return json_error(u'创建失败:群组不存在')
# Check whether user belongs to the group.
if not is_group_user(group_id, request.user.username):
return json_error(u"创建失败:未加入该小组")
return json_error(u"创建失败:未加入该群组")
form = RepoCreateForm(request.POST)
if not form.is_valid():

4
organizations/templates/organizations/org_group_admin.html
View File

@@ -4,7 +4,7 @@
{% block nav_groupadmin_class %}class="cur"{% endblock %}
{% block right_panel %}
<h3>所有小组</h3>
<h3>所有群组</h3>
{% if groups %}
<table>
<tr>
@@ -54,7 +54,7 @@
{% block extra_script %}
<script type="text/javascript">
addConfirmTo($('.group-remove-btn'), '确定要删除小组？')
addConfirmTo($('.group-remove-btn'), '确定要删除群组？')
</script>
{% endblock %}

2
organizations/templates/organizations/org_groups.html
View File

@@ -5,7 +5,7 @@
{% block nav_group_class %}class="cur"{% endblock %}
{% block right_panel %}
<h3>{{ org.org_name }} 的小组</h3>
<h3>{{ org.org_name }} 的群组</h3>
{% include "group/groups_right_panel.html" %}
{% endblock %}

4
organizations/templates/organizations/personal.html
View File

@@ -9,7 +9,7 @@
{% endblock %}
{% block left_panel %}
<!-- 我的小组 -->
<!-- 我的群组 -->
{% include "snippets/my_groups.html" %}
{% endblock %}
@@ -31,7 +31,7 @@
{% include "snippets/shared_in_repos.html" %}
{% url 'org_repo_share' org.url_prefix as repo_share_url %}
{% with post_url=repo_share_url tips='必须是团体内部成员或小组。' %}
{% with post_url=repo_share_url tips='必须是团体内部成员或群组。' %}
{% include "snippets/repo_share_form.html" %}
{% endwith %}

4
organizations/views.py
View File

@@ -192,7 +192,7 @@ def org_groups(request, url_prefix):
group_name = request.POST.get('group_name')
if not validate_group_name(group_name):
result['error'] = u'小组名称只能包含中英文字符，数字及下划线。'
result['error'] = u'群组名称只能包含中英文字符，数字及下划线。'
return HttpResponse(json.dumps(result), content_type=content_type)
try:
@@ -470,7 +470,7 @@ def org_group_remove(request, url_prefix, group_id):
# Check whether is the org group.
org_id = get_org_id_by_group(group_id_int)
if request.user.org['org_id'] != org_id:
return render_permission_error(request, '该小组不属于当前团体',
return render_permission_error(request, '该群组不属于当前团体',
extra_ctx={'org': request.user.org,
'base_template': 'org_base.html'})

2
share/views.py
View File

@@ -75,7 +75,7 @@ def share_repo(request):
messages.add_message(request, messages.INFO, msg)
break
if not find:
msg = u'共享到 %s 失败，小组不存在。' % group_name
msg = u'共享到 %s 失败，群组不存在。' % group_name
messages.add_message(request, messages.ERROR, msg)
else:
''' Share repo to user '''

2
templates/admin_base.html
View File

@@ -10,7 +10,7 @@
<a href="{{ SITE_ROOT }}sys/useradmin/" {% block nav_useradmin_class %}{% endblock %}>用户管理</a>
</li>
<li>
<a href="{{ SITE_ROOT }}sys/groupadmin/" {% block nav_groupadmin_class %}{% endblock %}>小组管理</a>
<a href="{{ SITE_ROOT }}sys/groupadmin/" {% block nav_groupadmin_class %}{% endblock %}>群组管理</a>
</li>
{% if request.cloud_mode %}
<li>

6
templates/myhome.html
View File

@@ -20,7 +20,7 @@
<ul>
{% if grpmsg_list %}
<li>
小组
群组
{% for grp in grpmsg_list %}
<a href="{% url 'group_info' grp.id %}" class="no-bold">{{ grp.group_name }}</a>
{% endfor %}
@@ -28,7 +28,7 @@
</li>
{% endif %}
{% if grpmsg_reply_list %}
<li><a href="{{ SITE_ROOT }}group/reply/new/" class="no-bold">{{ grpmsg_reply_list|length }}条小组留言有新回复</a></li>
<li><a href="{{ SITE_ROOT }}group/reply/new/" class="no-bold">{{ grpmsg_reply_list|length }}条群组留言有新回复</a></li>
{% endif %}
{% if orgmsg_list %}
<li><a href="{% url 'org_msg' %}" class="no-bold">{{ orgmsg_list|length }}条团体消息</a></li>
@@ -39,7 +39,7 @@
<h3>已用空间</h3>
<p>{{ quota_usage|filesizeformat }} {% if cloud_mode %}/ 2 GB {% endif %}</p>
<!-- 我的小组 -->
<!-- 我的群组 -->
{% with groups=joined_groups %}
{% include "snippets/my_groups.html" %}
{% endwith %}

2
templates/myhome_base.html
View File

@@ -20,7 +20,7 @@
</li>
{% else %}
<li>
<a href="{{ SITE_ROOT }}groups/" {% block nav_group_class %}{% endblock %}>协作小组</a>
<a href="{{ SITE_ROOT }}groups/" {% block nav_group_class %}{% endblock %}>群组</a>
</li>
{% endif %}
<li>

2
templates/org_admin_base.html
View File

@@ -10,7 +10,7 @@
<a href="{% url org_seafadmin request.user.org.url_prefix %}" {% block nav_seafadmin_class %}{% endblock %}>目录管理</a>
</li>
<li>
<a href="{% url org_groupadmin request.user.org.url_prefix %}" {% block nav_groupadmin_class %}{% endblock %}>小组管理</a>
<a href="{% url org_groupadmin request.user.org.url_prefix %}" {% block nav_groupadmin_class %}{% endblock %}>群组管理</a>
</li>
{% endif %}

2
templates/org_base.html
View File

@@ -8,7 +8,7 @@
<a href="{% url 'organizations.views.org_info' org.url_prefix %}" {% block nav_org_class %}{% endblock %}>公共页面</a>
</li>
<li>
<a href="{% url 'organizations.views.org_groups' org.url_prefix %}" {% block nav_group_class %}{% endblock %}>小组</a>
<a href="{% url 'organizations.views.org_groups' org.url_prefix %}" {% block nav_group_class %}{% endblock %}>群组</a>
</li>
<li>
<a href="{% url 'organizations.views.org_personal' org.url_prefix %}" {% block nav_org_personal_class %}{% endblock %}>个人页面</a>

4
templates/snippets/bottom_bar.html
View File

@@ -1,5 +1,5 @@
{% load url from future %}
var Bottom_bar = '<div id="bottom-bar">{% if groups %}<button id="recommend">推荐到小组</button> <button id="click-into-group">到所在小组</button>{% endif %}</div>';
var Bottom_bar = '<div id="bottom-bar">{% if groups %}<button id="recommend">推荐到群组</button> <button id="click-into-group">到所在群组</button>{% endif %}</div>';
$('#wrapper').append(Bottom_bar);
$('#bottom-bar').css({'position':'fixed', 'bottom':0, 'right':'10px'});
$('#main-panel').css('margin-bottom', '28px');
@@ -29,7 +29,7 @@ $('#click-into-group').click(function() {
$('#recommend-submit').click(function() {
if (!$.trim($('#recommend-groups').val())) {
apply_form_error('recommend-form', '小组名称不能为空。');
apply_form_error('recommend-form', '群组名称不能为空。');
return false;
}
if (!$.trim($('#recommend-msg').val())) {

4
templates/snippets/group_recommend_form.html
View File

@@ -6,9 +6,9 @@
{{ name }}
{% endif %}
{% endfor %}
到小组
到群组
</h3>
<label>小组名称：</label><br />
<label>群组名称：</label><br />
<input type="input" name="groups" id="recommend-groups" value="" /><br />
<label>推荐语：</label><br />
<textarea name="message" id="recommend-msg"></textarea><br />

2
templates/snippets/my_groups.html
View File

@@ -1,5 +1,5 @@
{% load group_avatar_tags %}
<h3>我的小组</h3>
<h3>我的群组</h3>
{% if groups %}
<ul>
{% for group in groups %}

2
templates/snippets/repo_share_form.html
View File

@@ -1,5 +1,5 @@
<form id="repo-share-form" action="{{ post_url }}" method="post" name="repo-share-form" class="hide">
<label>邮箱或小组：</label><br />
<label>邮箱或群组：</label><br />
<textarea id="email_or_group" name="email_or_group"></textarea>
<div>
<select id="share-permission" name="permission">

4
templates/sys_group_admin.html
View File

@@ -4,7 +4,7 @@
{% block nav_groupadmin_class %}class="cur"{% endblock %}
{% block right_panel %}
<h3>所有小组</h3>
<h3>所有群组</h3>
{% if groups %}
<table>
<tr>
@@ -54,7 +54,7 @@
{% block extra_script %}
<script type="text/javascript">
addConfirmTo($('.group-remove-btn'), '确定要删除小组？')
addConfirmTo($('.group-remove-btn'), '确定要删除群组？')
</script>
{% endblock %}