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

Externalize strings of chat page in user profile

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

4 files changed, 36 insertions, 10 deletions

diff --git a/app/views/profiles/chat_names/_chat_name.html.haml b/app/views/profiles/chat_names/_chat_name.html.haml
index 9e82e47c1e1..ff67f92ad07 100644
--- a/app/views/profiles/chat_names/_chat_name.html.haml
+++ b/app/views/profiles/chat_names/_chat_name.html.haml
@@ -21,7 +21,7 @@
     - if chat_name.last_used_at
       = time_ago_with_tooltip(chat_name.last_used_at)
     - else
-      Never
+      = _('Never')
 
   %td
-    = link_to 'Remove', profile_chat_name_path(chat_name), method: :delete, class: 'btn btn-danger float-right', data: { confirm: 'Are you sure you want to revoke this nickname?' }
+    = link_to _('Remove'), profile_chat_name_path(chat_name), method: :delete, class: 'btn btn-danger float-right', data: { confirm: _('Are you sure you want to revoke this nickname?') }
diff --git a/app/views/profiles/chat_names/index.html.haml b/app/views/profiles/chat_names/index.html.haml
index 4b6e419af50..0c8098a97d5 100644
--- a/app/views/profiles/chat_names/index.html.haml
+++ b/app/views/profiles/chat_names/index.html.haml
@@ -1,4 +1,4 @@
-- page_title 'Chat'
+- page_title _('Chat')
 - @content_class = "limit-container-width" unless fluid_layout
 
 .row.prepend-top-default
@@ -6,7 +6,7 @@
     %h4.prepend-top-0
       = page_title
     %p
-      You can see your Chat accounts.
+      = _('You can see your chat accounts.')
 
   .col-lg-8
     %h5 Active chat names (#{@chat_names.size})
@@ -16,15 +16,15 @@
         %table.table.chat-names
           %thead
             %tr
-              %th Project
-              %th Service
-              %th Team domain
-              %th Nickname
-              %th Last used
+              %th= _('Project')
+              %th= _('Service')
+              %th= _('Team domain')
+              %th= _('Nickname')
+              %th= _('Last used')
               %th
           %tbody
             = render @chat_names
 
     - else
       .settings-message.text-center
-        You don't have any active chat names.
+        = _("You don't have any active chat names.")
diff --git a/changelogs/unreleased/i18n-chat-of-user-profile.yml b/changelogs/unreleased/i18n-chat-of-user-profile.yml
new file mode 100644
index 00000000000..663b4ffc1a1
--- /dev/null
+++ b/changelogs/unreleased/i18n-chat-of-user-profile.yml
@@ -0,0 +1,5 @@
+---
+title: Externalize strings of chat page in user profile
+merge_request: 28632
+author:
+type: other
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index afb1f7efadd..9e7ff8d1847 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1126,6 +1126,9 @@ msgstr ""
 msgid "Are you sure you want to reset the health check token?"
 msgstr ""
 
+msgid "Are you sure you want to revoke this nickname?"
+msgstr ""
+
 msgid "Are you sure you want to stop this environment?"
 msgstr ""
 
@@ -5650,6 +5653,9 @@ msgstr ""
 msgid "Last updated"
 msgstr ""
 
+msgid "Last used"
+msgstr ""
+
 msgid "LastPushEvent|You pushed to"
 msgstr ""
 
@@ -6386,6 +6392,9 @@ msgstr ""
 msgid "Next"
 msgstr ""
 
+msgid "Nickname"
+msgstr ""
+
 msgid "No"
 msgstr ""
 
@@ -8735,6 +8744,9 @@ msgstr ""
 msgid "Serverless|There is currently no function data available from Knative. This could be for a variety of reasons including:"
 msgstr ""
 
+msgid "Service"
+msgstr ""
+
 msgid "Service Templates"
 msgstr ""
 
@@ -9520,6 +9532,9 @@ msgstr ""
 msgid "Team"
 msgstr ""
 
+msgid "Team domain"
+msgstr ""
+
 msgid "Template"
 msgstr ""
 
@@ -11334,6 +11349,9 @@ msgstr ""
 msgid "You can resolve the merge conflict using either the Interactive mode, by choosing %{use_ours} or %{use_theirs} buttons, or by editing the files directly. Commit these changes into %{branch_name}"
 msgstr ""
 
+msgid "You can see your chat accounts."
+msgstr ""
+
 msgid "You can set up jobs to only use Runners with specific tags. Separate tags with commas."
 msgstr ""
 
@@ -11370,6 +11388,9 @@ msgstr ""
 msgid "You do not have permission to leave this %{namespaceType}."
 msgstr ""
 
+msgid "You don't have any active chat names."
+msgstr ""
+
 msgid "You don't have any applications"
 msgstr ""