Merge branch '34717-update-expired-trial-copy' into 'master'

Resolve "Update expired trial copy"

Closes #34717

See merge request gitlab-org/gitlab!18962

changelogs/unreleased/34717-update-expired-trial-copy.yml

+---
+title: Update expired trial status copy
+merge_request: 18962
+author:
+type: changed

ee/app/views/shared/billings/_trial_status.html.haml

 - faq_link          = link_to s_("BillingPlans|frequently asked questions"), "https://about.gitlab.com/gitlab-com/#faq"
 - pricing_page_link = link_to s_("BillingPlans|Pricing page"), "https://about.gitlab.com/pricing"
-- features_link     = link_to s_("BillingPlans|features"), "https://about.gitlab.com/features"
-- learn_more_text = s_("BillingPlans|Learn more about each plan by reading our %{faq_link}.").html_safe % { faq_link: faq_link }
+
 
 - if namespace.eligible_for_trial?
   = s_("BillingPlans|Learn more about each plan by reading our %{faq_link}, or start a free 30-day trial of GitLab.com Gold.").html_safe % { faq_link: faq_link }
 - elsif namespace.trial_active?
-  = s_("BillingPlans|Your GitLab.com trial will <strong>expire after %{expiration_date}</strong>. You can learn more about GitLab.com Gold by reading about our %{features_link}.").html_safe % { expiration_date: namespace.trial_ends_on, features_link: features_link }
+  = s_("BillingPlans|Your GitLab.com Gold trial will <strong>expire after %{expiration_date}</strong>. You can retain access to the Gold features by upgrading below.").html_safe % { expiration_date: namespace.trial_ends_on }
 - elsif namespace.trial_expired?
-  = s_("BillingPlans|Your GitLab.com trial expired on %{expiration_date}. %{learn_more_text}").html_safe % { expiration_date: namespace.trial_ends_on, learn_more_text: learn_more_text }
+  = s_("BillingPlans|Your GitLab.com Gold trial expired on %{expiration_date}. You can restore access to the Gold features at any time by upgrading below.").html_safe % { expiration_date: namespace.trial_ends_on }
 - else
   = s_("BillingPlans|Learn more about each plan by visiting our %{pricing_page_link}.").html_safe % { pricing_page_link: pricing_page_link }

ee/spec/views/shared/billings/_trial_status.html.haml_spec.rb

@@ -33,7 +33,7 @@ describe 'shared/billings/_trial_status.html.haml' do
 
     it 'displays expiry date' do
       render 'shared/billings/trial_status', namespace: group
-      expect(rendered).to have_content("Your GitLab.com trial will expire after #{trial_ends_on}")
+      expect(rendered).to have_content("Your GitLab.com Gold trial will expire after #{trial_ends_on}")
     end
   end
 
@@ -43,7 +43,7 @@ describe 'shared/billings/_trial_status.html.haml' do
 
     it 'displays the date is expired' do
       render 'shared/billings/trial_status', namespace: group
-      expect(rendered).to have_content("Your GitLab.com trial expired on #{trial_ends_on}")
+      expect(rendered).to have_content("Your GitLab.com Gold trial expired on #{trial_ends_on}")
     end
   end
 

locale/gitlab.pot

@@ -2421,9 +2421,6 @@ msgstr ""
 msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}, or start a free 30-day trial of GitLab.com Gold."
 msgstr ""
 
-msgid "BillingPlans|Learn more about each plan by reading our %{faq_link}."
-msgstr ""
-
 msgid "BillingPlans|Learn more about each plan by visiting our %{pricing_page_link}."
 msgstr ""
 
@@ -2442,18 +2439,15 @@ msgstr ""
 msgid "BillingPlans|To manage the plan for this group, visit the billing section of %{parent_billing_page_link}."
 msgstr ""
 
-msgid "BillingPlans|Your GitLab.com trial expired on %{expiration_date}. %{learn_more_text}"
+msgid "BillingPlans|Your GitLab.com Gold trial expired on %{expiration_date}. You can restore access to the Gold features at any time by upgrading below."
 msgstr ""
 
-msgid "BillingPlans|Your GitLab.com trial will <strong>expire after %{expiration_date}</strong>. You can learn more about GitLab.com Gold by reading about our %{features_link}."
+msgid "BillingPlans|Your GitLab.com Gold trial will <strong>expire after %{expiration_date}</strong>. You can retain access to the Gold features by upgrading below."
 msgstr ""
 
 msgid "BillingPlans|billed annually at %{price_per_year}"
 msgstr ""
 
-msgid "BillingPlans|features"
-msgstr ""
-
 msgid "BillingPlans|frequently asked questions"
 msgstr ""