Merge branch 'eread/edit-ssh-key-title-ui-text' into 'master'

Edit SSH key title UI text

See merge request gitlab-org/gitlab!83916

app/views/profiles/keys/_form.html.haml

@@ -9,9 +9,9 @@
       %p.form-text.text-muted= s_('Profiles|Begins with %{ssh_key_algorithms}.') % { ssh_key_algorithms: ssh_key_allowed_algorithms }
     .form-row
       .col.form-group
-        = f.label :title, _('Title'), class: 'label-bold'
-        = f.text_field :title, class: "form-control gl-form-input input-lg qa-key-title-field", required: true, placeholder: s_('Profiles|e.g. My MacBook key')
-        %p.form-text.text-muted= s_('Profiles|Give your individual key a title. This will be publicly visible.')
+        = f.label :title, s_('Profiles|Title'), class: 'label-bold'
+        = f.text_field :title, class: "form-control gl-form-input input-lg qa-key-title-field", required: true, placeholder: s_('Profiles|Example: MacBook key')
+        %p.form-text.text-muted= s_('Profiles|Key titles are publicly visible.')
 
       .col.form-group
         = f.label :expires_at, s_('Profiles|Expiration date'), class: 'label-bold'

locale/gitlab.pot

@@ -28661,6 +28661,9 @@ msgstr ""
 msgid "Profiles|Enter your pronouns to let people know how to refer to you"
 msgstr ""
 
+msgid "Profiles|Example: MacBook key"
+msgstr ""
+
 msgid "Profiles|Expiration date"
 msgstr ""
 
@@ -28682,9 +28685,6 @@ msgstr ""
 msgid "Profiles|GitLab is unable to verify your identity automatically. For security purposes, you must set a password by %{openingTag}resetting your password%{closingTag} to delete your account."
 msgstr ""
 
-msgid "Profiles|Give your individual key a title. This will be publicly visible."
-msgstr ""
-
 msgid "Profiles|If after setting a password, the option to delete your account is still not available, please email %{data_request} to begin the account deletion process."
 msgstr ""
 
@@ -28721,6 +28721,9 @@ msgstr ""
 msgid "Profiles|Key can still be used after expiration."
 msgstr ""
 
+msgid "Profiles|Key titles are publicly visible."
+msgstr ""
+
 msgid "Profiles|Key usable beyond expiration date."
 msgstr ""
 
@@ -28826,6 +28829,9 @@ msgstr ""
 msgid "Profiles|Time settings"
 msgstr ""
 
+msgid "Profiles|Title"
+msgstr ""
+
 msgid "Profiles|Two-Factor Authentication"
 msgstr ""
 
@@ -28907,9 +28913,6 @@ msgstr ""
 msgid "Profiles|Your status"
 msgstr ""
 
-msgid "Profiles|e.g. My MacBook key"
-msgstr ""
-
 msgid "Profiles|https://website.com"
 msgstr ""
 

spec/views/profiles/keys/_form.html.haml_spec.rb

@@ -30,8 +30,8 @@ RSpec.describe 'profiles/keys/_form.html.haml' do
     end
 
     it 'has the title field', :aggregate_failures do
-      expect(rendered).to have_field('Title', type: 'text', placeholder: 'e.g. My MacBook key')
-      expect(rendered).to have_text('Give your individual key a title. This will be publicly visible.')
+      expect(rendered).to have_field('Title', type: 'text', placeholder: 'Example: MacBook key')
+      expect(rendered).to have_text('Key titles are publicly visible.')
     end
 
     it 'has the expires at field', :aggregate_failures do