Merge branch 'i18n-email-of-user-profile' into 'master'

Externalize strings of email page in user profile

See merge request gitlab-org/gitlab-ce!28587

app/controllers/profiles/emails_controller.rb

@@ -28,9 +28,9 @@ class Profiles::EmailsController < Profiles::ApplicationController
 
   def resend_confirmation_instructions
     if Emails::ConfirmService.new(current_user, user: current_user).execute(@email)
-      flash[:notice] = "Confirmation email sent to #{@email.email}"
+      flash[:notice] = _("Confirmation email sent to %{email}") % { email: @email.email }
     else
-      flash[:alert] = "There was a problem sending the confirmation email"
+      flash[:alert] = _("There was a problem sending the confirmation email")
     end
 
     redirect_to profile_emails_url

app/views/profiles/emails/index.html.haml

-- page_title "Emails"
+- page_title _('Emails')
 - @content_class = "limit-container-width" unless fluid_layout
 
 .row.prepend-top-default
@@ -6,58 +6,58 @@
     %h4.prepend-top-0
       = page_title
     %p
-      Control emails linked to your account
+      = _('Control emails linked to your account')
   .col-lg-8
     %h4.prepend-top-0
-      Add email address
+      = _('Add email address')
     = form_for 'email', url: profile_emails_path do |f|
       .form-group
-        = f.label :email, class: 'label-bold'
+        = f.label :email, _('Email'), class: 'label-bold'
         = f.text_field :email, class: 'form-control'
       .prepend-top-default
-        = f.submit 'Add email address', class: 'btn btn-success'
+        = f.submit _('Add email address'), class: 'btn btn-success'
     %hr
     %h4.prepend-top-0
