hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' into develop

Browse Source
memcached_alan v20150411_1
sw 10 years ago
parent 8d565a1165 44cb4a8e56
commit 6c32e073ed
15 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File

2
app/models/comment.rb
Unescape View File

@ -27,7 +27,7 @@ class Comment < ActiveRecord::Base
def send_mail def send_mail
if self.commented.is_a?(News) && Setting.notified_events.include?('news_comment_added') if self.commented.is_a?(News) && Setting.notified_events.include?('news_comment_added')
Mailer.run.news_comment_added(self) Mailer.news_comment_added(self)
end end
end end
after_destroy :delete_kindeditor_assets after_destroy :delete_kindeditor_assets

4
app/views/issues/_list.html.erb
Unescape View File

@ -55,9 +55,9 @@
<%= l(:label_updated_time_on, format_date(issue.updated_on)).html_safe %> <%= l(:label_updated_time_on, format_date(issue.updated_on)).html_safe %>
<div class="find-comment-class"> <div class="find-comment-class">
<span> <span>
<%= link_to l(:label_find_all_comments), issue_path(issue.id) %> <%= link_to l(:label_find_all_comments), issue_path(issue.id) if issue.journals.all.count!= 0 %>
</span> </span>
<%= l(:label_comments_count, :count => issue.journals.all.count) %> <%= l(:label_comments_count, :count => issue.journals.all.count) %>
</div> </div>
</ul> </ul>
<% end -%> <% end -%>

2
app/views/issues/new.html.erb
Unescape View File

@ -1,5 +1,5 @@
<div class="project_r_h"> <div class="project_r_h">
<h2 class="project_h2">问题跟踪</h2> <h2 class="project_h2"><%= l(:label_issue_new) %></h2>
</div> </div>
<%= call_hook(:view_issues_new_top, {:issue => @issue}) %> <%= call_hook(:view_issues_new_top, {:issue => @issue}) %>

2
app/views/issues/show.html.erb
Unescape View File

@ -1,5 +1,5 @@
<div class="project_r_h"> <div class="project_r_h">
<h2 class="project_h2"><%= l(:label_issue_plural) %></h2> <h2 class="project_h2"><%= l(:label_issue_edit) %></h2>
</div> </div>
<%# html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %> <%# html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
<% html_title "#{@issue.tracker.name} #{@issue.source_from}'#'#{@issue.project_index}: #{@issue.subject}" %> <% html_title "#{@issue.tracker.name} #{@issue.source_from}'#'#{@issue.project_index}: #{@issue.subject}" %>

2
app/views/news/_project_news.html.erb
Unescape View File

@ -133,7 +133,7 @@
<tr> <tr>
<td align="left"><span class="font_lighter"> <%= l :label_update_time %> <td align="left"><span class="font_lighter"> <%= l :label_update_time %>
：&nbsp;<%= format_time(news.created_on) %></span></td> ：&nbsp;<%= format_time(news.created_on) %></span></td>
<td width="350" align="right" class="a"><%= link_to l(:label_project_newother), news_path(news) %><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %></td> <td width="350" align="right" class="a"><%= link_to l(:label_project_newother), news_path(news) if news.comments_count >0 %><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %></td>
</tr> </tr>
</table> </table>
</td> </td>

2
app/views/projects/_newproject_show.html.erb
Unescape View File

@ -36,7 +36,7 @@
：&nbsp; <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></span> ：&nbsp; <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></span>
<% if e.event_type == "issue" %> <% if e.event_type == "issue" %>
<div class="" style="display:inline-block;position:absolute; right:2%;"> <div class="" style="display:inline-block;position:absolute; right:2%;">
<span> <%= link_to l(:label_find_all_comments), issue_path(e) %> </span><span class="font_lighter"><%= l(:label_comments_count, :count => e.journals.count) %></span> <span> <%= link_to l(:label_find_all_comments), issue_path(e) if e.journals.count!= 0%> </span><span class="font_lighter"><%= l(:label_comments_count, :count => e.journals.count) %></span>
</div> </div>
<% end %> <% end %>
</div> </div>

4
app/views/projects/show.html.erb
Unescape View File

