Merge branch 'JonstonChan-unscope-incorrectly-scoped-strings' into 'master'

Unscope i18n strings that are incorrectly scoped

See merge request gitlab-org/gitlab!69002

app/views/admin/runners/show.html.haml

@@ -27,7 +27,7 @@
                         %strong
                           = project.full_name
                       .gl-alert-actions
-                        = link_to s_('Disable'), admin_namespace_project_runner_project_path(project.namespace, project, runner_project), method: :delete, class: 'btn gl-alert-action btn-confirm btn-md gl-button'
+                        = link_to _('Disable'), admin_namespace_project_runner_project_path(project.namespace, project, runner_project), method: :delete, class: 'btn gl-alert-action btn-confirm btn-md gl-button'
 
     %table.table{ data: { testid: 'unassigned-projects' } }
       %thead

app/views/ci/group_variables/_variable_header.html.haml

 %tr
   %th
-    = s_('Key')
+    = _('Key')
   %th
-    = s_('Environments')
+    = _('Environments')
   %th
-    = s_('Group')
+    = _('Group')

app/views/errors/access_denied.html.haml

@@ -12,5 +12,5 @@
     = s_('403|Please contact your GitLab administrator to get permission.')
   .action-container.js-go-back{ hidden: true }
     %button{ type: 'button', class: 'gl-button btn btn-success' }
-      = s_('Go Back')
+      = _('Go Back')
 = render "errors/footer"

app/views/groups/_home_panel.html.haml

@@ -24,7 +24,7 @@
       - if current_user
         .gl-display-flex.gl-flex-wrap.gl-lg-justify-content-end.gl-mx-n2{ data: { testid: 'group-buttons' } }
           - if current_user.admin?
-            = link_to [:admin, @group], class: 'btn btn-default gl-button btn-icon gl-mt-3 gl-mr-2', title: s_('View group in admin area'),
+            = link_to [:admin, @group], class: 'btn btn-default gl-button btn-icon gl-mt-3 gl-mr-2', title: _('View group in admin area'),
               data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
               = sprite_icon('admin')
           - if @notification_setting

app/views/profiles/show.html.haml

@@ -112,7 +112,7 @@
       = f.text_field :organization, label: s_('Profiles|Organization'), class: 'input-md gl-form-input', help: s_("Profiles|Who you represent or work for")
       = f.text_area :bio, class: 'gl-form-input', label: s_('Profiles|Bio'), rows: 4, maxlength: 250, help: s_("Profiles|Tell us about yourself in fewer than 250 characters")
       %hr
-      %h5= s_("Private profile")
+      %h5= _('Private profile')
       .checkbox-icon-inline-wrapper
         - private_profile_label = capture do
           = s_("Profiles|Don't display activity-related personal information on your profiles")

app/views/projects/_home_panel.html.haml

@@ -31,7 +31,7 @@
       .project-repo-buttons.gl-display-flex.gl-justify-content-md-end.gl-align-items-start.gl-flex-wrap.gl-mt-5
         - if current_user
           - if current_user.admin?
-            = link_to [:admin, @project], class: 'btn gl-button btn-icon gl-align-self-start gl-py-2! gl-mr-3', title: s_('View project in admin area'),
+            = link_to [:admin, @project], class: 'btn gl-button btn-icon gl-align-self-start gl-py-2! gl-mr-3', title: _('View project in admin area'),
               data: {toggle: 'tooltip', placement: 'bottom', container: 'body'} do
               = sprite_icon('admin')
           .gl-display-flex.gl-align-items-start.gl-mr-3

app/views/projects/_new_project_fields.html.haml

@@ -11,7 +11,7 @@
     = f.text_field :name, placeholder: "My awesome project", class: "form-control gl-form-input input-lg", autofocus: true, data: { track_label: "#{track_label}", track_event: "activate_form_input", track_property: "project_name", track_value: "" }, required: true, aria: { required: true }
   .form-group.project-path.col-sm-6
     = f.label :namespace_id, class: 'label-bold' do
