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

app/views/attachments/file.html.erb

@@ -6,8 +6,9 @@
 <p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
    <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span>&nbsp&nbsp&nbsp
    <span class="size">
-     <% if @attachment!=nil&&@attachment.container_type == 'Document'&&User.current.allowed_to?({:controller => 'code_review', :action => 'update_diff_view'}, @attachment.project) %>
-          <%=    link = link_to(l(:button_add), {:controller => 'code_review',
+     <!-- &&(@attachment.container_type == 'Document' || @attachment.container_type == 'WikiPage') -->
+     <% if @attachment!=nil&&User.current.allowed_to?({:controller => 'code_review', :action => 'update_diff_view'}, @attachment.project) %>
+          <%= l(:review_assignments)+":" %><%=    link = link_to(l(:button_add), {:controller => 'code_review',
                                           :action => 'assign', :action_type => 'attachment',
                                           :id=>@attachment.project,
                                           :change_id => '', :attachment_id => @attachment.id,

config/locales/en.yml

@@ -1809,3 +1809,4 @@ en:
   notice_account_invalid_creditentials_new: You have not to the mailbox activation
   lable_unknow_type: Unknow type
   lable_score_less_than_zero: Score less than 0, revised to 0
+  review_assignments: review assignments

config/locales/zh.yml

@@ -2116,4 +2116,5 @@ zh:
   lable_forums_max_length: 贴吧描述最大长度为65535个字符
   lable_unknow_type: 未知类型
   lable_score_less_than_zero: 得分小于0，修正为0
+  review_assignments: 评审任务