Commit 14e68c2a authored by Rémy Coutable's avatar Rémy Coutable

Merge branch...

Merge branch '10828-follow-up-from-ee-port-externalize-strings-in-projects-controllers' into 'master'

Resolve "Follow-up from "(EE port) Externalize strings in projects controllers""

Closes #10828

See merge request gitlab-org/gitlab-ee!10517
parents bbcd0747 fd701caa
...@@ -50,8 +50,8 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController ...@@ -50,8 +50,8 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
job_id = RunPipelineScheduleWorker.perform_async(schedule.id, current_user.id) job_id = RunPipelineScheduleWorker.perform_async(schedule.id, current_user.id)
if job_id if job_id
link_to_pipelines = view_context.link_to(_('Pipelines page'), project_pipelines_path(@project)) pipelines_link_start = "<a href=\"#{project_pipelines_path(@project)}\">"
message = _("Successfully scheduled a pipeline to run. Go to the %{link_to_pipelines} for details.").html_safe % { link_to_pipelines: link_to_pipelines } message = _("Successfully scheduled a pipeline to run. Go to the %{pipelines_link_start}Pipelines page%{pipelines_link_end} for details.") % { pipelines_link_start: pipelines_link_start, pipelines_link_end: "</a>" }
flash[:notice] = message.html_safe flash[:notice] = message.html_safe
else else
flash[:alert] = _('Unable to schedule a pipeline to run immediately') flash[:alert] = _('Unable to schedule a pipeline to run immediately')
......
...@@ -7650,9 +7650,6 @@ msgstr "" ...@@ -7650,9 +7650,6 @@ msgstr ""
msgid "Pipelines need to be configured to enable this feature." msgid "Pipelines need to be configured to enable this feature."
msgstr "" msgstr ""
msgid "Pipelines page"
msgstr ""
msgid "Pipelines settings for '%{project_name}' were successfully updated." msgid "Pipelines settings for '%{project_name}' were successfully updated."
msgstr "" msgstr ""
...@@ -10165,7 +10162,7 @@ msgstr "" ...@@ -10165,7 +10162,7 @@ msgstr ""
msgid "Successfully removed email." msgid "Successfully removed email."
msgstr "" msgstr ""
msgid "Successfully scheduled a pipeline to run. Go to the %{link_to_pipelines} for details." msgid "Successfully scheduled a pipeline to run. Go to the %{pipelines_link_start}Pipelines page%{pipelines_link_end} for details."
msgstr "" msgstr ""
msgid "Successfully unblocked" msgid "Successfully unblocked"
......
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