Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
11c5d33f
Commit
11c5d33f
authored
Jun 12, 2020
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add period to expiring subscription message
parent
a4ef92d2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
ee/lib/gitlab/expiring_subscription_message.rb
ee/lib/gitlab/expiring_subscription_message.rb
+4
-4
ee/spec/lib/gitlab/expiring_subscription_message_spec.rb
ee/spec/lib/gitlab/expiring_subscription_message_spec.rb
+2
-2
locale/gitlab.pot
locale/gitlab.pot
+4
-4
No files found.
ee/lib/gitlab/expiring_subscription_message.rb
View file @
11c5d33f
...
...
@@ -36,9 +36,9 @@ module Gitlab
def
expired_subject
if
subscribable
.
block_changes?
if
auto_renew?
_
(
'Something went wrong with your automatic subscription renewal'
)
_
(
'Something went wrong with your automatic subscription renewal
.
'
)
else
_
(
'Your subscription has been downgraded'
)
_
(
'Your subscription has been downgraded
.
'
)
end
else
_
(
'Your subscription expired!'
)
...
...
@@ -49,9 +49,9 @@ module Gitlab
remaining_days
=
pluralize
(
subscribable
.
remaining_days
,
'day'
)
if
auto_renew?
_
(
'Your subscription will automatically renew in %{remaining_days}'
)
%
{
remaining_days:
remaining_days
}
_
(
'Your subscription will automatically renew in %{remaining_days}
.
'
)
%
{
remaining_days:
remaining_days
}
else
_
(
'Your subscription will expire in %{remaining_days}'
)
%
{
remaining_days:
remaining_days
}
_
(
'Your subscription will expire in %{remaining_days}
.
'
)
%
{
remaining_days:
remaining_days
}
end
end
...
...
ee/spec/lib/gitlab/expiring_subscription_message_spec.rb
View file @
11c5d33f
...
...
@@ -67,7 +67,7 @@ RSpec.describe Gitlab::ExpiringSubscriptionMessage do
it
'has a nice subject'
do
Timecop
.
freeze
(
today
)
do
expect
(
subject
).
to
include
(
'Your subscription has been downgraded'
)
expect
(
subject
).
to
include
(
'Your subscription has been downgraded
.
'
)
end
end
...
...
@@ -187,7 +187,7 @@ RSpec.describe Gitlab::ExpiringSubscriptionMessage do
end
it
'has a nice subject'
do
expect
(
subject
).
to
include
(
'Your subscription will automatically renew in 4 days'
)
expect
(
subject
).
to
include
(
'Your subscription will automatically renew in 4 days
.
'
)
end
it
'has an expiration blocking message'
do
...
...
locale/gitlab.pot
View file @
11c5d33f
...
...
@@ -20818,7 +20818,7 @@ msgstr ""
msgid "Something went wrong while updating your list settings"
msgstr ""
msgid "Something went wrong with your automatic subscription renewal"
msgid "Something went wrong with your automatic subscription renewal
.
"
msgstr ""
msgid "Something went wrong, unable to add %{project} to dashboard"
...
...
@@ -26174,13 +26174,13 @@ msgstr ""
msgid "Your subscription expired!"
msgstr ""
msgid "Your subscription has been downgraded"
msgid "Your subscription has been downgraded
.
"
msgstr ""
msgid "Your subscription will automatically renew in %{remaining_days}"
msgid "Your subscription will automatically renew in %{remaining_days}
.
"
msgstr ""
msgid "Your subscription will expire in %{remaining_days}"
msgid "Your subscription will expire in %{remaining_days}
.
"
msgstr ""
msgid "Zoom meeting added"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment