From 54f8079ba621522ecfd5c1b80a00d9fe862dba32 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 17 Apr 2015 14:34:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89html=E7=AC=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/zh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/zh.yml b/config/locales/zh.yml index a34ab933e..02e4da65e 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1055,7 +1055,7 @@ zh: label_copy_attachments: 复制附件 label_item_position: "%{position}/%{count}" label_completed_versions: 已完成的版本 - text_project_identifier_info: 仅小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用。
一旦保存，标识无法修改。 + text_project_identifier_info: 仅小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用。一旦保存，标识无法修改。 field_multiple: 多重取值 setting_commit_cross_project_ref: 允许引用/修复所有其他项目的问题 text_issue_conflict_resolution_add_notes: 添加说明并取消我的其他变更处理。 From 17838acddb0140dc092f729991cd974ff4eeab0f Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 17 Apr 2015 14:39:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=95=B0=E7=BB=84=20flatten?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/versions_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index 2389284b8..fe7bcf0be 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -116,7 +116,7 @@ class VersionsController < ApplicationController end else respond_to do |format| - format.html { flash[:error] = @version.errors.full_messages.to_s + format.html { flash[:error] = @version.errors.full_messages.flatten.to_s redirect_to settings_project_url(@project, :tab => 'versions') } format.js { render :action => 'new' } format.api { render_validation_errors(@version) }