Commit 7d70617b authored by Michael Karampalas's avatar Michael Karampalas Committed by Jay Swain

Update expiring_subscription_message remove "to"

parent 29297036
---
title: Remove extra to from subscription expiration message
merge_request: 44769
author:
type: fixed
...@@ -87,7 +87,7 @@ module Gitlab ...@@ -87,7 +87,7 @@ module Gitlab
def expiring_message def expiring_message
return namespace_expiring_message if namespace return namespace_expiring_message if namespace
_('Your %{strong}%{plan_name}%{strong_close} subscription will expire on %{strong}%{expires_on}%{strong_close}. After that, you will not to be able to create issues or merge requests as well as many other features.') % { expires_on: expires_at_or_cutoff_at.strftime("%Y-%m-%d"), plan_name: plan_name, strong: strong, strong_close: strong_close } _('Your %{strong}%{plan_name}%{strong_close} subscription will expire on %{strong}%{expires_on}%{strong_close}. After that, you will not be able to create issues or merge requests as well as many other features.') % { expires_on: expires_at_or_cutoff_at.strftime("%Y-%m-%d"), plan_name: plan_name, strong: strong, strong_close: strong_close }
end end
def namespace_expiring_message def namespace_expiring_message
...@@ -103,11 +103,11 @@ module Gitlab ...@@ -103,11 +103,11 @@ module Gitlab
def expiring_features_message def expiring_features_message
case plan_name case plan_name
when 'Gold' when 'Gold'
_('After that, you will not to be able to use merge approvals or epics as well as many security features.') _('After that, you will not be able to use merge approvals or epics as well as many security features.')
when 'Silver' when 'Silver'
_('After that, you will not to be able to use merge approvals or epics as well as many other features.') _('After that, you will not be able to use merge approvals or epics as well as many other features.')
else else
_('After that, you will not to be able to use merge approvals or code quality as well as many other features.') _('After that, you will not be able to use merge approvals or code quality as well as many other features.')
end end
end end
......
...@@ -158,7 +158,7 @@ RSpec.describe Gitlab::ExpiringSubscriptionMessage do ...@@ -158,7 +158,7 @@ RSpec.describe Gitlab::ExpiringSubscriptionMessage do
context 'without namespace' do context 'without namespace' do
it 'has an expiration blocking message' do it 'has an expiration blocking message' do
expect(subject).to include('Your Gold subscription will expire on 2020-03-09. After that, you will not to be able to create issues or merge requests as well as many other features.') expect(subject).to include('Your Gold subscription will expire on 2020-03-09. After that, you will not be able to create issues or merge requests as well as many other features.')
end end
end end
...@@ -168,19 +168,19 @@ RSpec.describe Gitlab::ExpiringSubscriptionMessage do ...@@ -168,19 +168,19 @@ RSpec.describe Gitlab::ExpiringSubscriptionMessage do
it 'has gold plan specific messaging' do it 'has gold plan specific messaging' do
allow(subscribable).to receive(:plan).and_return('gold') allow(subscribable).to receive(:plan).and_return('gold')
expect(subject).to include('Your Gold subscription for No Limit Records will expire on 2020-03-09. After that, you will not to be able to use merge approvals or epics as well as many security features.') expect(subject).to include('Your Gold 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.')
end end
it 'has silver plan specific messaging' do it 'has silver plan specific messaging' do
allow(subscribable).to receive(:plan).and_return('silver') allow(subscribable).to receive(:plan).and_return('silver')
expect(subject).to include('Your Silver subscription for No Limit Records will expire on 2020-03-09. After that, you will not to be able to use merge approvals or epics as well as many other features.') expect(subject).to include('Your Silver 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.')
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 to 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 that, you will not be able to use merge approvals or code quality as well as many other features.')
end end
context 'is auto_renew nil' do context 'is auto_renew nil' do
......
...@@ -2222,13 +2222,13 @@ msgstr "" ...@@ -2222,13 +2222,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 to be able to use merge approvals or code quality as well as many other features." msgid "After that, you will not be able to use merge approvals or code quality as well as many other features."
msgstr "" msgstr ""
msgid "After that, you will not to be able to use merge approvals or epics as well as many other features." msgid "After that, you will not be able to use merge approvals or epics as well as many other features."
msgstr "" msgstr ""
msgid "After that, you will not to be able to use merge approvals or epics as well as many security features." msgid "After that, you will not be able to use merge approvals or epics as well as many security features."
msgstr "" msgstr ""
msgid "Alert" msgid "Alert"
...@@ -29944,7 +29944,7 @@ msgstr "" ...@@ -29944,7 +29944,7 @@ msgstr ""
msgid "Your %{strong}%{plan_name}%{strong_close} subscription for %{strong}%{namespace_name}%{strong_close} will expire on %{strong}%{expires_on}%{strong_close}." msgid "Your %{strong}%{plan_name}%{strong_close} subscription for %{strong}%{namespace_name}%{strong_close} will expire on %{strong}%{expires_on}%{strong_close}."
msgstr "" msgstr ""
msgid "Your %{strong}%{plan_name}%{strong_close} subscription will expire on %{strong}%{expires_on}%{strong_close}. After that, you will not to be able to create issues or merge requests as well as many other features." msgid "Your %{strong}%{plan_name}%{strong_close} subscription will expire on %{strong}%{expires_on}%{strong_close}. After that, you will not be able to create issues or merge requests as well as many other features."
msgstr "" msgstr ""
msgid "Your CSV export has started. It will be emailed to %{email} when complete." msgid "Your CSV export has started. It will be emailed to %{email} when complete."
......
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