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/blob | |
| 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/blob')
| -rw-r--r-- | app/views/projects/blob/_upload.html.haml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/views/projects/blob/_upload.html.haml b/app/views/projects/blob/_upload.html.haml index e14885f264b..24314e03b46 100644 --- a/app/views/projects/blob/_upload.html.haml +++ b/app/views/projects/blob/_upload.html.haml @@ -9,8 +9,10 @@ .dropzone .dropzone-previews.blob-upload-dropzone-previews %p.dz-message.light - Attach a file by drag & drop or - = link_to 'click to upload', '#', class: "markdown-selector" + - upload_link = link_to n_('UploadLink|click to upload'), '#', class: "markdown-selector" + - dropzone_text = _('Attach a file by drag & drop or %{upload_link}') % { upload_link: upload_link } + #{ dropzone_text.html_safe } + %br .dropzone-alerts.alert.alert-danger.data{ style: "display:none" } @@ -18,7 +20,7 @@ .form-actions = button_tag button_title, class: 'btn btn-small btn-create btn-upload-file', id: 'submit-all' - = link_to "Cancel", '#', class: "btn btn-cancel", "data-dismiss" => "modal" + = link_to _("Cancel"), '#', class: "btn btn-cancel", "data-dismiss" => "modal" - unless can?(current_user, :push_code, @project) .inline.prepend-left-10 |