diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-26 13:02:42 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-26 13:02:42 +0000 |
| commit | d17170da5cc62c03c905d795e2493a60c3b8846b (patch) | |
| tree | a345dd1d612c151a5f406b4cb40f1cb1f1cfb689 /app | |
| parent | 7eae2b3ce0a944e003e45d75cb3365f2e09212c7 (diff) | |
| parent | ba404d5593b4d400ac620723445c64f6636d1856 (diff) | |
| download | gitlab-ce-d17170da5cc62c03c905d795e2493a60c3b8846b.tar.gz | |
Merge branch 'i18n-extract-app/views/projects-deployments' into 'master'
i18n: externalize strings from 'app/views/projects/deployments'
See merge request gitlab-org/gitlab-ce!19848
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/deployments/_commit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/deployments/_deployment.html.haml | 8 | ||||
| -rw-r--r-- | app/views/projects/deployments/_rollback.haml | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/app/views/projects/deployments/_commit.html.haml b/app/views/projects/deployments/_commit.html.haml index c7ac687e4a6..282566eeadc 100644 --- a/app/views/projects/deployments/_commit.html.haml +++ b/app/views/projects/deployments/_commit.html.haml @@ -14,4 +14,4 @@ = author_avatar(deployment.commit, size: 20) = link_to_markdown commit_title, project_commit_path(@project, deployment.sha), class: "commit-row-message" - else - Cant find HEAD commit for this branch + = _("Can't find HEAD commit for this branch") diff --git a/app/views/projects/deployments/_deployment.html.haml b/app/views/projects/deployments/_deployment.html.haml index 520696b01c6..85bc8ec07e3 100644 --- a/app/views/projects/deployments/_deployment.html.haml +++ b/app/views/projects/deployments/_deployment.html.haml @@ -1,14 +1,14 @@ .gl-responsive-table-row.deployment{ role: 'row' } .table-section.section-10{ role: 'gridcell' } - .table-mobile-header{ role: 'rowheader' } ID + .table-mobile-header{ role: 'rowheader' }= _("ID") %strong.table-mobile-content ##{deployment.iid} .table-section.section-30{ role: 'gridcell' } - .table-mobile-header{ role: 'rowheader' } Commit + .table-mobile-header{ role: 'rowheader' }= _("Commit") = render 'projects/deployments/commit', deployment: deployment .table-section.section-25.build-column{ role: 'gridcell' } - .table-mobile-header{ role: 'rowheader' } Job + .table-mobile-header{ role: 'rowheader' }= _("Job") - if deployment.deployable .table-mobile-content .flex-truncate-parent @@ -21,7 +21,7 @@ = user_avatar(user: deployment.user, size: 20) .table-section.section-15{ role: 'gridcell' } - .table-mobile-header{ role: 'rowheader' } Created + .table-mobile-header{ role: 'rowheader' }= _("Created") %span.table-mobile-content= time_ago_with_tooltip(deployment.created_at) .table-section.section-20.table-button-footer{ role: 'gridcell' } diff --git a/app/views/projects/deployments/_rollback.haml b/app/views/projects/deployments/_rollback.haml index 5941e01c6f1..95f950948ab 100644 --- a/app/views/projects/deployments/_rollback.haml +++ b/app/views/projects/deployments/_rollback.haml @@ -1,6 +1,6 @@ - if can?(current_user, :create_deployment, deployment) && deployment.deployable = link_to [:retry, @project.namespace.becomes(Namespace), @project, deployment.deployable], method: :post, class: 'btn btn-build' do - if deployment.last? - Re-deploy + = _("Re-deploy") - else - Rollback + = _("Rollback") |