Merge branch 'update-ci-quote-messages' into 'master'

Update warnings for ci minute quotas

See merge request gitlab-org/gitlab!65818

ee/app/models/ci/minutes/notification.rb

@@ -79,14 +79,14 @@ module Ci
       end
 
       def exceeded_message
-        s_("Pipelines|Group %{namespace_name} has exceeded its pipeline minutes quota. " \
-          "Unless you buy additional pipeline minutes, no new jobs or pipelines in its projects will run.") %
+        s_("Pipelines|The %{namespace_name} namespace has exceeded its pipeline minutes quota. " \
+          "Buy additional pipeline minutes, or no new jobs or pipelines in its projects will run.") %
           { namespace_name: context.namespace_name }
       end
 
       def threshold_message
-        s_("Pipelines|Group %{namespace_name} has %{percentage}%% or less Shared Runner Pipeline" \
-          " minutes remaining.  Once it runs out, no new jobs or pipelines in its projects will run.") %
+        s_("Pipelines|The %{namespace_name} namespace has %{percentage}%% or less Shared Runner Pipeline" \
+          " minutes remaining. After it runs out, no new jobs or pipelines in its projects will run.") %
           {
             namespace_name: context.namespace_name,
             percentage: PERCENTAGES[stage]

ee/app/views/ci_minutes_usage_mailer/notify.html.haml

 %p
   - name_link = link_to @namespace.name, group_url(@namespace)
-  = html_escape(_('%{name_with_link} has run out of Shared Runner Pipeline minutes so no new jobs or pipelines in its projects will run.')) % { name_with_link: name_link.html_safe }
+  = html_escape(_('%{name_with_link} namespace has run out of Shared Runner Pipeline minutes. No new jobs or pipelines in its projects will run.')) % { name_with_link: name_link.html_safe }
 %p
-  = _('We recommend that you buy more Pipeline minutes to resume normal service.')
+  = _('We recommend that you buy additional Pipeline minutes to resume normal service.')
 %p
   #{link_to('Buy more Pipeline minutes →', EE::SUBSCRIPTIONS_MORE_MINUTES_URL)}

ee/app/views/ci_minutes_usage_mailer/notify.text.erb

-<%= _('%{name}(%{url}) has run out of Shared Runner Pipeline minutes so no new jobs or pipelines in its projects will run.') % { name: @namespace.name, url: group_url(@namespace) }%>
+<%= _('%{name}(%{url}) namespace has run out of Shared Runner Pipeline minutes so no new jobs or pipelines in its projects will run.') % { name: @namespace.name, url: group_url(@namespace) }%>
 
-<%= _('We recommend that you buy more Pipeline minutes to resume normal service.') %>
+<%= _('We recommend that you buy additional Pipeline minutes to resume normal service.') %>
 
 
 Buy more Pipeline minutes → <%= EE::SUBSCRIPTIONS_MORE_MINUTES_URL %>

ee/app/views/ci_minutes_usage_mailer/notify_limit.html.haml

 %p
   - name_link = link_to @namespace.name, group_url(@namespace)
-  = html_escape(_('%{name_with_link} has %{percent} or less Shared Runner Pipeline minutes remaining. Once it runs out, no new jobs or pipelines in its projects will run.')) % { name_with_link: name_link.html_safe, percent: "#{@percentage_of_available_mins}%" }
+  = html_escape(_('%{name_with_link} namespace has %{percent} or less Shared Runner Pipeline minutes remaining. Once it runs out, no new jobs or pipelines in its projects will run.')) % { name_with_link: name_link.html_safe, percent: "#{@percentage_of_available_mins}%" }
 %p
-  = _('We recommend that you buy more Pipeline minutes to avoid any interruption of service.')
+  = _('We recommend that you buy additional Pipeline minutes to avoid any interruption of service.')
 %p
   #{link_to('Buy more Pipeline minutes →', EE::SUBSCRIPTIONS_MORE_MINUTES_URL)}

ee/app/views/ci_minutes_usage_mailer/notify_limit.text.erb

-<%= _('%{name}(%{url}) has %{percent} or less Shared Runner Pipeline minutes remaining. Once it runs out, no new jobs or pipelines in its projects will run.') % { name: @namespace.name, url: group_url(@namespace), percent: "#{@percentage_of_available_mins}%" } %>
+<%= _('%{name}(%{url}) namespace has %{percent} or less Shared Runner Pipeline minutes remaining. After it runs out, no new jobs or pipelines in its projects will run.') % { name: @namespace.name, url: group_url(@namespace), percent: "#{@percentage_of_available_mins}%" } %>
 
-<%= _('We recommend that you buy more Pipeline minutes to avoid any interruption of service.') %>
+<%= _('We recommend that you buy additional Pipeline minutes to avoid any interruption of service.') %>
 
 Buy more Pipeline minutes → <%= EE::SUBSCRIPTIONS_MORE_MINUTES_URL %>

ee/spec/features/ci_shared_runner_warnings_spec.rb

@@ -29,8 +29,8 @@ RSpec.describe 'CI shared runner limits' do
     with_them do
       context "when there is a notification and minutes still exist", :js do
         let(:message) do
-          "Group #{group.name} has #{percent_threshold}% or less Shared Runner Pipeline minutes remaining. " \
-            "Once it runs out, no new jobs or pipelines in its projects will run."
+          "#{group.name} namespace has #{percent_threshold}% or less Shared Runner Pipeline minutes remaining. " \
+            "After it runs out, no new jobs or pipelines in its projects will run."
         end
 
         before do
@@ -61,8 +61,8 @@ RSpec.describe 'CI shared runner limits' do
     context 'when limit is exceeded', :js do
       let(:group) { create(:group, :with_used_build_minutes_limit) }
       let(:message) do
-        "Group #{group.name} has exceeded its pipeline minutes quota. " \
-          "Unless you buy additional pipeline minutes, no new jobs or pipelines in its projects will run."
+        "#{group.name} namespace has exceeded its pipeline minutes quota. " \
+          "Buy additional pipeline minutes, or no new jobs or pipelines in its projects will run."
       end
 
       it 'displays a warning message on project homepage' do
@@ -120,8 +120,8 @@ RSpec.describe 'CI shared runner limits' do
     with_them do
       context "when there is a notification and minutes still exist", :js do
         let(:message) do
-          "Group #{group.name} has #{percent_threshold}% or less Shared Runner Pipeline minutes remaining. " \
-            "Once it runs out, no new jobs or pipelines in its projects will run."
+          "#{group.name} namespace has #{percent_threshold}% or less Shared Runner Pipeline minutes remaining. " \
+            "After it runs out, no new jobs or pipelines in its projects will run."
         end
 
         before do
@@ -140,8 +140,8 @@ RSpec.describe 'CI shared runner limits' do
     context 'when limit is exceeded', :js do
       let(:group) { create(:group, :with_used_build_minutes_limit) }
       let(:message) do
-        "Group #{group.name} has exceeded its pipeline minutes quota. " \
-          "Unless you buy additional pipeline minutes, no new jobs or pipelines in its projects will run."
+        "#{group.name} namespace has exceeded its pipeline minutes quota. " \
+          "Buy additional pipeline minutes, or no new jobs or pipelines in its projects will run."
       end
 
       it 'displays a warning message on group information page' do

locale/gitlab.pot

@@ -720,10 +720,10 @@ msgstr ""
 msgid "%{mrText}, this issue will be closed automatically."
 msgstr ""
 
-msgid "%{name_with_link} has %{percent} or less Shared Runner Pipeline minutes remaining. Once it runs out, no new jobs or pipelines in its projects will run."
+msgid "%{name_with_link} namespace has %{percent} or less Shared Runner Pipeline minutes remaining. Once it runs out, no new jobs or pipelines in its projects will run."
 msgstr ""
 
-msgid "%{name_with_link} has run out of Shared Runner Pipeline minutes so no new jobs or pipelines in its projects will run."
+msgid "%{name_with_link} namespace has run out of Shared Runner Pipeline minutes. No new jobs or pipelines in its projects will run."
 msgstr ""
 
 msgid "%{name} %{status}"
@@ -747,10 +747,10 @@ msgstr ""
 msgid "%{name}'s avatar"
 msgstr ""
 
-msgid "%{name}(%{url}) has %{percent} or less Shared Runner Pipeline minutes remaining. Once it runs out, no new jobs or pipelines in its projects will run."
+msgid "%{name}(%{url}) namespace has %{percent} or less Shared Runner Pipeline minutes remaining. After it runs out, no new jobs or pipelines in its projects will run."
 msgstr ""
 
-msgid "%{name}(%{url}) has run out of Shared Runner Pipeline minutes so no new jobs or pipelines in its projects will run."
+msgid "%{name}(%{url}) namespace has run out of Shared Runner Pipeline minutes so no new jobs or pipelines in its projects will run."
 msgstr ""
 
 msgid "%{name}, confirm your email address now!"
@@ -24139,12 +24139,6 @@ msgstr ""
 msgid "Pipelines|GitLab CI/CD can automatically build, test, and deploy your code. Let GitLab take care of time consuming tasks, so you can spend more time creating."
 msgstr ""
 
-msgid "Pipelines|Group %{namespace_name} has %{percentage}%% or less Shared Runner Pipeline minutes remaining.  Once it runs out, no new jobs or pipelines in its projects will run."
-msgstr ""
-
-msgid "Pipelines|Group %{namespace_name} has exceeded its pipeline minutes quota. Unless you buy additional pipeline minutes, no new jobs or pipelines in its projects will run."
-msgstr ""
-
 msgid "Pipelines|If you are unsure, please ask a project maintainer to review it for you."
 msgstr ""
 
@@ -24199,6 +24193,12 @@ msgstr ""
 msgid "Pipelines|Something went wrong while cleaning runners cache."
 msgstr ""
 
+msgid "Pipelines|The %{namespace_name} namespace has %{percentage}%% or less Shared Runner Pipeline minutes remaining. After it runs out, no new jobs or pipelines in its projects will run."
+msgstr ""
+
+msgid "Pipelines|The %{namespace_name} namespace has exceeded its pipeline minutes quota. Buy additional pipeline minutes, or no new jobs or pipelines in its projects will run."
+msgstr ""
+
 msgid "Pipelines|The CI configuration was not loaded, please try again."
 msgstr ""
 
@@ -36582,10 +36582,10 @@ msgstr ""
 msgid "We recommend leaving all SAST analyzers enabled"
 msgstr ""
 
-msgid "We recommend that you buy more Pipeline minutes to avoid any interruption of service."
+msgid "We recommend that you buy additional Pipeline minutes to avoid any interruption of service."
 msgstr ""
 
-msgid "We recommend that you buy more Pipeline minutes to resume normal service."
+msgid "We recommend that you buy additional Pipeline minutes to resume normal service."
 msgstr ""
 
 msgid "We sent you an email with reset password instructions"