From a9eab33b0fe357124f07d99e2f3b700151749232 Mon Sep 17 00:00:00 2001
From: Anton Kalmykov <anton.kalmykov@proton.me>
Date: Thu, 23 May 2024 20:45:50 +0000
Subject: [PATCH] Align wording between group and project restore confirmation
Update pot file
Closes: https://gitlab.com/gitlab-org/gitlab/-/issues/442901
EE: true
Changelog: changed
---
ee/app/controllers/ee/groups_controller.rb | 2 +-
ee/app/controllers/ee/projects_controller.rb | 2 +-
locale/gitlab.pot | 9 ++++++---
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ee/app/controllers/ee/groups_controller.rb b/ee/app/controllers/ee/groups_controller.rb
index b0f38d579536..6b0c8c745a11 100644
--- a/ee/app/controllers/ee/groups_controller.rb
+++ b/ee/app/controllers/ee/groups_controller.rb
@@ -66,7 +66,7 @@ def restore
result = ::Groups::RestoreService.new(group, current_user).execute
if result[:status] == :success
- redirect_to edit_group_path(group), notice: "Group '#{group.name}' has been successfully restored."
+ redirect_to edit_group_path(group), notice: format(_("Group '%{group_name}' has been successfully restored."), group_name: group.full_name)
else
redirect_to edit_group_path(group), alert: result[:message]
end
diff --git a/ee/app/controllers/ee/projects_controller.rb b/ee/app/controllers/ee/projects_controller.rb
index eca12c7e91d0..76f202e68afb 100644
--- a/ee/app/controllers/ee/projects_controller.rb
+++ b/ee/app/controllers/ee/projects_controller.rb
@@ -30,7 +30,7 @@ def restore
result = ::Projects::RestoreService.new(project, current_user, {}).execute
if result[:status] == :success
- flash[:notice] = _("Project '%{project_name}' is restored.") % { project_name: project.full_name }
+ flash[:notice] = format(_("Project '%{project_name}' has been successfully restored."), project_name: project.full_name)
redirect_to(edit_project_path(project))
else
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 74264ce00476..8946656dd515 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -24610,6 +24610,9 @@ msgstr ""
msgid "Group '%{group_name}' could not be updated."
msgstr ""
+msgid "Group '%{group_name}' has been successfully restored."
+msgstr ""
+
msgid "Group '%{group_name}' was successfully updated."
msgstr ""
@@ -40102,13 +40105,13 @@ msgstr ""
msgid "Project & Group can not be assigned at the same time"
msgstr ""
-msgid "Project '%{project_name}' is being imported."
+msgid "Project '%{project_name}' has been successfully restored."
msgstr ""
-msgid "Project '%{project_name}' is in the process of being deleted."
+msgid "Project '%{project_name}' is being imported."
msgstr ""
-msgid "Project '%{project_name}' is restored."
+msgid "Project '%{project_name}' is in the process of being deleted."
msgstr ""
msgid "Project '%{project_name}' queued for deletion."
--
GitLab