Commit 069d0b03 authored by Simon Knox's avatar Simon Knox

Merge branch 'ah-kg-add-waiting-period-25Dec' into 'master'

Make the waiting period for deletion dynamic on project removal page

See merge request gitlab-org/gitlab!50597
parents e3f1b92a 4fe67219
- return unless @project.feature_available?(:adjourned_deletion_for_projects_and_groups) - return unless @project.feature_available?(:adjourned_deletion_for_projects_and_groups)
%p %p
%span.gl-text-gray-500= _('Projects will be permanently deleted after a 7-day waiting period.') %span.gl-text-gray-500= _('Projects will be permanently deleted after a %{waiting_period}-day waiting period.').html_safe % { waiting_period: ::Gitlab::CurrentSettings.deletion_adjourned_period }
= link_to(_('Customizable by an administrator.'), help_page_path('user/admin_area/settings/visibility_and_access_controls', anchor: 'default-deletion-delay')) = link_to(_('Customizable by an administrator.'), help_page_path('user/admin_area/settings/visibility_and_access_controls', anchor: 'default-deletion-delay'))
%p= marked_for_removal_message(@project) %p= marked_for_removal_message(@project)
---
title: Make the waiting period for deletion dynamic on project removal page
merge_request: 50597
author:
type: changed
...@@ -22680,7 +22680,7 @@ msgstr "" ...@@ -22680,7 +22680,7 @@ msgstr ""
msgid "Projects to index" msgid "Projects to index"
msgstr "" msgstr ""
msgid "Projects will be permanently deleted after a 7-day waiting period." msgid "Projects will be permanently deleted after a %{waiting_period}-day waiting period."
msgstr "" msgstr ""
msgid "Projects will be permanently deleted immediately." msgid "Projects will be permanently deleted immediately."
......
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