Merge branch 'JonstonChan-externalize-link_to-cancel-message' into 'master'

Externalize link_to "Cancel" message

See merge request gitlab-org/gitlab!68911

app/views/admin/deploy_keys/new.html.haml

@@ -7,4 +7,4 @@
     = render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key }
     .form-actions
       = f.submit 'Create', class: 'btn gl-button btn-confirm', data: { qa_selector: "add_deploy_key_button" }
-      = link_to 'Cancel', admin_deploy_keys_path, class: 'btn gl-button btn-default btn-cancel'
+      = link_to _('Cancel'), admin_deploy_keys_path, class: 'btn gl-button btn-default btn-cancel'

app/views/projects/_commit_button.html.haml

 .form-actions.gl-display-flex
   = button_tag 'Commit changes', id: 'commit-changes', class: 'gl-button btn btn-confirm js-commit-button  qa-commit-button'
 
-  = link_to 'Cancel', cancel_path,
+  = link_to _('Cancel'), cancel_path,
             class: 'gl-button btn btn-default gl-ml-3', data: {confirm: leave_edit_message}
 
   = render 'shared/projects/edit_information'

app/views/projects/blob/_new_dir.html.haml

@@ -16,6 +16,6 @@
 
           .form-actions
             = submit_tag _("Create directory"), class: 'btn gl-button btn-confirm'
-            = link_to "Cancel", '#', class: "btn gl-button btn-default btn-cancel", "data-dismiss" => "modal"
+            = link_to _('Cancel'), '#', class: "btn gl-button btn-default btn-cancel", "data-dismiss" => "modal"
 
             = render 'shared/projects/edit_information'

app/views/projects/blob/_remove.html.haml

@@ -13,4 +13,4 @@
           .form-group.row
             .offset-sm-2.col-sm-10
               = button_tag 'Delete file', class: 'btn gl-button btn-danger btn-remove-file'
-              = link_to "Cancel", '#', class: "btn gl-button btn-cancel", "data-dismiss" => "modal"
+              = link_to _('Cancel'), '#', class: "btn gl-button btn-cancel", "data-dismiss" => "modal"

app/views/projects/branches/new.html.haml

@@ -30,5 +30,5 @@
       .form-text.text-muted Existing branch name, tag, or commit SHA
   .form-actions
     = button_tag 'Create branch', class: 'gl-button btn btn-confirm'
-    = link_to 'Cancel', project_branches_path(@project), class: 'gl-button btn btn-default btn-cancel'
+    = link_to _('Cancel'), project_branches_path(@project), class: 'gl-button btn btn-default btn-cancel'
 %script#availableRefs{ type: "application/json" }= @project.repository.ref_names.to_json.html_safe

app/views/projects/mattermosts/_team_selection.html.haml

@@ -42,5 +42,5 @@
   %hr
   .clearfix
     .float-right
-      = link_to 'Cancel', edit_project_service_path(@project, @integration), class: 'gl-button btn btn-lg'
+      = link_to _('Cancel'), edit_project_service_path(@project, @integration), class: 'gl-button btn btn-lg'
       = f.submit 'Install', class: 'gl-button btn btn-success btn-lg'

app/views/projects/tags/releases/edit.html.haml

@@ -16,4 +16,4 @@
   .error-alert
   .gl-mt-5.gl-display-flex
     = f.submit _('Save changes'), class: 'btn gl-button btn-confirm gl-mr-3'
-    = link_to "Cancel", project_tag_path(@project, @tag.name), class: "btn gl-button btn-default btn-cancel"
+    = link_to _('Cancel'), project_tag_path(@project, @tag.name), class: "btn gl-button btn-default btn-cancel"

app/views/shared/labels/_form.html.haml

@@ -31,4 +31,4 @@
       = f.submit _('Save changes'), class: 'btn gl-button btn-confirm js-save-button'
     - else
       = f.submit 'Create label', class: 'btn gl-button btn-confirm js-save-button qa-label-create-button'
-    = link_to 'Cancel', back_path, class: 'btn gl-button btn-default btn-cancel'
+    = link_to _('Cancel'), back_path, class: 'btn gl-button btn-default btn-cancel'

ee/app/views/projects/settings/slacks/edit.html.haml

@@ -20,4 +20,4 @@
           %span
             Save changes
          
-        = link_to 'Cancel', edit_project_service_path(@project, @service), class: 'btn gl-button btn-cancel'
+        = link_to _('Cancel'), edit_project_service_path(@project, @service), class: 'btn gl-button btn-cancel'