From 5936d8d8e9f5fc7ed2f775b80d8c4f2d7d802e53 Mon Sep 17 00:00:00 2001 From: whimlex Date: Sat, 11 Apr 2015 11:52:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/new.html.erb | 2 +- app/views/projects/_newproject_show.html.erb | 2 +- app/views/projects/show.html.erb | 4 ++-- app/views/users/show.html.erb | 8 ++++---- config/locales/commons/en.yml | 8 ++++---- config/locales/commons/zh.yml | 2 ++ config/locales/projects/en.yml | 2 +- config/locales/projects/zh.yml | 4 ++-- public/javascripts/attachments.js | 4 ++-- 9 files changed, 19 insertions(+), 17 deletions(-) diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb index 51ebd139e..0b810cd1b 100644 --- a/app/views/issues/new.html.erb +++ b/app/views/issues/new.html.erb @@ -1,5 +1,5 @@
-

问题跟踪

+

<%= l(:label_issue_tracking) %>

<%= call_hook(:view_issues_new_top, {:issue => @issue}) %> diff --git a/app/views/projects/_newproject_show.html.erb b/app/views/projects/_newproject_show.html.erb index 6d785ce6b..acacae37b 100644 --- a/app/views/projects/_newproject_show.html.erb +++ b/app/views/projects/_newproject_show.html.erb @@ -36,7 +36,7 @@ ：  <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %> <% if e.event_type == "issue" %>
- <%= link_to l(:label_find_all_comments), issue_path(e) %> <%= l(:label_comments_count, :count => e.journals.count) %> + <%= link_to l(:label_find_all_comments), issue_path(e) if e.journals.count!= 0%> <%= l(:label_comments_count, :count => e.journals.count) %>
<% end %> diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index 2c56cefa3..2579b3115 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -76,7 +76,7 @@ <%= l :label_activity_time %> ：  <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %>
- <%= link_to l(:label_find_all_comments), issue_path(act.id) %> <%= l(:label_comments_count, :count => act.journals.count) %> + <%= link_to l(:label_find_all_comments), issue_path(act.id) if act.journals.count!= 0%> <%= l(:label_comments_count, :count => act.journals.count) %>
@@ -151,7 +151,7 @@ ：  <%= format_activity_day(act.created_on) %> <%= format_time(act.created_on, false) %>
- <%= 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%> <%= l(:label_comments_count, :count => act.comments_count) %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 2c5126794..055a00a82 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -302,7 +302,7 @@ :action => 'revision', :id => act.repository.project, :repository_id => act.repository.identifier_param, - :rev => act.identifier} %> + :rev => act.identifier} if e.act.count!= 0%> <%= l(:label_comments_count, :count => e.act.count) %> @@ -444,7 +444,7 @@
- <%= 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%> <%= l(:label_comments_count, :count => e.act.comments_count) %> @@ -484,7 +484,7 @@
- <%= 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 %> <%= l(:label_comments_count, :count => e.act.journals.count) %> @@ -520,7 +520,7 @@
- <%= 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 %> <%= l(:label_comments_count, :count => e.act.journals.count) %> diff --git a/config/locales/commons/en.yml b/config/locales/commons/en.yml index e4544dbeb..3c2c63654 100644 --- a/config/locales/commons/en.yml +++ b/config/locales/commons/en.yml @@ -190,10 +190,10 @@ en: label_anonymous: Anonymous #作业和留言 模块 - 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_group: Are you sure to quit from this group? - + 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_group: "Are you sure to quit from this group?" + text_are_you_sure_all: "Are you sure to delete all files?" diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml index 1f411bdbb..dae2a9741 100644 --- a/config/locales/commons/zh.yml +++ b/config/locales/commons/zh.yml @@ -189,6 +189,8 @@ zh: text_are_you_sure: 您确定要删除吗？ #js 提示 text_are_you_sure_out: 你确定要退出该课程吗？ text_are_you_sure_out_group: 你确定要退出该分班吗？ + text_are_you_sure_all: 您确定要删除所有文件吗 + label_field_correct: 填写正确 label_title_blank: 标题不能为空 diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml index 3b6af9a08..4d1c0e1a3 100644 --- a/config/locales/projects/en.yml +++ b/config/locales/projects/en.yml @@ -133,7 +133,7 @@ en: label_max_size: Maximum size label_optional_description: Description - label_file_count: "Uploaded successfully" + label_file_count: "files uploaded successfully" # # 项目托管平台 diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index aba26990f..f08624854 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -139,8 +139,6 @@ zh: label_optional_description: 可选的描述 label_file_count: "个文件已上传" - text_are_you_sure_all: 您确定要删除所有文件吗 - # # 项目托管平台 @@ -261,6 +259,8 @@ zh: label_post_by: 由 label_post_by_time: 添加于 label_short_reply: "回复" + + # # 项目托管平台 # diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 6bfcd05d8..1d13cfc2f 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -26,7 +26,7 @@ function reload(fileSpan) { function addFile(inputEl, file, eagerUpload) { if ($('#attachments_fields').children().length < 10) { - + deleteallfiles = $(inputEl).data('deleteAllFiles'); var attachmentId = addFile.nextAttachmentId++; var fileSpan = $('', { 'id': 'attachments_' + attachmentId, 'class':'attachment' }); @@ -141,7 +141,7 @@ function removeFile() { //gcm delete all file function removeAll(){ - if(confirm($(inputEl).data('deleteAllFiles'))){ + if(confirm(deleteallfiles)){ $(".remove-upload").removeAttr("data-confirm"); $(".remove-upload").click(); }