Merge branch 'i18n-active_sessions-in-user-profile' into 'master'

Externalize strings of active sessions page in user profile

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

4 files changed, 28 insertions, 7 deletions

diff --git a/app/views/profiles/active_sessions/_active_session.html.haml b/app/views/profiles/active_sessions/_active_session.html.haml
index 2bf514d72a5..bb31049111c 100644
--- a/app/views/profiles/active_sessions/_active_session.html.haml
+++ b/app/views/profiles/active_sessions/_active_session.html.haml
@@ -8,18 +8,19 @@
     %div
       %strong= active_session.ip_address
     - if is_current_session
-      %div This is your current session
+      %div
+        = _('This is your current session')
     - else
       %div
-        Last accessed on
+        = _('Last accessed on')
         = l(active_session.updated_at, format: :short)
 
     %div
       %strong= active_session.browser
-      on
+      = s_('ProfileSession|on')
       %strong= active_session.os
 
     %div
-      %strong Signed in
-      on
+      %strong= _('Signed in')
+      = s_('ProfileSession|on')
       = l(active_session.created_at, format: :short)
diff --git a/app/views/profiles/active_sessions/index.html.haml b/app/views/profiles/active_sessions/index.html.haml
index 8688a52843d..d651319fc3f 100644
--- a/app/views/profiles/active_sessions/index.html.haml
+++ b/app/views/profiles/active_sessions/index.html.haml
@@ -1,4 +1,4 @@
-- page_title 'Active Sessions'
+- page_title _('Active Sessions')
 - @content_class = "limit-container-width" unless fluid_layout
 
 .row.prepend-top-default
@@ -6,7 +6,7 @@
     %h4.prepend-top-0
       = page_title
     %p
-      This is a list of devices that have logged into your account. Revoke any sessions that you do not recognize.
+      = _('This is a list of devices that have logged into your account. Revoke any sessions that you do not recognize.')
   .col-lg-8
     .append-bottom-default
 
diff --git a/changelogs/unreleased/i18n-active_sessions-in-user-profile.yml b/changelogs/unreleased/i18n-active_sessions-in-user-profile.yml
new file mode 100644
index 00000000000..fe6eb3a2bf7
--- /dev/null
+++ b/changelogs/unreleased/i18n-active_sessions-in-user-profile.yml
@@ -0,0 +1,5 @@
+---
+title: Externalize strings of active sessions page in user profile
+merge_request: 28590
+author: antony liu
+type: other
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index d33393ffc26..9c075d8876a 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -5635,6 +5635,9 @@ msgstr[1] ""
 msgid "Last Pipeline"
 msgstr ""
 
+msgid "Last accessed on"
+msgstr ""
+
 msgid "Last activity"
 msgstr ""
 
@@ -7264,6 +7267,9 @@ msgstr ""
 msgid "Profile Settings"
 msgstr ""
 
+msgid "ProfileSession|on"
+msgstr ""
+
 msgid "Profiles| You are about to permanently delete %{yourAccount}, and all of the issues, merge requests, and groups linked to your account. Once you confirm %{deleteAccount}, it cannot be undone or recovered."
 msgstr ""
 
@@ -8944,6 +8950,9 @@ msgstr ""
 msgid "Sign-up restrictions"
 msgstr ""
 
+msgid "Signed in"
+msgstr ""
+
 msgid "Signed in with %{authentication} authentication"
 msgstr ""
 
@@ -10050,12 +10059,18 @@ msgstr ""
 msgid "This is a delayed job to run in %{remainingTime}"
 msgstr ""
 
+msgid "This is a list of devices that have logged into your account. Revoke any sessions that you do not recognize."
+msgstr ""
+
 msgid "This is a security log of important events involving your account."
 msgstr ""
 
 msgid "This is the author's first Merge Request to this project."
 msgstr ""
 
+msgid "This is your current session"
+msgstr ""
+
 msgid "This issue is confidential"
 msgstr ""