Merge branch 'i18n-admin-dashboard' into 'master'

Externalize i18n strings from admin dashboard

See merge request gitlab-org/gitlab!41387

app/views/admin/dashboard/index.html.haml

@@ -17,37 +17,34 @@
         .well-segment.well-centered
           = link_to admin_projects_path do
             %h3.text-center
-              Projects:
-              = approximate_count_with_delimiters(@counts, Project)
+              = s_('AdminArea|Projects: %{number_of_projects}') % { number_of_projects: approximate_count_with_delimiters(@counts, Project) }
           %hr
-          = link_to('New project', new_project_path, class: "btn btn-success gl-w-full")
+          = link_to(s_('AdminArea|New project'), new_project_path, class: "btn btn-success gl-w-full")
     .col-sm-4
       .info-well.dark-well
         .well-segment.well-centered
           = link_to admin_users_path do
             %h3.text-center
-              Users:
-              = approximate_count_with_delimiters(@counts, User)
+              = s_('AdminArea|Users: %{number_of_users}') % { number_of_users: approximate_count_with_delimiters(@counts, User) }
           %hr
           .btn-group.d-flex{ role: 'group' }
-            = link_to 'New user', new_admin_user_path, class: "btn btn-success gl-w-full"
+            = link_to s_('AdminArea|New user'), new_admin_user_path, class: "btn btn-success gl-w-full"
             = link_to s_('AdminArea|Users statistics'), admin_dashboard_stats_path, class: 'btn btn-primary gl-w-full'
     .col-sm-4
       .info-well.dark-well
         .well-segment.well-centered
           = link_to admin_groups_path do
             %h3.text-center
-              Groups:
-              = approximate_count_with_delimiters(@counts, Group)
+              = s_('AdminArea|Groups: %{number_of_groups}') % { number_of_groups: approximate_count_with_delimiters(@counts, Group) }
           %hr
-          = link_to 'New group', new_admin_group_path, class: "btn btn-success gl-w-full"
+          = link_to s_('AdminArea|New group'), new_admin_group_path, class: "btn btn-success gl-w-full"
   .row
     .col-md-4
       #js-admin-statistics-container
     .col-md-4
       .info-well
         .well-segment.admin-well.admin-well-features
-          %h4 Features
+          %h4= s_('AdminArea|Features')
           = feature_entry(_('Sign up'),
             href: general_admin_application_settings_path(anchor: 'js-signup-settings'),
             enabled: allow_signup?)
@@ -87,42 +84,41 @@
       .info-well
         .well-segment.admin-well
           %h4
-            Components
+            = s_('AdminArea|Components')
             - if Gitlab::CurrentSettings.version_check_enabled
               .float-right
                 = version_status_badge
           %p
-            %a{ href: general_admin_application_settings_path }
-              GitLab
+            = link_to _('GitLab'), general_admin_application_settings_path
             %span.float-right
               = Gitlab::VERSION
               = "(#{Gitlab.revision})"
           %p
-            GitLab Shell
+            = _('GitLab Shell')
             %span.float-right
               = Gitlab::Shell.version
           %p
-            GitLab Workhorse
+            = _('GitLab Workhorse')
             %span.float-right
               = gitlab_workhorse_version
           %p
-            GitLab API
+            = _('GitLab API')
             %span.float-right
               = API::API::version
           - if Gitlab.config.pages.enabled
             %p
-              GitLab Pages
+              = _('GitLab Pages')
               %span.float-right
                 = Gitlab::Pages::VERSION
 
           = render_if_exists 'admin/dashboard/geo'
 
           %p
-            Ruby
+            = _('Ruby')
             %span.float-right
               #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}
           %p
-            Rails
+            = _('Rails')
             %span.float-right
               #{Rails::VERSION::STRING}
           %p
@@ -130,12 +126,12 @@
             %span.float-right
               = Gitlab::Database.version
           %p
-            = link_to "Gitaly Servers", admin_gitaly_servers_path
+            = link_to _("Gitaly Servers"), admin_gitaly_servers_path
   .row
     .col-md-4
       .info-well
         .well-segment.admin-well
-          %h4 Latest projects
+          %h4= s_('AdminArea|Latest projects')
           - @projects.each do |project|
             %p
               = link_to project.full_name, admin_project_path(project), class: 'str-truncated-60'
