jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

This commit is contained in:
whimlex 2015-04-17 14:51:27 +08:00
parent af28461cf0 17838acddb
commit 92bf340786
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/versions_controller.rb
View File

@ -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) }

2
config/locales/zh.yml
View File

@ -1055,7 +1055,7 @@ zh:
label_copy_attachments: 复制附件
label_item_position: "%{position}/%{count}"
label_completed_versions: 已完成的版本
text_project_identifier_info: 仅小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用。<br />一旦保存，标识无法修改。
text_project_identifier_info: 仅小写字母（a-z）、数字、破折号（-）和下划线（_）可以使用。一旦保存，标识无法修改。
field_multiple: 多重取值
setting_commit_cross_project_ref: 允许引用/修复所有其他项目的问题
text_issue_conflict_resolution_add_notes: 添加说明并取消我的其他变更处理。