Skip to content

Commit

Permalink
Merge branch 'pull/5594'
Browse files Browse the repository at this point in the history
  • Loading branch information
AntonKhorev committed Feb 3, 2025
2 parents 8f7f02b + b94d3b3 commit 3aa1b10
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion app/assets/stylesheets/common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ tr.turn {
/* Rules for the issues page */

.issues.issues-index {
td.reporter_users {
td.reporting_users {
max-width: 5rem;
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/views/issues/_page.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<th><%= t ".reports" %></th>
<th><%= t ".reported_item" %></th>
<th><%= t ".reported_user" %></th>
<th class="reporter_users"><%= t ".reporter_users" %></th>
<th class="reporting_users"><%= t ".reporting_users" %></th>
<th><%= t ".last_updated" %></th>
</tr>
</thead>
Expand All @@ -24,7 +24,7 @@
<td class="text-nowrap"><%= link_to t(".reports_count", :count => issue.reports_count), issue %></td>
<td><%= link_to reportable_title(issue.reportable), reportable_url(issue.reportable) %></td>
<td><%= link_to issue.reported_user.display_name, issue.reported_user if issue.reported_user %></td>
<td class="reporter_users text-truncate">
<td class="reporting_users text-truncate">
<% @unique_reporters[issue.id][:users].each do |reporter| %>
<%= link_to reporter.display_name, reporter, :class => "d-block text-truncate", :title => reporter.display_name %>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1512,7 +1512,7 @@ en:
reports: Reports
last_updated: Last Updated
last_updated_time_ago_user_html: "%{time_ago} by %{user}"
reporter_users: Reporter Users
reporting_users: Reporting Users
reports_count:
one: "%{count} Report"
other: "%{count} Reports"
Expand Down

0 comments on commit 3aa1b10

Please sign in to comment.