diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-04-02 09:08:23 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-04-02 09:08:23 +0000 |
| commit | 91d884ec6b6d636308d74635a5895957b5246c24 (patch) | |
| tree | e71ce189a7fe8ebb42c309c004d2c881b060c570 | |
| parent | f87b7fe3b386962c45e83486634352da544857fb (diff) | |
| parent | 8c7f7236a453029a2c542ebeb44750593cac9656 (diff) | |
| download | gitlab-ce-91d884ec6b6d636308d74635a5895957b5246c24.tar.gz | |
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
| -rw-r--r-- | app/controllers/projects/pipeline_schedules_controller.rb | 4 | ||||
| -rw-r--r-- | locale/gitlab.pot | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/app/controllers/projects/pipeline_schedules_controller.rb b/app/controllers/projects/pipeline_schedules_controller.rb index fd5b89298a7..6b721c8fdf7 100644 --- a/app/controllers/projects/pipeline_schedules_controller.rb +++ b/app/controllers/projects/pipeline_schedules_controller.rb @@ -50,8 +50,8 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController 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') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 1e6f04c7815..fcbd34a05d5 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -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" |