Merge branch 'Externalize-strings-in-registrations-edit.html.erb' into 'master'

Externalize strings in registrations/edit.html.erb

See merge request gitlab-org/gitlab!58268

app/views/devise/registrations/edit.html.erb

@@ -9,20 +9,20 @@
   <div><%= f.label :name %><br />
     <%= f.text_field :name %></div>
 
-  <div><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
+  <div><%= f.label :password %> <i><%= _("(leave blank if you don't want to change it)") %></i><br />
   <%= f.password_field :password %></div>
 
   <div><%= f.label :password_confirmation %><br />
   <%= f.password_field :password_confirmation %></div>
 
-  <div><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+  <div><%= f.label :current_password %> <i><%= _("(we need your current password to confirm your changes)") %></i><br />
   <%= f.password_field :current_password %></div>
 
-<div><%= f.submit "Update", class: "input_button" %></div>
+<div><%= f.submit _("Update"), class: "input_button" %></div>
 <% end %>
 
-<h3>Cancel your account</h3>
+<h3><%= _('Cancel your account') %></h3>
 
-<p>Unhappy? <%= link_to "Cancel your account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %>.</p>
+<p><%= _('Unhappy?') %> <%= link_to _("Cancel your account"), registration_path(resource_name), data: { confirm: _("Are you sure?") }, method: :delete %>.</p>
 
-<%= link_to "Back", :back %>
+<%= link_to _("Back"), :back %>

changelogs/unreleased/Externalize-strings-in-registrations-edit-html-erb.yml

+---
+title: Externalize strings in registrations/edit.html.erb
+merge_request: 58268
+author: nuwe1
+type: other

locale/gitlab.pot

@@ -1039,6 +1039,9 @@ msgstr ""
 msgid "(deleted)"
 msgstr ""
 
+msgid "(leave blank if you don't want to change it)"
+msgstr ""
+
 msgid "(max size 15 MB)"
 msgstr ""
 
@@ -1048,6 +1051,9 @@ msgstr ""
 msgid "(revoked)"
 msgstr ""
 
+msgid "(we need your current password to confirm your changes)"
+msgstr ""
+
 msgid "* * * * *"
 msgstr ""
 
@@ -4621,6 +4627,9 @@ msgstr ""
 msgid "AwardEmoji|No emojis found."
 msgstr ""
 
+msgid "Back"
+msgstr ""
+
 msgid "Back to page %{number}"
 msgstr ""
 
@@ -5571,6 +5580,9 @@ msgstr ""
 msgid "Cancel this job"
 msgstr ""
 
+msgid "Cancel your account"
+msgstr ""
+
 msgid "Cancel, keep project"
 msgstr ""
 
@@ -32922,6 +32934,9 @@ msgstr ""
 msgid "Unfortunately, your email message to GitLab could not be processed."
 msgstr ""
 
+msgid "Unhappy?"
+msgstr ""
+
 msgid "Uninstall"
 msgstr ""