Merge branch '17137' into 'master'

Improvement alignment between labels and inputs

See merge request gitlab-org/gitlab!34455

.haml-lint_todo.yml

@@ -57,7 +57,6 @@ linters:
       - "app/views/admin/spam_logs/_spam_log.html.haml"
       - "app/views/admin/spam_logs/index.html.haml"
       - "app/views/admin/system_info/show.html.haml"
-      - "app/views/admin/users/_access_levels.html.haml"
       - "app/views/admin/users/_form.html.haml"
       - "app/views/admin/users/_head.html.haml"
       - "app/views/admin/users/_profile.html.haml"

app/views/admin/users/_access_levels.html.haml

 %fieldset
-  %legend Access
+  %legend
+    = s_('AdminUsers|Access')
   .form-group.row
     .col-sm-2.col-form-label
       = f.label :projects_limit
@@ -7,43 +8,43 @@
       = f.number_field :projects_limit, min: 0, max: Gitlab::Database::MAX_INT_VALUE, class: 'form-control'
 
   .form-group.row
-    .col-sm-2.col-form-label
+    .col-sm-2.col-form-label.gl-pt-0
       = f.label :can_create_group
     .col-sm-10
       = f.check_box :can_create_group
 
   .form-group.row
-    .col-sm-2.col-form-label
+    .col-sm-2.col-form-label.gl-pt-0
       = f.label :access_level
     .col-sm-10
       - editing_current_user = (current_user == @user)
 
       = f.radio_button :access_level, :regular, disabled: editing_current_user
       = f.label :access_level_regular, class: 'font-weight-bold' do
-        Regular
+        = s_('AdminUsers|Regular')
       %p.light
-        Regular users have access to their groups and projects
+        = s_('AdminUsers|Regular users have access to their groups and projects')
 
       = render_if_exists 'admin/users/auditor_access_level_radio', f: f, disabled: editing_current_user
 
       = f.radio_button :access_level, :admin, disabled: editing_current_user
       = f.label :access_level_admin, class: 'font-weight-bold' do
-        Admin
+        = s_('AdminUsers|Admin')
       %p.light
-        Administrators have access to all groups, projects and users and can manage all features in this installation
+        = s_('AdminUsers|Administrators have access to all groups, projects and users and can manage all features in this installation')
       - if editing_current_user
         %p.light
-          You cannot remove your own admin rights.
+          = s_('AdminUsers|You cannot remove your own admin rights.')
 
   .form-group.row
-    .col-sm-2.col-form-label
+    .col-sm-2.col-form-label.gl-pt-0
       = f.label :external
     .hidden{ data: user_internal_regex_data }
-    .col-sm-10
+    .col-sm-10.gl-display-flex.gl-align-items-baseline
       = f.check_box :external do
-        External
-      %p.light
-        External users cannot see internal or private projects unless access is explicitly granted. Also, external users cannot create projects, groups, or personal snippets.
+        = s_('AdminUsers|External')
+      %p.light.gl-pl-2
+        = s_('AdminUsers|External users cannot see internal or private projects unless access is explicitly granted. Also, external users cannot create projects, groups, or personal snippets.')
       %row.hidden#warning_external_automatically_set.hidden
         .badge.badge-warning.text-white
-          = _('Automatically marked as default internal user')
+          = s_('AdminUsers|Automatically marked as default internal user')

changelogs/unreleased/17137.yml

+---
+title: Align "External" access level row in the user admin form
+merge_request: 34455
+author: Eduardo Sanz @esanzgar
+type: fixed

locale/gitlab.pot

@@ -1774,15 +1774,24 @@ msgstr ""
 msgid "AdminUsers|2FA Enabled"
 msgstr ""
 
+msgid "AdminUsers|Access"
+msgstr ""
+
 msgid "AdminUsers|Active"
 msgstr ""
 
 msgid "AdminUsers|Admin"
 msgstr ""
 
+msgid "AdminUsers|Administrators have access to all groups, projects and users and can manage all features in this installation"
+msgstr ""
+
 msgid "AdminUsers|Admins"
 msgstr ""
 
+msgid "AdminUsers|Automatically marked as default internal user"
+msgstr ""
+
 msgid "AdminUsers|Block"
 msgstr ""
 
@@ -1831,6 +1840,9 @@ msgstr ""
 msgid "AdminUsers|External"
 msgstr ""
 
+msgid "AdminUsers|External users cannot see internal or private projects unless access is explicitly granted. Also, external users cannot create projects, groups, or personal snippets."
+msgstr ""
+
 msgid "AdminUsers|Is using seat"
 msgstr ""
 
@@ -1855,6 +1867,12 @@ msgstr ""
 msgid "AdminUsers|Reactivating a user will:"
 msgstr ""
 
+msgid "AdminUsers|Regular"
+msgstr ""
+
+msgid "AdminUsers|Regular users have access to their groups and projects"
+msgstr ""
+
 msgid "AdminUsers|Restore user access to the account, including web, Git and API."
 msgstr ""
 
@@ -1909,6 +1927,9 @@ msgstr ""
 msgid "AdminUsers|You are about to permanently delete the user %{username}. This will delete all of the issues, merge requests, and groups linked to them. To avoid data loss, consider using the %{strong_start}block user%{strong_end} feature instead. Once you %{strong_start}Delete user%{strong_end}, it cannot be undone or recovered."
 msgstr ""
 
+msgid "AdminUsers|You cannot remove your own admin rights."
+msgstr ""
+
 msgid "Administration"
 msgstr ""
 
@@ -3423,9 +3444,6 @@ msgstr ""
 msgid "Automatically create merge requests for vulnerabilities that have fixes available."
 msgstr ""
 
-msgid "Automatically marked as default internal user"
-msgstr ""
-
 msgid "Automatically resolved"
 msgstr ""