-      %span= s_("Project URL")
+      %span= _('Project URL')
     .input-group.gl-flex-nowrap
       - if current_user.can_select_namespace?
         - namespace_id = namespace_id_from(params)

app/views/projects/pipeline_schedules/_pipeline_schedule.html.haml

@@ -27,7 +27,7 @@
     %td
       .float-right.btn-group
         - if can?(current_user, :play_pipeline_schedule, pipeline_schedule)
-          = link_to play_pipeline_schedule_path(pipeline_schedule), method: :post, title: s_('Play'), class: 'btn gl-button btn-default btn-icon' do
+          = link_to play_pipeline_schedule_path(pipeline_schedule), method: :post, title: _('Play'), class: 'btn gl-button btn-default btn-icon' do
             = sprite_icon('play')
         - if can?(current_user, :take_ownership_pipeline_schedule, pipeline_schedule)
           = link_to take_ownership_pipeline_schedule_path(pipeline_schedule), method: :post, title: s_('PipelineSchedules|Take ownership'), class: 'btn gl-button btn-default' do

app/views/shared/runners/_runner_details.html.haml

@@ -60,4 +60,4 @@
         - if runner.contacted_at
           = time_ago_with_tooltip runner.contacted_at
         - else
-          = s_('Never')
+          = _('Never')

ee/app/views/admin/application_settings/_default_delayed_project_deletion_setting.html.haml

@@ -3,7 +3,7 @@
 - f = local_assigns.fetch(:form)
 
 .form-group
-  = f.label s_('Default delayed project deletion'), class: 'label-bold'
+  = f.label _('Default delayed project deletion'), class: 'label-bold'
   .form-check
     = f.check_box :delayed_project_deletion, class: 'form-check-input'
     = f.label :delayed_project_deletion, class: 'form-check-label' do

ee/app/views/admin/application_settings/_default_project_deletion_adjourned_period_setting.html.haml

@@ -3,7 +3,7 @@
 - f = local_assigns.fetch(:form)
 
 .form-group
-  = f.label s_('Default deletion delay'), class: 'label-bold'
+  = f.label _('Default deletion delay'), class: 'label-bold'
   = f.select :deletion_adjourned_period, options_for_select(0..90, @application_setting.deletion_adjourned_period), {}, class: 'form-control gl-form-input'
   = f.label :deletion_adjourned_period, class: 'form-check-label' do
     = _('How many days need to pass between marking entity for deletion and actual removing it.')

ee/app/views/admin/application_settings/_default_project_deletion_protection_setting.html.haml

@@ -3,7 +3,7 @@
 - f = local_assigns.fetch(:form)
 
 .form-group
-  = f.label s_('Default project deletion protection'), class: 'label-bold'
+  = f.label _('Default project deletion protection'), class: 'label-bold'
   .form-check
     = f.check_box :default_project_deletion_protection, class: 'form-check-input'
     = f.label :default_project_deletion_protection, class: 'form-check-label' do

ee/app/views/groups/contribution_analytics/show.html.haml

-- page_title s_('Contribution Analytics')
+- page_title _('Contribution Analytics')
 
 - if @group.licensed_feature_available?(:contribution_analytics)
   .mb-3
     %h3
-      = s_('Contribution Analytics')
+      = _('Contribution Analytics')
 
   .sub-header-block
     .float-right

ee/app/views/shared/promotions/_promote_epics.html.haml

@@ -19,7 +19,7 @@
         %div
           %p
             = s_('Promotions|Epics let you manage your portfolio of projects more efficiently and with less effort by tracking groups of issues that share a theme, across projects and milestones.')
-            = link_to s_('Read more'), 'https://docs.gitlab.com/ee/user/group/epics/', class: 'btn-link', target: '_blank'
+            = link_to _('Read more'), 'https://docs.gitlab.com/ee/user/group/epics/', class: 'btn-link', target: '_blank'
           .gl-flex-wrap
             = render 'shared/promotions/promotion_link_project', short_form: true, location: :epics
             = link_to s_("Promotions|Don't show me this again"), '#', class: 'gl-button btn js-close js-close-callout gl-mt-2'