Commit 8989fc1b authored by Sean McGivern's avatar Sean McGivern

Merge branch '213424-update-info-text-when-export-is-started' into 'master'

Update info message when project and group messages are started

Closes #213424

See merge request gitlab-org/gitlab!31981
parents 03030597 446a0cb0
...@@ -146,7 +146,7 @@ class GroupsController < Groups::ApplicationController ...@@ -146,7 +146,7 @@ class GroupsController < Groups::ApplicationController
export_service = Groups::ImportExport::ExportService.new(group: @group, user: current_user) export_service = Groups::ImportExport::ExportService.new(group: @group, user: current_user)
if export_service.async_execute if export_service.async_execute
redirect_to edit_group_path(@group), notice: _('Group export started. A download link will be sent by email.') redirect_to edit_group_path(@group), notice: _('Group export started. A download link will be sent by email and made available on this page.')
else else
redirect_to edit_group_path(@group), alert: _('Group export could not be started.') redirect_to edit_group_path(@group), alert: _('Group export could not be started.')
end end
......
...@@ -201,7 +201,7 @@ class ProjectsController < Projects::ApplicationController ...@@ -201,7 +201,7 @@ class ProjectsController < Projects::ApplicationController
redirect_to( redirect_to(
edit_project_path(@project, anchor: 'js-export-project'), edit_project_path(@project, anchor: 'js-export-project'),
notice: _("Project export started. A download link will be sent by email.") notice: _("Project export started. A download link will be sent by email and made available on this page.")
) )
end end
......
---
title: Update group and project export info messages
merge_request: 31981
author: briankabiro
type: other
...@@ -10670,7 +10670,7 @@ msgstr "" ...@@ -10670,7 +10670,7 @@ msgstr ""
msgid "Group export link has expired. Please generate a new export from your group settings." msgid "Group export link has expired. Please generate a new export from your group settings."
msgstr "" msgstr ""
msgid "Group export started. A download link will be sent by email." msgid "Group export started. A download link will be sent by email and made available on this page."
msgstr "" msgstr ""
msgid "Group has been already marked for deletion" msgid "Group has been already marked for deletion"
...@@ -16426,7 +16426,7 @@ msgstr "" ...@@ -16426,7 +16426,7 @@ msgstr ""
msgid "Project export link has expired. Please generate a new export from your project settings." msgid "Project export link has expired. Please generate a new export from your project settings."
msgstr "" msgstr ""
msgid "Project export started. A download link will be sent by email." msgid "Project export started. A download link will be sent by email and made available on this page."
msgstr "" msgstr ""
msgid "Project has too many %{label_for_message} to search" msgid "Project has too many %{label_for_message} to search"
......
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