Commit 96205e5f authored by Matthias Käppler's avatar Matthias Käppler

Merge branch 'aqualls-revise-expiry-message' into 'master'

Revise very wordy expiry messages

See merge request gitlab-org/gitlab!73999
parents 5cce7249 afc244f1
...@@ -112,11 +112,11 @@ module Gitlab ...@@ -112,11 +112,11 @@ module Gitlab
def expiring_features_message def expiring_features_message
case plan_name case plan_name
when 'Gold', 'Ultimate' 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' 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 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
end end
......
...@@ -226,7 +226,7 @@ RSpec.describe Gitlab::ExpiringSubscriptionMessage, :saas do ...@@ -226,7 +226,7 @@ RSpec.describe Gitlab::ExpiringSubscriptionMessage, :saas do
it 'has plan specific messaging' do it 'has plan specific messaging' do
allow(subscribable).to receive(:plan).and_return(plan) 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
end end
...@@ -236,14 +236,14 @@ RSpec.describe Gitlab::ExpiringSubscriptionMessage, :saas do ...@@ -236,14 +236,14 @@ RSpec.describe Gitlab::ExpiringSubscriptionMessage, :saas do
it 'has plan specific messaging' do it 'has plan specific messaging' do
allow(subscribable).to receive(:plan).and_return('premium') 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
end end
it 'has bronze plan specific messaging' do it 'has bronze plan specific messaging' do
allow(subscribable).to receive(:plan).and_return('bronze') 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 end
context 'is auto_renew nil' do context 'is auto_renew nil' do
......
...@@ -2928,13 +2928,13 @@ msgstr "" ...@@ -2928,13 +2928,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." msgid "After a successful password update, you will be redirected to the login page where you can log in with your new password."
msgstr "" 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 "" 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 "" 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 "" msgstr ""
msgid "After you've reviewed these contribution guidelines, you'll be all set to" 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