Commit cb6f250d authored by Kerri Miller's avatar Kerri Miller

Merge branch 'patch-255' into 'master'

Remove extra "to" from subscription expiration message

See merge request gitlab-org/gitlab!44769
parents e947fff0 7d70617b
---
title: Remove extra to from subscription expiration message
merge_request: 44769
author:
type: fixed
......@@ -87,7 +87,7 @@ module Gitlab
def expiring_message
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
def namespace_expiring_message
......@@ -103,11 +103,11 @@ module Gitlab
def expiring_features_message
case plan_name
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'
_('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
_('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
......
......@@ -158,7 +158,7 @@ RSpec.describe Gitlab::ExpiringSubscriptionMessage do
context 'without namespace' 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
......@@ -168,19 +168,19 @@ RSpec.describe Gitlab::ExpiringSubscriptionMessage do
it 'has gold plan specific messaging' do
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
it 'has silver plan specific messaging' do
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
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 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
context 'is auto_renew nil' do
......
......@@ -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."
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 ""
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 ""
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 ""
msgid "Alert"
......@@ -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}."
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 ""
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