@ -76,7 +76,7 @@
<span class="font_lighter"> <%= l :label_activity_time %> <span class="font_lighter"> <%= l :label_activity_time %>
：&nbsp; <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></span> ：&nbsp; <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></span>
<div class="" style="display:inline-block;position:absolute; right:2%;"> <div class="" style="display:inline-block;position:absolute; right:2%;">
<span> <%= link_to l(:label_find_all_comments), issue_path(act.id) %> </span><span class="font_lighter"><%= l(:label_comments_count, :count => act.journals.count) %></span> <span> <%= link_to l(:label_find_all_comments), issue_path(act.id) if act.journals.count!= 0%> </span><span class="font_lighter"><%= l(:label_comments_count, :count => act.journals.count) %></span>
</div> </div>
</div> </div>
</div> </div>
@ -151,7 +151,7 @@
：&nbsp; <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></span> ：&nbsp; <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %></span>
<div class="" style="display:inline-block;position:absolute; right:2%;"> <div class="" style="display:inline-block;position:absolute; right:2%;">
<span> <span>
<%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} %> <%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} if act.comments_count!= 0%>
</span> </span>
<span class="font_lighter"> <span class="font_lighter">
<%= l(:label_comments_count, :count => act.comments_count) %> <%= l(:label_comments_count, :count => act.comments_count) %>

8
app/views/users/show.html.erb
Unescape View File

@ -302,7 +302,7 @@
:action => 'revision', :action => 'revision',
:id => act.repository.project, :id => act.repository.project,
:repository_id => act.repository.identifier_param, :repository_id => act.repository.identifier_param,
:rev => act.identifier} %> :rev => act.identifier} if e.act.count!= 0%>
</span> </span>
<a class="font_lighter"> <a class="font_lighter">
<%= l(:label_comments_count, :count => e.act.count) %> <%= l(:label_comments_count, :count => e.act.count) %>
@ -444,7 +444,7 @@
</div> </div>
<div style="display: inline-block; float: right; margin-top: 0px"> <div style="display: inline-block; float: right; margin-top: 0px">
<span> <span>
<%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} %> <%= link_to l(:label_find_all_comments), {:controller => 'news', :action => 'show', :id => act.id} if e.act.comments_count!= 0%>
</span> </span>
<a class="font_lighter"> <a class="font_lighter">
<%= l(:label_comments_count, :count => e.act.comments_count) %> <%= l(:label_comments_count, :count => e.act.comments_count) %>
@ -484,7 +484,7 @@
</div> </div>
<div style="display: inline-block; float: right; margin-top: 0px"> <div style="display: inline-block; float: right; margin-top: 0px">
<span> <span>
<%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} %> <%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} if e.act.journals.count!= 0 %>
</span> </span>
<a class="font_lighter"> <a class="font_lighter">
<%= l(:label_comments_count, :count => e.act.journals.count) %> <%= l(:label_comments_count, :count => e.act.journals.count) %>
@ -520,7 +520,7 @@
</div> </div>
<div style="display: inline-block; float: right; margin-top: 0px"> <div style="display: inline-block; float: right; margin-top: 0px">
<span> <span>
<%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} %> <%= link_to l(:label_find_all_comments), {:controller => 'issues', :action => 'show', :id => act.id} if e.act.journals.count!= 0 %>
</span> </span>
<a class="font_lighter"> <a class="font_lighter">
<%= l(:label_comments_count, :count => e.act.journals.count) %> <%= l(:label_comments_count, :count => e.act.journals.count) %>

8
config/locales/commons/en.yml
Unescape View File

@ -190,10 +190,10 @@ en:
label_anonymous: Anonymous #作业和留言 模块 label_anonymous: Anonymous #作业和留言 模块
text_are_you_sure: Are you sure? #js 提示 text_are_you_sure: "Are you sure?" #js 提示
text_are_you_sure_out: Are you sure to quit from this course? text_are_you_sure_out: "Are you sure to quit from this course?"
text_are_you_sure_out_group: Are you sure to quit from this group? text_are_you_sure_out_group: "Are you sure to quit from this group?"
text_are_you_sure_all: "Are you sure to delete all files?"

2
config/locales/commons/zh.yml
Unescape View File