@@ -144,7 +140,7 @@
     .col-md-4
       .info-well
         .well-segment.admin-well
-          %h4 Latest users
+          %h4= s_('AdminArea|Latest users')
           - @users.each do |user|
             %p
               = link_to [:admin, user], class: 'str-truncated-60' do
@@ -154,7 +150,7 @@
     .col-md-4
       .info-well
         .well-segment.admin-well
-          %h4 Latest groups
+          %h4= s_('AdminArea|Latest groups')
           - @groups.each do |group|
             %p
               = link_to [:admin, group], class: 'str-truncated-60' do

changelogs/unreleased/i18n-admin-dashboard.yml

+---
+title: Externalize i18n strings from admin dashboard
+merge_request: 41387
+author: Takuya Noguchi
+type: other

locale/gitlab.pot

@@ -1776,21 +1776,51 @@ msgstr ""
 msgid "AdminArea|Bots"
 msgstr ""
 
+msgid "AdminArea|Components"
+msgstr ""
+
 msgid "AdminArea|Developer"
 msgstr ""
 
+msgid "AdminArea|Features"
+msgstr ""
+
+msgid "AdminArea|Groups: %{number_of_groups}"
+msgstr ""
+
 msgid "AdminArea|Guest"
 msgstr ""
 
 msgid "AdminArea|Included Free in license"
 msgstr ""
 
+msgid "AdminArea|Latest groups"
+msgstr ""
+
+msgid "AdminArea|Latest projects"
+msgstr ""
+
+msgid "AdminArea|Latest users"
+msgstr ""
+
 msgid "AdminArea|Maintainer"
 msgstr ""
 
+msgid "AdminArea|New group"
+msgstr ""
+
+msgid "AdminArea|New project"
+msgstr ""
+
+msgid "AdminArea|New user"
+msgstr ""
+
 msgid "AdminArea|Owner"
 msgstr ""
 
+msgid "AdminArea|Projects: %{number_of_projects}"
+msgstr ""
+
 msgid "AdminArea|Reporter"
 msgstr ""
 
@@ -1818,6 +1848,9 @@ msgstr ""
 msgid "AdminArea|Users without a Group and Project"
 msgstr ""
 
+msgid "AdminArea|Users: %{number_of_users}"
+msgstr ""
+
 msgid "AdminArea|You’re about to stop all jobs.This will halt all current jobs that are running."
 msgstr ""
 
@@ -11696,9 +11729,15 @@ msgstr ""
 msgid "GitHub import"
 msgstr ""
 
+msgid "GitLab"
+msgstr ""
+
 msgid "GitLab / Unsubscribe"
 msgstr ""
 
+msgid "GitLab API"
+msgstr ""
+
 msgid "GitLab Enterprise Edition %{plan}"
 msgstr ""
 
@@ -11711,12 +11750,18 @@ msgstr ""
 msgid "GitLab Issue"
 msgstr ""
 
+msgid "GitLab Pages"
+msgstr ""
+
 msgid "GitLab Service Desk is a simple way to allow people to create issues in your GitLab instance without needing their own user account. It provides a unique email address for end users to create issues in a project, and replies can be sent either through the GitLab interface or by email. End users will only see the thread through email."
 msgstr ""
 
 msgid "GitLab Shared Runners execute code of different projects on the same Runner unless you configure GitLab Runner Autoscale with MaxBuilds 1 (which it is on GitLab.com)."
 msgstr ""
 
+msgid "GitLab Shell"
+msgstr ""
+
 msgid "GitLab Support Bot"
 msgstr ""
 
@@ -11726,6 +11771,9 @@ msgstr ""
 msgid "GitLab User"
 msgstr ""
 
+msgid "GitLab Workhorse"
+msgstr ""
+
 msgid "GitLab allows you to continue using your license even if you exceed the number of seats you purchased. You will be required to pay for these seats when you renew your license."
 msgstr ""
 
@@ -20502,6 +20550,9 @@ msgstr ""
 msgid "README"
 msgstr ""
 
+msgid "Rails"
+msgstr ""
+
 msgid "Rake Tasks Help"
 msgstr ""
 
@@ -21528,6 +21579,9 @@ msgstr ""
 msgid "Rook"
 msgstr ""
 
+msgid "Ruby"
+msgstr ""
+
 msgid "Rule name is already taken."
 msgstr ""