From e44f856b53fcba5b44af37126579a034ef654676 Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 14 Mar 2018 12:21:52 +0800
Subject: [PATCH] Combine category and reporting user

---
 app/views/issues/_reports.html.erb | 6 +-----
 config/locales/en.yml              | 3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/views/issues/_reports.html.erb b/app/views/issues/_reports.html.erb
index 5303ae0c5..01c34efe1 100644
--- 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 297bebbcf..c508f8e55 100644
--- 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'
-- 
2.43.2