Combine category and reporting user

diff --git a/app/views/issues/_reports.html.erb b/app/views/issues/_reports.html.erb
index 5303ae0c5ea3e408f82712f1bd8f9a147a4bcff1..01c34efe1a5631de6e650946c63f3bfc198864ad 100644 (file)
--- a/app/views/issues/_reports.html.erb
+++ b/app/views/issues/_reports.html.erb
@@ -3,15 +3,11 @@
     <div style="float:left">
       <%= link_to user_thumbnail(report.user), :controller => :user, :action =>:view, :display_name => report.user.display_name %>
     </div>
-    <%= t(".reported_by_html", :user_name => report.user.display_name, :user_url => url_for(:controller => :user, :action => :view, :display_name => report.user.display_name)) %> <br/>
+    <%= t(".reported_by_html", :category => report.category, :user_name => report.user.display_name, :user_url => url_for(:controller => :user, :action => :view, :display_name => report.user.display_name)) %> <br/>
     <span class="deemphasize">
       <%= t(".updated_at", :datetime => l(report.updated_at.to_datetime, :format => :friendly)) %>
     </span>
     <br/>
-    <span class="deemphasize">
-      <%= t ".category", category: report.category %>
-    </span>
-    <br/>
     <%= report.details %>
     <br/>
   </div>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 297bebbcf9f538d561ca79113754033113b25446..c508f8e553604fbe942a0cdbf20b0d6f60ce2e9f 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1026,9 +1026,8 @@ en:
     comments:
       created_at: "On %{datetime}"
     reports:
-      category: "Category: %{category}"
       updated_at: "On %{datetime}"
-      reported_by_html: "Reported by <a href=\"%{user_url}\">%{user_name}</a>"
+      reported_by_html: "Reported as %{category} by <a href=\"%{user_url}\">%{user_name}</a>"
     resolved: Issue status has been set to 'Resolved'
     ignored: Issue status has been set to 'Ignored'
     reopened: Issue status has been set to 'Open'