GitLab steht wegen Wartungsarbeiten am Montag, den 10. Mai, zwischen 17:00 und 19:00 Uhr nicht zur Verfügung.

Commit 91d884ec authored by Rémy Coutable's avatar Rémy Coutable

Merge branch...

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

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

See merge request gitlab-org/gitlab-ce!26832
parents f87b7fe3 8c7f7236
......@@ -50,8 +50,8 @@ def play
job_id = RunPipelineScheduleWorker.perform_async(schedule.id, current_user.id)
if job_id
link_to_pipelines = view_context.link_to(_('Pipelines page'), 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 }
pipelines_link_start = "<a href=\"#{project_pipelines_path(@project)}\">"
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
else
flash[:alert] = _('Unable to schedule a pipeline to run immediately')
......
......@@ -5833,9 +5833,6 @@ msgstr ""
msgid "Pipelines for last year"
msgstr ""
msgid "Pipelines page"
msgstr ""
msgid "Pipelines settings for '%{project_name}' were successfully updated."
msgstr ""
......@@ -7708,7 +7705,7 @@ msgstr ""
msgid "Successfully removed email."
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 ""
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