Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

2013-12-11 22:19:58 +08:00 · 2013-12-11 22:19:58 +08:00 · ca2f5c6705
parent cefddb635a f23451e4bb
commit ca2f5c6705
1 changed files with 3 additions and 1 deletions
--- a/app/helpers/welcome_helper.rb
+++ b/app/helpers/welcome_helper.rb
@ -183,7 +183,7 @@ module WelcomeHelper
      '附件'
    when 'message'
      '主题'
-    when 'reply'
+    when 'Reply'
      '回复'
    when 'bid'
      '作业'
@ -191,6 +191,8 @@ module WelcomeHelper
      '主题'
    when 'document'
      '文件'
+    when 'changeset'
+      '版本库'
    else
    event.event_type
    end