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

Merge branch 'develop' into szzh

This commit is contained in:
huang 2015-07-26 14:37:39 +08:00
parent 59bd915cf6 f37cbd3e0d
commit 1c6915384e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/repositories_controller.rb
View File

@ -658,7 +658,7 @@ update
) )
graph.add_data( graph.add_data(
:data => commits_data, :data => commits_data,
:title => l(:label_revision_plural) :title => l(:label_revision_commit_count)
) )
graph.burn graph.burn
end end
@ -694,7 +694,7 @@ update
) )
graph.add_data( graph.add_data(
:data => commits_data, :data => commits_data,
:title => l(:label_revision_plural) :title => l(:label_revision_commit_count)
) )
graph.burn graph.burn
end end

1
config/locales/zh.yml
View File

@ -670,6 +670,7 @@ zh:
label_revision: 修订 label_revision: 修订
label_revision_plural: 修订 label_revision_plural: 修订
lable_revision_code_count: 代码量 lable_revision_code_count: 代码量
label_revision_commit_count: 提交次数
label_revision_id: 修订 %{value} label_revision_id: 修订 %{value}
label_associated_revisions: 相关修订版本 label_associated_revisions: 相关修订版本
label_added: 已添加 label_added: 已添加