diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-06-16 16:16:35 +0000 |
---|---|---|
committer | Ruben Davila <rdavila84@gmail.com> | 2017-06-16 19:00:27 -0500 |
commit | 2a7deae183a73c24bea135d75956918815a655fb (patch) | |
tree | facc4ee1fb1b0538b77837eddcea66ac391b8434 /app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml | |
parent | 999926075d82552f630d4e9d8b1128f5f2e131af (diff) | |
download | gitlab-ce-2a7deae183a73c24bea135d75956918815a655fb.tar.gz |
Merge branch 'bvl-missing-translations' into 'master'9-3-stable-rc3-i18n
Missing translations for the project & repository pages.
Closes #33420
See merge request !12052
Conflicts:
app/assets/javascripts/locale/en/app.js
app/assets/javascripts/locale/es/app.js
app/views/projects/pipeline_schedules/_form.html.haml
locale/en/gitlab.po
locale/es/gitlab.po
locale/gitlab.pot
Diffstat (limited to 'app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml')
-rw-r--r-- | app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml b/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml index 2d3344a4aaf..966d6cd8495 100644 --- a/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml +++ b/app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml @@ -13,12 +13,12 @@ = ci_icon_for_status(pipeline_schedule.last_pipeline.status) %span ##{pipeline_schedule.last_pipeline.id} - else - = _("PipelineSchedules|None") + = s_("PipelineSchedules|None") %td.next-run-cell - if pipeline_schedule.active? = time_ago_with_tooltip(pipeline_schedule.real_next_run) - else - = _("PipelineSchedules|Inactive") + = s_("PipelineSchedules|Inactive") %td - if pipeline_schedule.owner = image_tag avatar_icon(pipeline_schedule.owner, 20), class: "avatar s20" |