haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-16 15:19:06 +00:00
Code Issues Releases Wiki Activity

Change commit description and diff output for merge.

Browse Source
This commit is contained in:
killing
2012-10-24 20:46:25 +08:00
parent 33748182cf
commit f9cfd081fe
5 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
base/templatetags/seahub_tags.py
View File

@@ -57,8 +57,8 @@ def translate_commit_desc(value):
return value
elif value.startswith('Recovered deleted directory'):
return value.replace('Recovered deleted directory', u'还原已删除的目录')
elif value.startswith('Merged'):
return u'合并了其他人的修改'
elif value.startswith('Merged') or value.startswith('Auto merge'):
return u'系统自动合并修改'
else:
operations = '|'.join(TRANSLATION_MAP.keys())
patt = r'(%s) "(.*)"\s?(and ([0-9]+) more (files|directories))?' % operations

4
templates/repo.html
View File

@@ -48,8 +48,12 @@
<p class="meta-info">
<span class="author">
{% if current_commit.props.creator_name %}
{% if not current_commit.second_parent_id %}
{% avatar current_commit.props.creator_name 20 %}
<a class="name" href="{% url 'profile.views.user_profile' current_commit.props.creator_name %}">{{ current_commit.props.creator_name|short_email }}</a>
{% else %}
<span class="name">系统自动生成</span>
{% endif %}
{% else %}
未知
{% endif %}

4
templates/repo_history.html
View File

@@ -23,8 +23,12 @@
<td class="time">{{ commit.ctime|translate_commit_time }}</td>
<td>
{% if commit.creator_name %}
{% if not commit.second_parent_id %}
<a href="{{ SITE_ROOT }}profile/{{ commit.creator_name }}/">{% avatar commit.creator_name 16 %}</a>
<a href="{{ SITE_ROOT }}profile/{{ commit.creator_name }}/">{{ commit.creator_name|email2nickname }}</a>
{% else %}
无
{% endif %}
{% else %}
未知
{% endif %}

4
templates/repo_view_snapshot.html
View File

@@ -23,8 +23,12 @@
<td class="time">{{ commit.ctime|translate_commit_time }}</td>
<td>
{% if commit.creator_name %}
{% if not commit.second_parent_id %}
<a href="{{ SITE_ROOT }}profile/{{ commit.creator_name }}/">{% avatar commit.creator_name 16 %}</a>
<a href="{{ SITE_ROOT }}profile/{{ commit.creator_name }}/">{{ commit.creator_name|email2nickname }}</a>
{% else %}
无
{% endif %}
{% else %}
未知
{% endif %}

2
templates/snippets/list_commit_detail.html
View File

@@ -40,7 +40,7 @@ function get_commit_diff(url, callback) {
show(data['deldir']);
}
if (!con) {
con = '<p>没有文件被改动</p>';
con = '<p>合并没有产生冲突文件</p>';
}
callback(con);
}