summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-08-01 10:28:15 -0700
committerStan Hu <stanhu@gmail.com>2018-08-01 10:28:15 -0700
commitd26074c7e900381c1ad6ffd2cb75f5015bcec40e (patch)
treebba644cca6eb922633520557811a0a31c55f85c3 /app
parentb2da3a351a0543a374e5db34b7c3ba5025518f87 (diff)
downloadgitlab-ce-d26074c7e900381c1ad6ffd2cb75f5015bcec40e.tar.gz
Improve localization and formatting of Bitbucket Server importer status page
Diffstat (limited to 'app')
-rw-r--r--app/views/import/bitbucket_server/status.html.haml19
1 files changed, 10 insertions, 9 deletions
diff --git a/app/views/import/bitbucket_server/status.html.haml b/app/views/import/bitbucket_server/status.html.haml
index 5d78e9cfd1d..d88c0e0a337 100644
--- a/app/views/import/bitbucket_server/status.html.haml
+++ b/app/views/import/bitbucket_server/status.html.haml
@@ -3,22 +3,23 @@
%h3.page-title
%i.fa.fa-bitbucket-square
- Import projects from Bitbucket Server
- = link_to('Reconfigure', configure_import_bitbucket_server_path, class: 'btn btn-primary float-right', method: :post)
+ = _('Import projects from Bitbucket Server')
- if @repos.any?
%p.light
- Select projects you want to import.
+ = _('Select projects you want to import.')
%hr
- %p
+ .btn-group
- if @incompatible_repos.any?
= button_tag class: 'btn btn-import btn-success js-import-all' do
- Import all compatible projects
+ = _('Import all compatible projects')
= icon('spinner spin', class: 'loading-icon')
- else
= button_tag class: 'btn btn-import btn-success js-import-all' do
- Import all projects
+ = _('Import all projects')
= icon('spinner spin', class: 'loading-icon')
+ .btn-group
+ = link_to('Reconfigure', configure_import_bitbucket_server_path, class: 'btn btn-primary', method: :post)
%p
.table-responsive
@@ -28,9 +29,9 @@
%colgroup.import-jobs-status-col
%thead
%tr
- %th From Bitbucket Server
- %th To GitLab
- %th Status
+ %th= _('From Bitbucket Server')
+ %th= _('To GitLab')
+ %th= _(' Status')
%tbody
- @already_added_projects.each do |project|
%tr{ id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}" }