haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-02 23:48:47 +00:00
Code Issues Releases Wiki Activity

Changed repo name

Browse Source
This commit is contained in:
ZhengXie
2012-10-09 14:38:13 +08:00
parent e0328f503e
commit 41d0b33b77
32 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base/templatetags/seahub_tags.py
View File

@@ -42,7 +42,7 @@ def file_icon_filter(value):
def translate_commit_desc(value):
"""Translate commit description."""
if value.startswith('Reverted repo'):
return value.replace('Reverted repo to status at', u'同步目录内容还原到')
return value.replace('Reverted repo to status at', u'资料库内容还原到')
elif value.startswith('Reverted file'):
value = value.replace('Reverted file', u'还原文件')
value = value.replace('to status at', u'内容到')

6
forms.py
View File

@@ -64,8 +64,8 @@ class RepoCreateForm(forms.Form):
Form for creating repo and org repo.
"""
repo_name = forms.CharField(max_length=50, error_messages={
'required': '目录名不能为空',
'max_length': '目录名太长，不超过50个字符'
'required': '名称不能为空',
'max_length': '名称太长，不超过50个字符'
})
repo_desc = forms.CharField(max_length=100, error_messages={
'required': '描述不能为空',
@@ -86,7 +86,7 @@ class RepoCreateForm(forms.Form):
def clean_repo_name(self):
repo_name = self.cleaned_data['repo_name']
if not is_valid_filename(repo_name):
error_msg = u"您输入的目录名 %s 包含非法字符" % repo_name
error_msg = u"您输入的名称 %s 包含非法字符" % repo_name
raise forms.ValidationError(error_msg)
else:
return repo_name

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

@@ -41,8 +41,8 @@
{% endblock %}
{% block right_panel %}
<h3>群组里共享的同步目录</h3>
<button id="repo-create">新建同步目录</button>
<h3>群组里共享的资料库</h3>
<button id="repo-create">新建资料库</button>
{% if repos %}
<table>
<tr>
@@ -158,7 +158,7 @@
{% include 'snippets/user_profile_js.html' %}
<script type="text/javascript">
addConfirmTo($('#quit-group'), '确定要退出？');
addConfirmTo($('.cancel-share'), '确定要取消共享该目录？');
addConfirmTo($('.cancel-share'), '确定要取消共享该资料库？');
$(function() {
addAtAutocomplete('#message', '#group-message-form', {{ group.id }}, "{% url 'group_attention' %}", {'border':'1px solid #ddd', 'width':'600px', 'height': '80px', 'word-wrap':'break-word', 'overflow-y':'auto', 'line-height': '1.5em'}); // remember to add unit (px or em) to line-height, as js in ie will take 1.5 as 1.5, not 1.5em

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

@@ -34,7 +34,7 @@
{% block extra_script %}
<script type="text/javascript">
addConfirmTo($('#quit-group'), '确定要退出？');
addConfirmTo($('.cancel-share'), '确定要取消共享该目录？');
addConfirmTo($('.cancel-share'), '确定要取消共享该资料库？');
$("table tr:gt(0)").hover(
function() {

8
group/views.py
View File

@@ -762,7 +762,7 @@ def create_group_repo(request, group_id):
except:
repo_id = None
if not repo_id:
return json_error(u"创建目录失败")
return json_error(u"创建失败")
try:
status = seafserv_threaded_rpc.add_org_group_repo(repo_id,
@@ -776,7 +776,7 @@ def create_group_repo(request, group_id):
# if share failed, remove the newly created repo
if status != 0:
seafserv_threaded_rpc.remove_repo(repo_id)
return json_error(u'创建目录失败:内部错误')
return json_error(u'创建失败:内部错误')
else:
result = {'success': True}
return HttpResponse(json.dumps(result),
@@ -790,7 +790,7 @@ def create_group_repo(request, group_id):
except:
repo_id = None
if not repo_id:
return json_error(u"创建目录失败")
return json_error(u"创建失败")
try:
status = seafserv_threaded_rpc.group_share_repo(repo_id,
@@ -803,7 +803,7 @@ def create_group_repo(request, group_id):
# if share failed, remove the newly created repo
if status != 0:
seafserv_threaded_rpc.remove_repo(repo_id)
return json_error(u'创建目录失败:内部错误')
return json_error(u'创建失败:内部错误')
else:
result = {'success': True}
return HttpResponse(json.dumps(result),

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

@@ -18,8 +18,8 @@
{% endblock %}
{% block right_panel %}
<h3>{{ org.org_name }} 公开的同步目录</h3>
<button id="repo-create">新建同步目录</button>
<h3>{{ org.org_name }} 公开的资料库</h3>
<button id="repo-create">新建资料库</button>
{% if repos %}
<table>
<tr>

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

@@ -3,7 +3,7 @@
{% load url from future %}
{% block right_panel %}
<h3>所有同步目录</h3>
<h3>所有资料库</h3>
{% if repos %}
<table>
<tr>

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

@@ -14,10 +14,10 @@
{% endblock %}
{% block right_panel %}
<!-- 我拥有的同步目录 -->
<!-- 我拥有的资料库 -->
{% include "snippets/my_owned_repos.html" %}
<!-- 共享给我的同步目录 -->
<!-- 共享给我的资料库 -->
{% include "snippets/shared_in_repos.html" %}
{% url 'org_repo_share' org.url_prefix as repo_share_url %}

10
organizations/views.py
View File

@@ -153,7 +153,7 @@ def org_inner_pub_repo_create(request, url_prefix):
user = request.user.username
org = get_user_current_org(request.user.username, url_prefix)
if not org:
return HttpResponse(json.dumps(u'创建目录失败：未加入该团体'),
return HttpResponse(json.dumps(u'创建失败：未加入该团体'),
content_type=content_type)
try:
@@ -165,7 +165,7 @@ def org_inner_pub_repo_create(request, url_prefix):
except:
repo_id = None
if not repo_id:
result['error'] = u"创建目录失败"
result['error'] = u"创建失败"
else:
result['success'] = True
return HttpResponse(json.dumps(result), content_type=content_type)
@@ -389,13 +389,13 @@ def org_repo_create(request, url_prefix):
user = request.user.username
org = get_user_current_org(request.user.username, url_prefix)
if not org:
return HttpResponse(json.dumps(u'创建目录失败：未加入该团体'),
return HttpResponse(json.dumps(u'创建失败：未加入该团体'),
content_type=content_type)
repo_id = create_org_repo(repo_name, repo_desc, user, passwd,
org.org_id)
if not repo_id:
result['error'] = u"创建目录失败"
result['error'] = u"创建失败"
else:
result['success'] = True
return HttpResponse(json.dumps(result), content_type=content_type)
@@ -523,7 +523,7 @@ def org_repo_share(request, url_prefix):
# Test whether user is the repo owner
if not validate_org_repo_owner(org.org_id, repo_id, request.user.username):
return render_permission_error(request, u'只有目录拥有者有权共享目录',
return render_permission_error(request, u'只有资料库拥有者有权共享该资料库',
extra_ctx={
'org': org,
'base_template': 'org_base.html',

2
share/templates/repo/anonymous_share_confirm.html
View File

@@ -4,6 +4,6 @@
{% block main_panel %}
<div class="text-panel">
<p>该访问链接已失效，如有需要，请联系目录拥有者 {{ repo_owner }}！</p>
<p>该访问链接已失效，如有需要，请联系资料库拥有者 {{ repo_owner }}！</p>
</div>
{% endblock %}

4
share/templates/repo/anonymous_share_email.html
View File

@@ -1,11 +1,11 @@
{% autoescape off %}
亲爱的 {{ anon_email }}：
{{ email }} 在SeaCloud上共享了一个同步目录给你，请点击以下链接查看：
{{ email }} 在SeaCloud上共享了一个资料库给你，请点击以下链接查看：
{{ protocol }}://{{ domain }}{% url share.views.anonymous_share_confirm token=token %}
注册后，就可以在首页查看该同步目录。感谢使用我们的网站！
注册后，就可以在首页查看该资料库。感谢使用我们的网站！
Seafile团队

2
share/templates/repo/repo_share_mail.html
View File

@@ -1,7 +1,7 @@
{% autoescape off %}
亲爱的 {{ to_email }}：
{{ user }} 在SeaCloud上共享了一个同步目录给你。注册帐号后请点击以下链接查看：
{{ user }} 在SeaCloud上共享了一个资料库给你。注册帐号后请点击以下链接查看：
{{ protocol }}://{{ domain }}{% url myhome %}

4
share/templates/repo/share_admin.html
View File

@@ -4,7 +4,7 @@
{% block nav_shareadmin_class %}class="cur"{% endblock %}
{% block right_panel %}
<h3>我共享的同步目录</h3>
<h3>我共享的资料库</h3>
{% if shared_repos %}
<table class="repo-list">
<tr>
@@ -49,7 +49,7 @@
<table class="sharelink-list">
<tr>
<th width="45%">文件名</th>
<th width="30%">所属目录</th>
<th width="30%">所属资料库</th>
<th width="10%">查看次数</th>
<th width="15%">操作</th>
</tr>

6
share/views.py
View File

@@ -54,7 +54,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'只有资料库拥有者有权共享该资料库')
to_email_list = string2list(email_or_group)
for to_email in to_email_list:
@@ -210,7 +210,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'共享给 %s 失败，加密资料库无法共享给站外邮箱。' % anon_email
messages.error(request, msg)
return
@@ -243,7 +243,7 @@ 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'您在SeaCloud上收到一个资料库', t.render(Context(c)), None,
[anon_email], fail_silently=False)
except:
AnonymousShare.objects.filter(token=token).delete()

2
templates/admin_base.html
View File

@@ -4,7 +4,7 @@
<ul class="nav">
{% if request.user.is_staff %}
<li>
<a href="{{ SITE_ROOT }}sys/seafadmin/" {% block nav_seafadmin_class %}{% endblock %}>目录管理</a>
<a href="{{ SITE_ROOT }}sys/seafadmin/" {% block nav_seafadmin_class %}{% endblock %}>资料库管理</a>
</li>
<li>
<a href="{{ SITE_ROOT }}sys/useradmin/" {% block nav_useradmin_class %}{% endblock %}>用户管理</a>

2
templates/decrypt_repo_form.html
View File

@@ -6,7 +6,7 @@
<div class="repo-file-list-outer-container">
<div class="repo-file-list-inner-container">
<div class="repo-file-list-not-show">
<p class="access-notice">该目录已加密。如需在线查看里面的内容，请输入解密密码。密码只会在服务器上暂存1小时。</p>
<p class="access-notice">该资料库已加密。如需在线查看里面的内容，请输入解密密码。密码只会在服务器上暂存1小时。</p>
<form action="{{ SITE_ROOT }}repo/{{ repo.id }}/?next={{ next }}" method="post">
<label>密码：</label>
<input type="hidden" name="repo_id" value="{{ repo.id }}" />

4
templates/myhome.html
View File

@@ -46,10 +46,10 @@
{% endblock %}
{% block right_panel %}
<!-- 我拥有的同步目录 -->
<!-- 我拥有的资料库 -->
{% include "snippets/my_owned_repos.html" %}
<!-- 共享给我的同步目录 -->
<!-- 共享给我的资料库 -->
{% include "snippets/shared_in_repos.html" %}
{% if events %}

2
templates/org_admin_base.html
View File

@@ -7,7 +7,7 @@
<a href="{% url org_useradmin request.user.org.url_prefix %}" {% block nav_useradmin_class %}{% endblock %}>用户管理</a>
</li>
<li>
<a href="{% url org_seafadmin request.user.org.url_prefix %}" {% block nav_seafadmin_class %}{% endblock %}>目录管理</a>
<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>

4
templates/public_home.html
View File

@@ -18,8 +18,8 @@
{% endblock %}
{% block right_panel %}
<h3>公开的同步目录</h3>
<button id="repo-create">新建同步目录</button>
<h3>公开的资料库</h3>
<button id="repo-create">新建资料库</button>
{% if public_repos %}
<table>
<tr>

8
templates/repo.html
View File

@@ -21,7 +21,7 @@
{% endif %}
</div>
{% if user_perm != 'rw' %}
<p>这个同步目录设置了只读共享，您只能在线浏览文件。</p>
<p>这个资料库设置了只读共享，您只能在线浏览文件。</p>
{% endif %}
<div id="repo-basic-info">
<p class="desc">{{repo.props.desc}}</p>
@@ -56,7 +56,7 @@
<div class="repo-file-list-inner-container">
{% if not user_perm %}
<div class="repo-file-list-not-show">
<p class="access-notice">无法在线查看该同步目录。</p>
<p class="access-notice">无法在线查看该资料库。</p>
</div>
{% else %}
<div class="repo-file-list-topbar ovhd">
@@ -171,9 +171,9 @@
<form id="mv-form" action="{{ SITE_ROOT }}file/move/" method="post" class="hide">
<h3 id="mv-hd"></h3>
<div class="con">
<h4><span class="tri-bg tri-down-bg"></span>当前同步目录：</h4>
<h4><span class="tri-bg tri-down-bg"></span>当前资料库：</h4>
<div id="current-repo-dirs"></div>
<h4><span class="tri-bg tri-right-bg"></span>其他同步目录：</h4>
<h4><span class="tri-bg tri-right-bg"></span>其他资料库：</h4>
<div id="other-repos-dirs" class="hide"></div>
</div>
<input type="hidden" name="operation" id="operation" value="" />

2
templates/repo_history.html
View File

@@ -5,7 +5,7 @@
{% block main_panel %}
<div class="w100 ovhd">
<h2 class="fleft">{{repo.props.name}} 修改历史</h2>
<button data="{{ SITE_ROOT }}repo/{{ repo.props.id }}/" class="fright" id="back">返回同步目录</button>
<button data="{{ SITE_ROOT }}repo/{{ repo.props.id }}/" class="fright" id="back">返回资料库</button>
</div>
<p class="tip">Tip：在每次修改后会生成一个镜像，记录修改之前的目录状态。<a href="{% url 'repo_view_snapshot' repo.props.id %}">查看镜像</a></p>

2
templates/repo_history_view.html
View File

@@ -28,7 +28,7 @@
<div class="repo-file-list-inner-container">
{% if not user_perm %}
<div class="repo-file-list-not-show">
<p class="access-notice">无法在线查看该同步目录。</p>
<p class="access-notice">无法在线查看该资料库。</p>
</div>
{% else %}
<div class="repo-file-list-topbar">

2
templates/repo_update_file.html
View File

@@ -30,7 +30,7 @@
</div>
{% else %}
<div class="text-panel">
<p class="error">该同步目录所有者的空间已用完，无法更新</p>
<p class="error">该资料库所有者的空间已用完，无法更新</p>
</div>
{% endif %}
{% endblock %}

2
templates/repo_upload_file.html
View File

@@ -26,7 +26,7 @@
</div>
{% else %}
<div class="text-panel">
<p class="error">该同步目录所有者的空间已用完，无法上传</p>
<p class="error">该资料库所有者的空间已用完，无法上传</p>
</div>
{% endif %}
{% endblock %}

2
templates/repo_view_file.html
View File

@@ -115,7 +115,7 @@
<p id="open-local-handling-tip">处理中，请稍侯...</p>
<p id="open-local-error" class="error"></p>
<div id="redirect-download" class="hide">
<p class="error">您还没有将同步目录 {{repo.name}} 下载到本地</p>
<p class="error">您还没有将资料库 {{repo.name}} 下载到本地</p>
<button data="{{ SITE_ROOT }}download/repo/?repo_id={{ repo.id }}" id="download-repo">点此下载</button>
</div>
</div>

2
templates/repo_view_snapshot.html
View File

@@ -77,6 +77,6 @@
$('#back').click(function() {
location.href = $(this).attr('data');
});
addConfirmTo($(".repo-revert"), '确定要还原该目录？');
addConfirmTo($(".repo-revert"), '确定要还原该资料库？');
</script>
{% endblock %}

4
templates/snippets/my_owned_repos.html
View File

@@ -1,6 +1,6 @@
{% load seahub_tags %}
<h3>我拥有的同步目录</h3>
<button id="repo-create">新建同步目录</button>
<h3>我拥有的资料库</h3>
<button id="repo-create">新建资料库</button>
{% if owned_repos %}
<table>
<tr>

2
templates/snippets/repo_create_form.html
View File

@@ -1,5 +1,5 @@
<form id="repo-create-form" action="" method="post" class="hide">
<h3>新建同步目录</h3>
<h3>新建资料库</h3>
<label>名称：</label><br/>
<input id="repo-name" type="text" name="repo_name" value="" /><br />
<label>描述：</label><br/>

2
templates/snippets/shared_in_repos.html
View File

@@ -1,5 +1,5 @@
{% load seahub_tags %}
<h3>共享给我的同步目录</h3>
<h3>共享给我的资料库</h3>
{% if in_repos %}
<table>
<tr>

2
templates/sys_seafadmin.html
View File

@@ -2,7 +2,7 @@
{% block nav_seafadmin_class %}class="cur"{% endblock %}
{% block right_panel %}
<h3>所有同步目录</h3>
<h3>所有资料库</h3>
{% if repos %}
<table>
<tr>

4
templates/userinfo.html
View File

@@ -13,7 +13,7 @@
{% endblock %}
{% block right_panel %}
<h3>{{ email }} 拥有的同步目录</h3>
<h3>{{ email }} 拥有的资料库</h3>
{% if owned_repos %}
<table>
<tr>
@@ -38,7 +38,7 @@
<p>暂无</p>
{% endif %}
<h3>共享给 {{ email }} 的同步目录</h3>
<h3>共享给 {{ email }} 的资料库</h3>
{% if in_repos %}
<table>
<tr>

16
views.py
View File

@@ -418,7 +418,7 @@ def upload_error_msg (code):
elif (code == 3):
err_msg = u'文件大小超过限制'
elif (code == 4):
err_msg = u'该同步目录所有者的空间已用完，无法上传'
err_msg = u'该资料库所有者的空间已用完，无法上传'
elif (code == 5):
err_msg = u'文件传输出错'
return err_msg
@@ -516,7 +516,7 @@ def repo_history(request, repo_id):
View repo history.
"""
if not access_to_repo(request, repo_id, ''):
return render_permission_error(request, u'无法浏览该同步目录修改历史')
return render_permission_error(request, u'无法浏览该资料库修改历史')
repo = get_repo(repo_id)
@@ -562,7 +562,7 @@ def repo_history(request, repo_id):
@ctx_switch_required
def repo_view_snapshot(request, repo_id):
if not access_to_repo(request, repo_id, ''):
return render_permission_error(request, u'无法查看该同步目录镜像')
return render_permission_error(request, u'无法查看该资料库镜像')
repo = get_repo(repo_id)
@@ -636,7 +636,7 @@ def repo_history_revert(request, repo_id):
if e.msg == 'Bad arguments':
return render_error(request, u'非法参数')
elif e.msg == 'No such repo':
return render_error(request, u'同步目录不存在')
return render_error(request, u'资料库不存在')
elif e.msg == "Commit doesn't exist":
return render_error(request, u'指定的历史记录不存在')
else:
@@ -727,7 +727,7 @@ def modify_token(request, repo_id):
def remove_repo(request, repo_id):
repo = get_repo(repo_id)
if not repo:
return render_error(request, u"该同步目录不存在")
return render_error(request, u"该资料库不存在")
user = request.user.username
org, base_template = check_and_get_org_by_repo(repo_id, user)
@@ -738,7 +738,7 @@ def remove_repo(request, repo_id):
is_org_repo_owner(org.org_id, repo_id, user):
seafserv_threaded_rpc.remove_repo(repo_id)
else:
err_msg = u'删除同步目录失败, 只有团体管理员或目录创建者有权删除目录。'
err_msg = u'删除资料库失败, 只有团体管理员或目录创建者有权删除目录。'
return render_permission_error(request, err_msg)
else:
# Remove repo in personal context, only repo owner or site staff can
@@ -753,7 +753,7 @@ def remove_repo(request, repo_id):
repo_name=repo.name,
)
else:
err_msg = u'删除同步目录失败, 只有管理员或目录创建者有权删除目录。'
err_msg = u'删除资料库失败, 只有管理员或目录创建者有权删除目录。'
return render_permission_error(request, err_msg)
next = request.META.get('HTTP_REFERER', None)
@@ -2099,7 +2099,7 @@ def render_file_revisions (request, repo_id):
repo = get_repo(repo_id)
if not repo:
error_msg = u"同步目录不存在"
error_msg = u"资料库不存在"
return render_error(request, error_msg)
try: