Commit 8a63f0a1 authored by Vitaly Slobodin's avatar Vitaly Slobodin

Merge branch '323968-update-out-of-storage-banner' into 'master'

Update 'out of storage' banner title and button text

See merge request gitlab-org/gitlab!58276
parents 8c2ab295 6878fab3
......@@ -20,9 +20,7 @@ module Namespaces
free_size_limit: formatted(root_namespace.actual_size_limit) }
if root_namespace.additional_purchased_storage_size == 0
ns_("NamespaceStorageSize|You have reached the free storage limit of %{free_size_limit} on %{locked_project_count} project. To unlock it, please purchase additional storage",
"NamespaceStorageSize|You have reached the free storage limit of %{free_size_limit} on %{locked_project_count} projects. To unlock them, please purchase additional storage",
params[:locked_project_count]) % params
s_("NamespaceStorageSize|You have reached the free storage limit of %{free_size_limit} on one or more projects." % params)
else
ns_("NamespaceStorageSize|%{namespace_name} contains %{locked_project_count} locked project", "NamespaceStorageSize|%{namespace_name} contains %{locked_project_count} locked projects", params[:locked_project_count]) % params
end
......@@ -40,7 +38,7 @@ module Namespaces
end
def base_message
s_("NamespaceStorageSize|push to your repository, create pipelines, create issues or add comments. To learn more about reducing storage capacity please visit our docs.")
s_("NamespaceStorageSize|push to your repository, create pipelines, create issues or add comments. To reduce storage capacity, delete unused repositories, artifacts, wikis, issues, and pipelines. To learn more about reducing storage capacity please visit our docs.")
end
def formatted(number)
......
......@@ -30,4 +30,4 @@
- if purchase_link
= link_to(_('Purchase more storage'), purchase_link, class: "btn gl-alert-action btn-md gl-button btn-success")
- if usage_link
= link_to(_('Manage storage usage'), usage_link, class: "btn gl-alert-action btn-md gl-button btn-default")
= link_to(_('View usage details'), usage_link, class: "btn gl-alert-action btn-md gl-button btn-default")
---
title: Update out-of-storage banner title and button text
merge_request: 58276
author:
type: other
......@@ -172,7 +172,7 @@ RSpec.describe Namespaces::CheckExcessStorageSizeService, '#execute' do
it 'returns message to have reached the free storage limit' do
expect(response).to include("You have reached the free storage limit of 10 GB")
expect(response).to include("#{locked_project_count} projects")
expect(response).to include("one or more projects")
end
end
end
......
......@@ -18975,9 +18975,6 @@ msgstr ""
msgid "Manage projects."
msgstr ""
msgid "Manage storage usage"
msgstr ""
msgid "Manage two-factor authentication"
msgstr ""
......@@ -20535,17 +20532,15 @@ msgstr ""
msgid "NamespaceStorageSize|You have reached %{usage_in_percent} of %{namespace_name}'s storage capacity (%{used_storage} of %{storage_limit})"
msgstr ""
msgid "NamespaceStorageSize|You have reached the free storage limit of %{free_size_limit} on %{locked_project_count} project. To unlock it, please purchase additional storage"
msgid_plural "NamespaceStorageSize|You have reached the free storage limit of %{free_size_limit} on %{locked_project_count} projects. To unlock them, please purchase additional storage"
msgstr[0] ""
msgstr[1] ""
msgid "NamespaceStorageSize|push to your repository, create pipelines, create issues or add comments. To learn more about reducing storage capacity please visit our docs."
msgid "NamespaceStorageSize|You have reached the free storage limit of %{free_size_limit} on one or more projects."
msgstr ""
msgid "NamespaceStorageSize|push to your repository, create pipelines, create issues or add comments. To reduce storage capacity, delete unused repositories, artifacts, wikis, issues, and pipelines."
msgstr ""
msgid "NamespaceStorageSize|push to your repository, create pipelines, create issues or add comments. To reduce storage capacity, delete unused repositories, artifacts, wikis, issues, and pipelines. To learn more about reducing storage capacity please visit our docs."
msgstr ""
msgid "Namespaces"
msgstr ""
......@@ -34201,6 +34196,9 @@ msgstr ""
msgid "View the performance dashboard at"
msgstr ""
msgid "View usage details"
msgstr ""
msgid "View users statistics"
msgstr ""
......
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