Merge branch '321906-f-u-f-51003-improve-the-trial-status-popover-copy' into 'master'

Improve the trial status popover copy

See merge request gitlab-org/gitlab!55894

ee/app/assets/javascripts/contextual_sidebar/components/trial_status_popover.vue

@@ -59,15 +59,15 @@ export default {
     compareAllButtonTitle: s__('Trials|Compare all plans'),
     popoverTitle: s__('Trials|Hey there'),
     popoverContent: s__(`Trials|Your trial ends on
-      %{boldStart}%{trialEndDate}%{boldEnd}. We hope you are enjoying GitLab
-      %{planName}. To continue using GitLab %{planName} after your trial ends,
-      you will need to buy a subscription. You can also choose GitLab Premium
-      if its features are sufficient for your needs.`),
+      %{boldStart}%{trialEndDate}%{boldEnd}. We hope you’re enjoying the
+      features of GitLab %{planName}. To keep those features after your trial
+      ends, you’ll need to buy a subscription. (You can also choose GitLab
+      Premium if it meets your needs.)`),
     upgradeButtonTitle: s__('Trials|Upgrade %{groupName} to %{planName}'),
   },
   computed: {
     formattedTrialEndDate() {
-      return formatDate(this.trialEndDate, 'yyyy-mm-dd');
+      return formatDate(this.trialEndDate, 'mmmm d');
     },
   },
   created() {

ee/spec/frontend/contextual_sidebar/__snapshots__/group_trial_status_popover_spec.js.snap

@@ -11,7 +11,7 @@ exports[`TrialStatusPopover component matches the snapshot 1`] = `
 >
    
   <gl-sprintf-stub
-    message="Your trial ends on %{boldStart}%{trialEndDate}%{boldEnd}. We hope you are enjoying GitLab %{planName}. To continue using GitLab %{planName} after your trial ends, you will need to buy a subscription. You can also choose GitLab Premium if its features are sufficient for your needs."
+    message="Your trial ends on %{boldStart}%{trialEndDate}%{boldEnd}. We hope you’re enjoying the features of GitLab %{planName}. To keep those features after your trial ends, you’ll need to buy a subscription. (You can also choose GitLab Premium if it meets your needs.)"
   />
    
   <div

locale/gitlab.pot

@@ -31923,7 +31923,7 @@ msgstr ""
 msgid "Trials|You won't get a free trial right now but you can always resume this process by clicking on your avatar and choosing 'Start a free trial'"
 msgstr ""
 
-msgid "Trials|Your trial ends on %{boldStart}%{trialEndDate}%{boldEnd}. We hope you are enjoying GitLab %{planName}. To continue using GitLab %{planName} after your trial ends, you will need to buy a subscription. You can also choose GitLab Premium if its features are sufficient for your needs."
+msgid "Trials|Your trial ends on %{boldStart}%{trialEndDate}%{boldEnd}. We hope you’re enjoying the features of GitLab %{planName}. To keep those features after your trial ends, you’ll need to buy a subscription. (You can also choose GitLab Premium if it meets your needs.)"
 msgstr ""
 
 msgid "Trial|Company name"