@ -189,6 +189,8 @@ zh:
text_are_you_sure: 您确定要删除吗？ #js 提示 text_are_you_sure: 您确定要删除吗？ #js 提示
text_are_you_sure_out: 你确定要退出该课程吗？ text_are_you_sure_out: 你确定要退出该课程吗？
text_are_you_sure_out_group: 你确定要退出该分班吗？ text_are_you_sure_out_group: 你确定要退出该分班吗？
text_are_you_sure_all: 您确定要删除所有文件吗
label_field_correct: 填写正确 label_field_correct: 填写正确
label_title_blank: 标题不能为空 label_title_blank: 标题不能为空

2
config/locales/en.yml
Unescape View File

@ -402,7 +402,7 @@ en:
label_project_all: All Projects label_project_all: All Projects
label_project_latest: Latest projects label_project_latest: Latest projects
label_issue_plural: Issues Tracking
label_issue_view_all: View all issues label_issue_view_all: View all issues
label_issues_by: "Issues by %{value}" label_issues_by: "Issues by %{value}"
label_issue_added: Issue added label_issue_added: Issue added

11
config/locales/projects/en.yml
Unescape View File

@ -133,7 +133,7 @@ en:
label_max_size: Maximum size label_max_size: Maximum size
label_optional_description: Description label_optional_description: Description
label_file_count: "Uploaded successfully" label_file_count: " files uploaded successfully"
# #
# 项目托管平台 # 项目托管平台
@ -201,6 +201,15 @@ en:
default_priority_immediate: Immediate default_priority_immediate: Immediate
field_hours: Hours field_hours: Hours
#问题更新
label_issue_edit: Tracking
# #
# 项目托管平台 # 项目托管平台
# #

6
config/locales/projects/zh.yml
Unescape View File

@ -139,8 +139,6 @@ zh:
label_optional_description: 可选的描述 label_optional_description: 可选的描述
label_file_count: "个文件已上传" label_file_count: "个文件已上传"
text_are_you_sure_all: 您确定要删除所有文件吗
# #
# 项目托管平台 # 项目托管平台
@ -239,7 +237,7 @@ zh:
#问题更新 #问题更新
label_issue_edit: 问题跟踪
@ -261,6 +259,8 @@ zh:
label_post_by: 由 label_post_by: 由
label_post_by_time: 添加于 label_post_by_time: 添加于
label_short_reply: "回复" label_short_reply: "回复"
# #
# 项目托管平台 # 项目托管平台
# #

1
config/locales/zh.yml
Unescape View File

@ -383,7 +383,6 @@ zh:
label_project_latest: 最近的项目 label_project_latest: 最近的项目
label_issue: 问题 label_issue: 问题
label_issue_plural: 问题跟踪
label_issue_view_all: 查看所有问题 label_issue_view_all: 查看所有问题
label_issues_by: "按 %{value} 分组显示问题" label_issues_by: "按 %{value} 分组显示问题"
label_issue_added: 问题已添加 label_issue_added: 问题已添加

6
public/javascripts/attachments.js
Unescape View File

@ -25,8 +25,8 @@ function reload(fileSpan) {
function addFile(inputEl, file, eagerUpload) { function addFile(inputEl, file, eagerUpload) {
if ($('#attachments_fields').children().length < 10) { if ($('#attachments_fields').children().length < 30) {
deleteallfiles = $(inputEl).data('deleteAllFiles');
var attachmentId = addFile.nextAttachmentId++; var attachmentId = addFile.nextAttachmentId++;
var fileSpan = $('<span>', { 'id': 'attachments_' + attachmentId, 'class':'attachment' }); var fileSpan = $('<span>', { 'id': 'attachments_' + attachmentId, 'class':'attachment' });
@ -141,7 +141,7 @@ function removeFile() {
//gcm delete all file //gcm delete all file
function removeAll(){ function removeAll(){
if(confirm($(inputEl).data('deleteAllFiles'))){ if(confirm(deleteallfiles)){
$(".remove-upload").removeAttr("data-confirm"); $(".remove-upload").removeAttr("data-confirm");
$(".remove-upload").click(); $(".remove-upload").click();
} }

Write Preview
Loading…
Cancel
Save