-      Linked emails (#{@emails.count + 1})
+      = _('Linked emails (%{email_count})') % { email_count: @emails.count + 1 }
     .account-well.append-bottom-default
       %ul
         %li
-          Your Primary Email will be used for avatar detection.
+          = _('Your Primary Email will be used for avatar detection.')
         %li
-          Your Commit Email will be used for web based operations, such as edits and merges.
+          = _('Your Commit Email will be used for web based operations, such as edits and merges.')
         %li
-          Your Default Notification Email will be used for account notifications if a
-          = link_to 'group-specific email address', profile_notifications_path
-          is not set.
+          - address = profile_notifications_path
+          - notification_message = _('Your Default Notification Email will be used for account notifications if a %{openingTag}group-specific email address%{closingTag} is not set.') % { openingTag: "<a href='#{address}'>".html_safe, closingTag: '</a>'.html_safe}
+          = notification_message.html_safe
         %li
-          Your Public Email will be displayed on your public profile.
+          = _('Your Public Email will be displayed on your public profile.')
         %li
-          All email addresses will be used to identify your commits.
+          = _('All email addresses will be used to identify your commits.')
     %ul.content-list
       %li
         = render partial: 'shared/email_with_badge', locals: { email: @primary_email, verified: current_user.confirmed? }
         %span.float-right
-          %span.badge.badge-success Primary email
+          %span.badge.badge-success= s_('Profiles|Primary email')
           - if @primary_email === current_user.commit_email
-            %span.badge.badge-info Commit email
+            %span.badge.badge-info= s_('Profiles|Commit email')
           - if @primary_email === current_user.public_email
-            %span.badge.badge-info Public email
+            %span.badge.badge-info= s_('Profiles|Public email')
           - if @primary_email === current_user.notification_email
-            %span.badge.badge-info Default notification email
+            %span.badge.badge-info= s_('Profiles|Default notification email')
       - @emails.each do |email|
         %li
           = render partial: 'shared/email_with_badge', locals: { email: email.email, verified: email.confirmed? }
           %span.float-right
             - if email.email === current_user.commit_email
-              %span.badge.badge-info Commit email
+              %span.badge.badge-info= s_('Profiles|Commit email')
             - if email.email === current_user.public_email
-              %span.badge.badge-info Public email
+              %span.badge.badge-info= s_('Profiles|Public email')
             - if email.email === current_user.notification_email
-              %span.badge.badge-info Notification email
+              %span.badge.badge-info= s_('Profiles|Notification email')
             - unless email.confirmed?
-              - confirm_title = "#{email.confirmation_sent_at ? 'Resend' : 'Send'} confirmation email"
+              - confirm_title = "#{email.confirmation_sent_at ? _('Resend confirmation email') : _('Send confirmation email')}"
               = link_to confirm_title, resend_confirmation_instructions_profile_email_path(email), method: :put, class: 'btn btn-sm btn-warning prepend-left-10'
 
-            = link_to profile_email_path(email), data: { confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-sm btn-danger prepend-left-10' do
-              %span.sr-only Remove
+            = link_to profile_email_path(email), data: { confirm: _('Are you sure?')}, method: :delete, class: 'btn btn-sm btn-danger prepend-left-10' do
+              %span.sr-only= _('Remove')
               = icon('trash')

app/views/shared/_email_with_badge.html.haml

 - css_classes = %w(badge badge-verification-status)
 - css_classes << (verified ? 'verified': 'unverified')
-- text = verified ? 'Verified' : 'Unverified'
+- text = verified ? _('Verified') : _('Unverified')
 
 .email-badge
   .email-badge-email= email

changelogs/unreleased/i18n-email-of-user-profile.yml

+---
+title: Externalize strings of email page in user profile
+merge_request: 28587
+author: antony liu
+type: other

locale/gitlab.pot

@@ -565,6 +565,9 @@ msgstr ""
 msgid "Add comment now"
 msgstr ""
 
+msgid "Add email address"
+msgstr ""
+
 msgid "Add header and footer to emails. Please note that color settings will only be applied within the application interface"
 msgstr ""
 
@@ -775,6 +778,9 @@ msgstr ""
 msgid "All changes are committed"
 msgstr ""
 
+msgid "All email addresses will be used to identify your commits."
+msgstr ""
+
 msgid "All features are enabled for blank projects, from templates, or when importing, but you can disable them afterward in the project settings."
 msgstr ""
 
@@ -2798,6 +2804,9 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
+msgid "Confirmation email sent to %{email}"
+msgstr ""
+
 msgid "Confirmation required"
 msgstr ""
 
@@ -2906,6 +2915,9 @@ msgstr ""
 msgid "ContributorsPage|Please wait a moment, this page will automatically refresh when ready."
 msgstr ""
 
+msgid "Control emails linked to your account"
+msgstr ""
+
 msgid "Control the display of third party offers."
 msgstr ""
 
@@ -5817,6 +5829,9 @@ msgid_plural "Limited to showing %d events at most"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "Linked emails (%{email_count})"
+msgstr ""
+
 msgid "LinkedIn"
 msgstr ""
 
@@ -7474,6 +7489,9 @@ msgstr ""
 msgid "Profiles|Click on icon to activate signin with one of the following services"
 msgstr ""
 
+msgid "Profiles|Commit email"
+msgstr ""
+
 msgid "Profiles|Connect"
 msgstr ""
 
@@ -7486,6 +7504,9 @@ msgstr ""
 msgid "Profiles|Current status"
 msgstr ""
 
+msgid "Profiles|Default notification email"
+msgstr ""
+
 msgid "Profiles|Delete Account"
 msgstr ""
 
@@ -7552,6 +7573,9 @@ msgstr ""
 msgid "Profiles|No file chosen"
 msgstr ""
 
+msgid "Profiles|Notification email"
+msgstr ""
+
 msgid "Profiles|Organization"
 msgstr ""
 
@@ -7561,6 +7585,9 @@ msgstr ""
 msgid "Profiles|Position and size your new avatar"
 msgstr ""
 
+msgid "Profiles|Primary email"
+msgstr ""
+
 msgid "Profiles|Private contributions"
 msgstr ""
 
@@ -7570,6 +7597,9 @@ msgstr ""
 msgid "Profiles|Public Avatar"
 msgstr ""
 
+msgid "Profiles|Public email"
+msgstr ""
+
 msgid "Profiles|Remove avatar"
 msgstr ""
 
@@ -8466,6 +8496,9 @@ msgstr ""
 msgid "Require users to prove ownership of custom domains"
 msgstr ""
 
+msgid "Resend confirmation email"
+msgstr ""
+
 msgid "Resend invite"
 msgstr ""
 
@@ -8870,6 +8903,9 @@ msgstr ""
 msgid "Selecting a GitLab user will add a link to the GitLab user in the descriptions of issues and comments (e.g. \"By <a href=\"#\">@johnsmith</a>\"). It will also associate and/or assign these issues and comments with the selected user."
 msgstr ""
 
+msgid "Send confirmation email"
+msgstr ""
+
 msgid "Send email"
 msgstr ""
 
@@ -10149,6 +10185,9 @@ msgstr ""
 msgid "There was a problem communicating with your device."
 msgstr ""
 
+msgid "There was a problem sending the confirmation email"
+msgstr ""
+
 msgid "There was an error %{message} todo."
 msgstr ""
 
@@ -11871,9 +11910,15 @@ msgstr ""
 msgid "YouTube"
 msgstr ""
 
+msgid "Your Commit Email will be used for web based operations, such as edits and merges."
+msgstr ""
+
 msgid "Your Conversational Development Index gives an overview of how you are using GitLab from a feature perspective. View how you compare with other organizations, discover features you are not using, and learn best practices through blog posts and white papers."
 msgstr ""
 
+msgid "Your Default Notification Email will be used for account notifications if a %{openingTag}group-specific email address%{closingTag} is not set."
+msgstr ""
+
 msgid "Your GPG keys (%{count})"
 msgstr ""
 
@@ -11883,12 +11928,18 @@ msgstr ""
 msgid "Your Kubernetes cluster information on this page is still editable, but you are advised to disable and reconfigure"
 msgstr ""
 
+msgid "Your Primary Email will be used for avatar detection."
+msgstr ""
+
 msgid "Your Projects (default)"
 msgstr ""
 
 msgid "Your Projects' Activity"
 msgstr ""
 
+msgid "Your Public Email will be displayed on your public profile."
+msgstr ""
+
 msgid "Your SSH keys (%{count})"
 msgstr ""