Commit afc244f1 authored by Amy Qualls's avatar Amy Qualls

Revise very wordy expiry messages

These messages came up in a search for UI strings related to merge
requests. They're really wordy, and we can make them better.
parent 4099796d
......@@ -112,11 +112,11 @@ module Gitlab
def expiring_features_message
case plan_name
when 'Gold', 'Ultimate'
_('After that, you will not be able to use merge approvals or epics as well as many security features.')
_("After it expires, you can't use merge approvals, epics, or many security features.")
when 'Premium', 'Silver'
_('After that, you will not be able to use merge approvals or epics as well as many other features.')
_("After it expires, you can't use merge approvals, epics, or many other features.")
else
_('After that, you will not be able to use merge approvals or code quality as well as many other features.')
_("After it expires, you can't use merge approvals, code quality, or many other features.")
end
end
......
......@@ -226,7 +226,7 @@ RSpec.describe Gitlab::ExpiringSubscriptionMessage, :saas do
it 'has plan specific messaging' do
allow(subscribable).to receive(:plan).and_return(plan)
expect(subject).to include("Your #{plan.capitalize} subscription for No Limit Records will expire on 2020-03-09. After that, you will not be able to use merge approvals or epics as well as many security features.")
expect(subject).to include("Your #{plan.capitalize} subscription for No Limit Records will expire on 2020-03-09. After it expires, you can't use merge approvals, epics, or many security features.")
end
end
......@@ -236,14 +236,14 @@ RSpec.describe Gitlab::ExpiringSubscriptionMessage, :saas do
it 'has plan specific messaging' do
allow(subscribable).to receive(:plan).and_return('premium')
expect(subject).to include('Your Premium subscription for No Limit Records will expire on 2020-03-09. After that, you will not be able to use merge approvals or epics as well as many other features.')
expect(subject).to include("Your Premium subscription for No Limit Records will expire on 2020-03-09. After it expires, you can't use merge approvals, epics, or many other features.")
end
end
it 'has bronze plan specific messaging' do
allow(subscribable).to receive(:plan).and_return('bronze')
expect(subject).to include('Your Bronze subscription for No Limit Records will expire on 2020-03-09. After that, you will not be able to use merge approvals or code quality as well as many other features.')
expect(subject).to include("Your Bronze subscription for No Limit Records will expire on 2020-03-09. After it expires, you can't use merge approvals, code quality, or many other features.")
end
context 'is auto_renew nil' do
......
......@@ -2925,13 +2925,13 @@ msgstr ""
msgid "After a successful password update, you will be redirected to the login page where you can log in with your new password."
msgstr ""
msgid "After that, you will not be able to use merge approvals or code quality as well as many other features."
msgid "After it expires, you can't use merge approvals, code quality, or many other features."
msgstr ""
msgid "After that, you will not be able to use merge approvals or epics as well as many other features."
msgid "After it expires, you can't use merge approvals, epics, or many other features."
msgstr ""
msgid "After that, you will not be able to use merge approvals or epics as well as many security features."
msgid "After it expires, you can't use merge approvals, epics, or many security features."
msgstr ""
msgid "After you've reviewed these contribution guidelines, you'll be all set to"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment