1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-04-28 03:10:45 +00:00

Modified history and detail

This commit is contained in:
zhengxie 2012-10-31 19:36:29 +08:00
parent a3f8b4c2a5
commit e2fc6a93b7
5 changed files with 20 additions and 22 deletions

Binary file not shown.

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-10-31 17:00+0800\n"
"POT-Creation-Date: 2012-10-31 19: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"
@ -517,15 +517,16 @@ msgid "This library is read-only, and you can only view the files."
msgstr "这个资料库设置了只读共享,您只能在线浏览文件。"
#: templates/repo.html:33
msgid "Size:"
msgid "Size: "
msgstr "大小:"
#: templates/repo.html:42 templates/repo_history.html:39
#: templates/repo_view_file.html:91 templates/repo_view_snapshot.html:39
msgid "More"
msgstr "详情"
#: templates/repo.html:42 templates/repo_view_file.html:91
#: templates/repo_view_snapshot.html:17
msgid "Detail"
msgstr "修改内容"
#: templates/repo.html:45 templates/repo.html.py:149
#: templates/repo_view_file.html:95
msgid "History"
msgstr "历史"
@ -674,6 +675,10 @@ msgstr "修改者"
msgid "None"
msgstr "无"
#: templates/repo_history.html:39 templates/repo_view_snapshot.html:39
msgid "More"
msgstr "详情"
#: templates/repo_history.html:47 templates/repo_view_snapshot.html:51
msgid "Previous"
msgstr "前一页"
@ -774,10 +779,6 @@ msgstr "添加星标"
msgid "updated this library"
msgstr "更新了该资料库"
#: templates/repo_view_file.html:95
msgid "more history"
msgstr "更多历史"
#: templates/repo_view_file.html:98
#, python-format
msgid "one contributor"
@ -881,10 +882,6 @@ msgstr "返回修改历史"
msgid "Create Time"
msgstr "生成时间"
#: templates/repo_view_snapshot.html:17
msgid "Detail"
msgstr "修改内容"
#: templates/repo_view_snapshot.html:84
msgid "Really want to restore this library?"
msgstr "确定要还原这个资料库?"
@ -922,7 +919,6 @@ msgid "Forgot password?"
msgstr "忘记密码"
#: templates/registration/login.html:28
#, fuzzy
msgid "Email cant be blank"
msgstr "邮箱不能为空"
@ -1236,8 +1232,8 @@ msgid "Share to"
msgstr "共享给"
#: templates/snippets/repo_share_form.html:4
msgid "Emails or Groups"
msgstr "输入邮箱或群组"
msgid "Emails or Groups, Seperate by ','"
msgstr "输入邮箱或群组,多个以,分隔"
#: templates/snippets/repo_share_form.html:7
msgid ""
@ -1260,3 +1256,5 @@ msgstr "名字(可选)"
msgid "Note(optional)"
msgstr "备注(可选)"
#~ msgid "more history"
#~ msgstr "更多历史"

View File

@ -30,7 +30,7 @@
{% if user_perm %}
<div id="repo-basic-info">
<p class="desc">{{repo.props.desc}}</p>
<p class="size">{% trans 'Size:' %}{{ repo_size|filesizeformat }}</p>
<p class="size">{% trans 'Size: ' %}{{ repo_size|filesizeformat }}</p>
</div>
{% endif %}
@ -39,7 +39,7 @@
<p class="commit-msg ovhd">
<span class="fleft">
{{ current_commit.props.desc|translate_commit_desc }}
<a class="lsch" href="{{ SITE_ROOT }}repo/history/changes/{{ repo.id }}/?commit_id={{ current_commit.id }}" data="{{ current_commit.props.ctime|tsstr_sec }}">{% trans "More"%}</a>
<a class="lsch" href="{{ SITE_ROOT }}repo/history/changes/{{ repo.id }}/?commit_id={{ current_commit.id }}" data="{{ current_commit.props.ctime|tsstr_sec }}">{% trans "Detail"%}</a>
</span>
{% if user_perm == 'rw' %}
<a href="{% url 'seahub.views.repo_history' repo.id %}" class="more fright">{% trans "History"%}</a>

View File

@ -88,11 +88,11 @@
{% avatar latest_contributor 20 %} <a href="{% url 'user_profile' latest_contributor %}" class="name">{{ latest_contributor|email2nickname }}</a><span class="time">{{ last_modified|translate_commit_time}}</span><span>{% trans "updated this library"%}</span>
{% if filetype == 'Text' or filetype == 'Markdown' %}
{% if last_commit_id %}
<span><a class="file-diff" href="{% url 'text_diff' repo.id %}?p={{path|urlencode}}&commit={{last_commit_id}}">{% trans "More"%}</a></span>
<span><a class="file-diff" href="{% url 'text_diff' repo.id %}?p={{path|urlencode}}&commit={{last_commit_id}}">{% trans "Detail"%}</a></span>
{% endif %}
{% endif %}
</p>
<a href="{% url 'file_revisions' repo.id %}?p={{ path }}" class="more fright">{% trans "more history"%}</a>
<a href="{% url 'file_revisions' repo.id %}?p={{ path }}" class="more fright">{% trans "History"%}</a>
</div>
<p class="contributors">
<span>{% blocktrans count counter=contributors|length %}one contributor{% plural %} {{ counter }} contributors {% endblocktrans %}</span>

View File

@ -1,7 +1,7 @@
{% load i18n %}
<form id="repo-share-form" action="{{ post_url }}" method="post" name="repo-share-form" class="hide">
<p>{% trans "Share to"%}</p>
<textarea id="email_or_group" name="email_or_group" placeholder="{% trans "Emails or Groups"%}"></textarea>
<textarea id="email_or_group" name="email_or_group" placeholder="{% trans "Emails or Groups, Seperate by ','"%}"></textarea>
{% if cloud_mode %}
{% if org %}
<p class="tip">{% trans "Tip: must be org members or org groups, type all to share to public library."%}</p>