Merge branch 'change-credit-card-validation-texts' into 'master'

Change texts about credit card verification

See merge request gitlab-org/gitlab!77111

ee/app/assets/javascripts/billings/components/account_verification_modal.vue

@@ -7,7 +7,7 @@ const IFRAME_MINIMUM_HEIGHT = 350;
 const i18n = Object.freeze({
   title: s__('Billings|Validate user account'),
   description: s__(`
-Billings|To use free pipeline minutes on shared runners, you’ll need to validate your account with a credit or debit card. This is required to discourage and reduce abuse on GitLab infrastructure.
+Billings|To use free CI/CD minutes on shared runners, you’ll need to validate your account with a credit card. This is required to discourage and reduce abuse on GitLab infrastructure.
 %{strongStart}GitLab will not charge your card, it will only be used for validation.%{strongEnd}`),
   actions: {
     primary: {

ee/app/assets/javascripts/billings/components/cc_validation_required_alert.vue

@@ -6,14 +6,14 @@ import AccountVerificationModal from './account_verification_modal.vue';
 
 const i18n = {
   successAlert: {
-    title: s__('Billings|User successfully validated'),
+    title: s__('Billings|Your account has been validated'),
     text: s__(
-      'Billings|Your user account has been successfully validated. You can now use free pipeline minutes.',
+      "Billings|You'll now be able to take advantage of free CI/CD minutes on shared runners.",
     ),
   },
   dangerAlert: {
     title: s__('Billings|User validation required'),
-    text: s__(`Billings|To use free pipeline minutes on shared runners, you’ll need to validate your account with a credit or debit card. If you prefer not to provide one, you can run pipelines by bringing your own runners and disabling shared runners for your project.
+    text: s__(`Billings|To use free CI/CD minutes on shared runners, you’ll need to validate your account with a credit card. If you prefer not to provide one, you can run pipelines by bringing your own runners and disabling shared runners for your project.
     This is required to discourage and reduce abuse on GitLab infrastructure.
     %{strongStart}GitLab will not charge your card, it will only be used for validation.%{strongEnd} %{linkStart}Learn more%{linkEnd}.`),
     primaryButtonText: s__('Billings|Validate account'),

ee/app/assets/javascripts/billings/verification_reminder/constants.js

@@ -11,16 +11,16 @@ export const SUCCESSFUL_VERIFICATION_EVENT = 'successful_verification';
 export const I18N = {
   warningAlert: {
     title: s__(
-      'VerificationReminder|Pipeline failing? To keep GitLab spam and abuse free we ask that you verify your identity with a valid payment method.',
+      'VerificationReminder|Pipeline failing? To keep GitLab spam and abuse free we ask that you verify your identity.',
     ),
     message: s__(
-      'VerificationReminder|Until then, free pipeline minutes on shared runners are unavailable. %{validateLinkStart}Validate your account%{validateLinkEnd} or %{docsLinkStart}use your own runners%{docsLinkEnd}.',
+      'VerificationReminder|Until then, shared runners will be unavailable. %{validateLinkStart}Validate your account%{validateLinkEnd} or %{docsLinkStart}use your own runners%{docsLinkEnd}.',
     ),
   },
   successAlert: {
-    title: s__('VerificationReminder|Your account has been validated.'),
+    title: s__('VerificationReminder|Your account has been validated'),
     message: s__(
-      'VerificationReminder|You’ll now be able to take advantage of free pipeline minutes on shared runners.',
+      'VerificationReminder|You’ll now be able to take advantage of free CI/CD minutes on shared runners.',
     ),
   },
 };

ee/lib/gitlab/email/message/account_validation.rb

@@ -19,16 +19,16 @@ module Gitlab
         end
 
         def title
-          s_("AccountValidation|Looks like you’ll need to validate your account to use free pipeline minutes")
+          s_("AccountValidation|Looks like you’ll need to validate your account to use free CI/CD minutes")
         end
 
         def body_line1
-          s_("AccountValidation|In order to use free pipeline minutes on shared runners, you'll need to validate your account with a credit or debit card. If you prefer not to provide one, you can run pipelines by bringing your own runners and disabling shared runners for your project.")
+          s_("AccountValidation|In order to use free CI/CD minutes on shared runners, you'll need to validate your account using one of our verification options. If you prefer not to, you can run pipelines by bringing your own runners and disabling shared runners for your project.")
         end
 
         def body_line2
           format_options = strong_options.merge({ learn_more_link: learn_more_link })
-          s_("AccountValidation|This is required to discourage and reduce the abuse on GitLab infrastructure. %{strong_start}GitLab will not charge or store your card, it will only be used for validation.%{strong_end} %{learn_more_link}").html_safe % format_options
+          s_("AccountValidation|Verification is required to discourage and reduce the abuse on GitLab infrastructure. If you verify with a credit or debit card, %{strong_start}GitLab will not charge your card, it will only be used for validation.%{strong_end} %{learn_more_link}").html_safe % format_options
         end
 
         def cta_text

ee/spec/frontend/billings/components/account_verification_modal_spec.js

@@ -35,7 +35,7 @@ describe('Account verification modal', () => {
     });
 
     it('renders the description', () => {
-      expect(wrapper.find('p').text()).toContain('To use free pipeline minutes');
+      expect(wrapper.find('p').text()).toContain('To use free CI/CD minutes');
     });
   });
 

ee/spec/frontend/billings/components/cc_validation_required_alert_spec.js

@@ -54,7 +54,7 @@ describe('CreditCardValidationRequiredAlert', () => {
   });
 
   it('renders description', () => {
-    expect(findGlAlert().text()).toContain('To use free pipeline minutes');
+    expect(findGlAlert().text()).toContain('To use free CI/CD minutes');
   });
 
   it('renders danger alert', () => {

ee/spec/lib/gitlab/email/message/account_validation_spec.rb

@@ -11,11 +11,11 @@ RSpec.describe Gitlab::Email::Message::AccountValidation do
 
   it 'contains the correct message', :aggregate_failures do
     expect(message.subject_line).to eq 'Fix your pipelines by validating your account'
-    expect(message.title).to eq "Looks like you’ll need to validate your account to use free pipeline minutes"
-    expect(message.body_line1).to eq "In order to use free pipeline minutes on shared runners, you'll need to validate your account with a credit or debit card. If you prefer not to provide one, you can run pipelines by bringing your own runners and disabling shared runners for your project."
+    expect(message.title).to eq "Looks like you’ll need to validate your account to use free CI/CD minutes"
+    expect(message.body_line1).to eq "In order to use free CI/CD minutes on shared runners, you'll need to validate your account using one of our verification options. If you prefer not to, you can run pipelines by bringing your own runners and disabling shared runners for your project."
     expect(message.body_line2).to include(
-      'This is required to discourage and reduce the abuse on GitLab infrastructure.',
-      '<b>GitLab will not charge or store your card, it will only be used for validation.</b>',
+      'Verification is required to discourage and reduce the abuse on GitLab infrastructure.',
+      'If you verify with a credit or debit card, <b>GitLab will not charge your card, it will only be used for validation.</b>',
       '<a href="https://about.gitlab.com/blog/2021/05/17/prevent-crypto-mining-abuse/">Learn more.</a>'
     )
     expect(message.cta_text).to eq 'Validate your account'

locale/gitlab.pot

@@ -1907,19 +1907,19 @@ msgstr ""
 msgid "AccountValidation|If you no longer wish to receive marketing emails from us,"
 msgstr ""
 
-msgid "AccountValidation|In order to use free pipeline minutes on shared runners, you'll need to validate your account with a credit or debit card. If you prefer not to provide one, you can run pipelines by bringing your own runners and disabling shared runners for your project."
+msgid "AccountValidation|In order to use free CI/CD minutes on shared runners, you'll need to validate your account using one of our verification options. If you prefer not to, you can run pipelines by bringing your own runners and disabling shared runners for your project."
 msgstr ""
 
 msgid "AccountValidation|Learn more."
 msgstr ""
 
-msgid "AccountValidation|Looks like you’ll need to validate your account to use free pipeline minutes"
+msgid "AccountValidation|Looks like you’ll need to validate your account to use free CI/CD minutes"
 msgstr ""
 
-msgid "AccountValidation|This is required to discourage and reduce the abuse on GitLab infrastructure. %{strong_start}GitLab will not charge or store your card, it will only be used for validation.%{strong_end} %{learn_more_link}"
+msgid "AccountValidation|Validate your account"
 msgstr ""
 
-msgid "AccountValidation|Validate your account"
+msgid "AccountValidation|Verification is required to discourage and reduce the abuse on GitLab infrastructure. If you verify with a credit or debit card, %{strong_start}GitLab will not charge your card, it will only be used for validation.%{strong_end} %{learn_more_link}"
 msgstr ""
 
 msgid "AccountValidation|unsubscribe"
@@ -5508,13 +5508,10 @@ msgstr ""
 msgid "Billings|Shared runners cannot be enabled until a valid credit card is on file."
 msgstr ""
 
-msgid "Billings|To use free pipeline minutes on shared runners, you’ll need to validate your account with a credit or debit card. If you prefer not to provide one, you can run pipelines by bringing your own runners and disabling shared runners for your project. This is required to discourage and reduce abuse on GitLab infrastructure. %{strongStart}GitLab will not charge your card, it will only be used for validation.%{strongEnd} %{linkStart}Learn more%{linkEnd}."
-msgstr ""
-
-msgid "Billings|To use free pipeline minutes on shared runners, you’ll need to validate your account with a credit or debit card. This is required to discourage and reduce abuse on GitLab infrastructure. %{strongStart}GitLab will not charge your card, it will only be used for validation.%{strongEnd}"
+msgid "Billings|To use free CI/CD minutes on shared runners, you’ll need to validate your account with a credit card. If you prefer not to provide one, you can run pipelines by bringing your own runners and disabling shared runners for your project. This is required to discourage and reduce abuse on GitLab infrastructure. %{strongStart}GitLab will not charge your card, it will only be used for validation.%{strongEnd} %{linkStart}Learn more%{linkEnd}."
 msgstr ""
 
-msgid "Billings|User successfully validated"
+msgid "Billings|To use free CI/CD minutes on shared runners, you’ll need to validate your account with a credit card. This is required to discourage and reduce abuse on GitLab infrastructure. %{strongStart}GitLab will not charge your card, it will only be used for validation.%{strongEnd}"
 msgstr ""
 
 msgid "Billings|User validation required"
@@ -5526,7 +5523,10 @@ msgstr ""
 msgid "Billings|Validate user account"
 msgstr ""
 
-msgid "Billings|Your user account has been successfully validated. You can now use free pipeline minutes."
+msgid "Billings|You'll now be able to take advantage of free CI/CD minutes on shared runners."
+msgstr ""
+
+msgid "Billings|Your account has been validated"
 msgstr ""
 
 msgid "Billing|An email address is only visible for users with public emails."
@@ -38837,16 +38837,16 @@ msgstr ""
 msgid "Verification status"
 msgstr ""
 
-msgid "VerificationReminder|Pipeline failing? To keep GitLab spam and abuse free we ask that you verify your identity with a valid payment method."
+msgid "VerificationReminder|Pipeline failing? To keep GitLab spam and abuse free we ask that you verify your identity."
 msgstr ""
 
-msgid "VerificationReminder|Until then, free pipeline minutes on shared runners are unavailable. %{validateLinkStart}Validate your account%{validateLinkEnd} or %{docsLinkStart}use your own runners%{docsLinkEnd}."
+msgid "VerificationReminder|Until then, shared runners will be unavailable. %{validateLinkStart}Validate your account%{validateLinkEnd} or %{docsLinkStart}use your own runners%{docsLinkEnd}."
 msgstr ""
 
-msgid "VerificationReminder|Your account has been validated."
+msgid "VerificationReminder|Your account has been validated"
 msgstr ""
 
-msgid "VerificationReminder|You’ll now be able to take advantage of free pipeline minutes on shared runners."
+msgid "VerificationReminder|You’ll now be able to take advantage of free CI/CD minutes on shared runners."
 msgstr ""
 
 msgid "Verified"