maxmustermann/gitlab
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
Revise very wordy expiry messages

See merge request gitlab-org/gitlab!73999
This commit is contained in:
Matthias Käppler 2021-11-10 12:57:51 +00:00
parent 5cce724984 afc244f18f
commit 96205e5f25
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ee/lib/gitlab/expiring_subscription_message.rb
View file

@ -112,11 +112,11 @@ def namespace_expiring_message
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

6
ee/spec/lib/gitlab/expiring_subscription_message_spec.rb
View file

@ -226,7 +226,7 @@
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 @@
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

6
locale/gitlab.pot
View file

@ -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."
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"