From 7e46885f3d1d356c894059b08dde60a25c7a543d Mon Sep 17 00:00:00 2001 From: whimlex Date: Sat, 11 Apr 2015 13:46:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0=E9=99=84?= =?UTF-8?q?=E4=BB=B6=E6=95=B0=E7=9B=AE=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/new.html.erb | 2 +- app/views/issues/show.html.erb | 2 +- config/locales/en.yml | 2 +- config/locales/projects/en.yml | 11 ++++++++++- config/locales/projects/zh.yml | 2 +- config/locales/zh.yml | 1 - public/javascripts/attachments.js | 2 +- 7 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb index 0b810cd1b..0ac338321 100644 --- a/app/views/issues/new.html.erb +++ b/app/views/issues/new.html.erb @@ -1,5 +1,5 @@
-

<%= l(:label_issue_tracking) %>

+

<%= l(:label_issue_new) %>

<%= call_hook(:view_issues_new_top, {:issue => @issue}) %> diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 38afc672d..1f782341d 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -1,5 +1,5 @@
-

<%= l(:label_issue_plural) %>

+

<%= l(:label_issue_edit) %>

<%# html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %> <% html_title "#{@issue.tracker.name} #{@issue.source_from}'#'#{@issue.project_index}: #{@issue.subject}" %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 625c926fd..3e5fc22fe 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -402,7 +402,7 @@ en: label_project_all: All Projects label_project_latest: Latest projects - label_issue_plural: Issues Tracking + label_issue_view_all: View all issues label_issues_by: "Issues by %{value}" label_issue_added: Issue added diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml index 4d1c0e1a3..57ef221b0 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: "files uploaded successfully" + label_file_count: " files uploaded successfully" # # 项目托管平台 @@ -201,6 +201,15 @@ en: default_priority_immediate: Immediate field_hours: Hours + + + + + #问题更新 + label_issue_edit: Tracking + + + # # 项目托管平台 # diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index f08624854..6f952f135 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -237,7 +237,7 @@ zh: #问题更新 - + label_issue_edit: 问题跟踪 diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 9997cca57..dd3b5d395 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -383,7 +383,6 @@ zh: label_project_latest: 最近的项目 label_issue: 问题 - label_issue_plural: 问题跟踪 label_issue_view_all: 查看所有问题 label_issues_by: "按 %{value} 分组显示问题" label_issue_added: 问题已添加 diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 1d13cfc2f..2c10d28e4 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -25,7 +25,7 @@ function reload(fileSpan) { 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++;