From 6d00a239db9bb95e08a431838d2efa1123ecf71b Mon Sep 17 00:00:00 2001 From: Romain Maneschi Date: Wed, 29 May 2019 22:29:20 +0200 Subject: delete group confirm popup mention projects deletion --- app/helpers/groups_helper.rb | 2 +- locale/gitlab.pot | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 7af766c8544..d7411977e14 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -99,7 +99,7 @@ module GroupsHelper end def remove_group_message(group) - _("You are going to remove %{group_name}. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?") % + _("You are going to remove %{group_name}, this will also remove all its subgroups and projects. This can’t be undone. Are you ABSOLUTELY sure?") % { group_name: group.name } end diff --git a/locale/gitlab.pot b/locale/gitlab.pot index af53da84bea..3e32e225796 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -11283,7 +11283,7 @@ msgstr "" msgid "You are attempting to update a file that has changed since you started editing it." msgstr "" -msgid "You are going to remove %{group_name}. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?" +msgid "You are going to remove %{group_name}, this will also remove all its subgroups and projects. This can’t be undone. Are you ABSOLUTELY sure?" msgstr "" msgid "You are going to remove %{project_full_name}. Removed project CANNOT be restored! Are you ABSOLUTELY sure?" -- cgit v1.2.1 From 1fbfd46b341cc721bd1038bf0d8b74862d788a5b Mon Sep 17 00:00:00 2001 From: Maneschi Romain Date: Thu, 30 May 2019 12:02:55 +0000 Subject: Apply suggestion to app/helpers/groups_helper.rb --- app/helpers/groups_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index d7411977e14..a3f53ca8dd6 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -99,7 +99,7 @@ module GroupsHelper end def remove_group_message(group) - _("You are going to remove %{group_name}, this will also remove all its subgroups and projects. This can’t be undone. Are you ABSOLUTELY sure?") % + _("You are going to remove %{group_name}, this will also remove all of its subgroups and projects. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?") % { group_name: group.name } end -- cgit v1.2.1 From 85798d3cd27e6ddc94914808e928f6041b7f83f1 Mon Sep 17 00:00:00 2001 From: Romain Maneschi Date: Thu, 30 May 2019 14:11:46 +0200 Subject: update gitlab.pot after suggestion apply --- locale/gitlab.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 3e32e225796..60ef32b9325 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -11283,7 +11283,7 @@ msgstr "" msgid "You are attempting to update a file that has changed since you started editing it." msgstr "" -msgid "You are going to remove %{group_name}, this will also remove all its subgroups and projects. This can’t be undone. Are you ABSOLUTELY sure?" +msgid "You are going to remove %{group_name}, this will also remove all of its subgroups and projects. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?" msgstr "" msgid "You are going to remove %{project_full_name}. Removed project CANNOT be restored! Are you ABSOLUTELY sure?" -- cgit v1.2.1