Browse Source

Account for singular user numbers

pull/2602/head
Kat 2 years ago
parent
commit
b2c8c1dd79
  1. 5
      app/helpers/merge_requests_helper.rb
  2. 2
      app/views/merge_requests/user_outcomes.html.erb

5
app/helpers/merge_requests_helper.rb

@ -102,4 +102,9 @@ module MergeRequestsHelper
count_text = organisation.users.count == 1 ? "1 #{organisation.name} user" : "all #{organisation.users.count} #{organisation.name} users" count_text = organisation.users.count == 1 ? "1 #{organisation.name} user" : "all #{organisation.users.count} #{organisation.name} users"
govuk_link_to "View #{count_text} (opens in a new tab)", users_organisation_path(organisation), target: "_blank" govuk_link_to "View #{count_text} (opens in a new tab)", users_organisation_path(organisation), target: "_blank"
end end
def total_users_after_merge_text(merge_request)
count = merge_request.total_visible_users_after_merge
"#{"#{count} user".pluralize(count)} after merge"
end
end end

2
app/views/merge_requests/user_outcomes.html.erb

@ -10,7 +10,7 @@
</h1> </h1>
<% unless @merge_request.status == "request_merged" || @merge_request.status == "processing" %> <% unless @merge_request.status == "request_merged" || @merge_request.status == "processing" %>
<h2 class="govuk-heading-m"><%= @merge_request.total_visible_users_after_merge %> users after merge</h2> <h2 class="govuk-heading-m"><%= total_users_after_merge_text(@merge_request) %></h2>
<p class="govuk-body"> <p class="govuk-body">
<%= merging_organisations_without_users_text(@merge_request.organisations_without_users) %> <%= merging_organisations_without_users_text(@merge_request.organisations_without_users) %>
</p> </p>

Loading…
Cancel
Save