diff options
author | Luke Bennett <lbennett@gitlab.com> | 2019-01-28 07:22:43 +0300 |
---|---|---|
committer | Luke Bennett <lbennett@gitlab.com> | 2019-01-28 07:28:53 +0300 |
commit | 9740a74ec65449ec075260923e5269d3c0651ee1 (patch) | |
tree | e9dff960a95a4f5276236855ef953e56d93778b9 | |
parent | c243b154abf5c29ba35fd2fab2ca3bc010fdc324 (diff) |
Externalize admin settings stringsleftover-ext
-rw-r--r-- | app/views/admin/background_jobs/show.html.haml | 9 | ||||
-rw-r--r-- | app/views/admin/dashboard/index.html.haml | 98 | ||||
-rw-r--r-- | app/views/admin/health_check/show.html.haml | 2 | ||||
-rw-r--r-- | app/views/admin/logs/show.html.haml | 6 | ||||
-rw-r--r-- | app/views/admin/requests_profiles/index.html.haml | 8 | ||||
-rw-r--r-- | app/views/admin/system_info/show.html.haml | 16 | ||||
-rw-r--r-- | changelogs/unreleased/leftover-ext.yml | 5 | ||||
-rw-r--r-- | locale/gitlab.pot | 138 |
8 files changed, 208 insertions, 74 deletions
diff --git a/app/views/admin/background_jobs/show.html.haml b/app/views/admin/background_jobs/show.html.haml index a0a00ac5d96..de4a97b6f44 100644 --- a/app/views/admin/background_jobs/show.html.haml +++ b/app/views/admin/background_jobs/show.html.haml @@ -1,10 +1,11 @@ - @no_container = true -- page_title "Background Jobs" +- page_title _('Background Jobs') %div{ class: container_class } - %h3.page-title Background Jobs - %p.light GitLab uses #{link_to "sidekiq", "http://sidekiq.org/"} library for async job processing - + %h3.page-title= _('Background Jobs') + - link_start = '<a href="https://sidekiq.org" target="_blank" rel="noopener noreferrer">'.html_safe + %p.light + = _("GitLab uses the %{link_start}sidekiq%{link_end} library for asyc job processing").html_safe % { link_start: link_start, link_end: '</a>'.html_safe } %hr .card %iframe{ src: sidekiq_path, width: '100%', height: 970, style: "border: 0" } diff --git a/app/views/admin/dashboard/index.html.haml b/app/views/admin/dashboard/index.html.haml index 6756299cf43..9c6a975cb2f 100644 --- a/app/views/admin/dashboard/index.html.haml +++ b/app/views/admin/dashboard/index.html.haml @@ -1,5 +1,5 @@ - @no_container = true -- breadcrumb_title "Dashboard" +- breadcrumb_title _('Dashboard') %div{ class: container_class } = render_if_exists 'admin/licenses/breakdown', license: @license @@ -11,154 +11,146 @@ .well-segment.well-centered = link_to admin_projects_path do %h3.text-center - Projects: + = _('Projects:') = approximate_count_with_delimiters(@counts, Project) %hr - = link_to('New project', new_project_path, class: "btn btn-success") + = link_to(_('New project'), new_project_path, class: "btn btn-success") .col-sm-4 .info-well.dark-well .well-segment.well-centered = link_to admin_users_path do %h3.text-center - Users: + = _('Users:') = approximate_count_with_delimiters(@counts, User) = render_if_exists 'admin/dashboard/users_statistics' %hr - = link_to 'New user', new_admin_user_path, class: "btn btn-success" + = link_to _('New user'), new_admin_user_path, class: "btn btn-success" .col-sm-4 .info-well.dark-well .well-segment.well-centered = link_to admin_groups_path do %h3.text-center - Groups: + = _('Groups:') = approximate_count_with_delimiters(@counts, Group) %hr - = link_to 'New group', new_admin_group_path, class: "btn btn-success" + = link_to _('New group'), new_admin_group_path, class: "btn btn-success" .row .col-md-4 .info-well .well-segment.admin-well.admin-well-statistics - %h4 Statistics + %h4= _('Statistics') %p - Forks + = _('Forks') %span.light.float-right = approximate_fork_count_with_delimiters(@counts) %p - Issues + = _('Issues') %span.light.float-right = approximate_count_with_delimiters(@counts, Issue) %p - Merge Requests + = _('Merge Requests') %span.light.float-right = approximate_count_with_delimiters(@counts, MergeRequest) %p - Notes + = _('Notes') %span.light.float-right = approximate_count_with_delimiters(@counts, Note) %p - Snippets + = _('Snippets') %span.light.float-right = approximate_count_with_delimiters(@counts, Snippet) %p - SSH Keys + = _('SSH Keys') %span.light.float-right = approximate_count_with_delimiters(@counts, Key) %p - Milestones + = _('Milestones') %span.light.float-right = approximate_count_with_delimiters(@counts, Milestone) %p - Active Users + = _('Active Users') %span.light.float-right = number_with_delimiter(User.active.count) .col-md-4 .info-well .well-segment.admin-well.admin-well-features - %h4 Features - - sign_up = "Sign up" - %p{ "aria-label" => "#{sign_up}: status " + (allow_signup? ? "on" : "off") } - = sign_up + %h4= _('Features') + %p{ "aria-label" => _("Sign up: status %{status}") % { status: allow_signup? ? "on" : "off" } } + = _('Sign up') %span.light.float-right = boolean_to_icon allow_signup? - - ldap = "LDAP" - %p{ "aria-label" => "#{ldap}: status " + (Gitlab.config.ldap.enabled ? "on" : "off") } - = ldap + %p{ "aria-label" => _("LDAP: status %{status}") % { status: Gitlab.config.ldap.enabled ? "on" : "off" } } + = _('LDAP') %span.light.float-right = boolean_to_icon Gitlab.config.ldap.enabled - - gravatar = "Gravatar" - %p{ "aria-label" => "#{gravatar}: status " + (gravatar_enabled? ? "on" : "off") } - = gravatar + %p{ "aria-label" => _("Gravatar: status %{status}") % { status: gravatar_enabled? ? "on" : "off" } } + = _('Gravatar') %span.light.float-right = boolean_to_icon gravatar_enabled? - - omniauth = "OmniAuth" - %p{ "aria-label" => "#{omniauth}: status " + (Gitlab::Auth.omniauth_enabled? ? "on" : "off") } - = omniauth + %p{ "aria-label" => _("OmniAuth: status %{status}") % { status: Gitlab::Auth.omniauth_enabled? ? "on" : "off" } } + = _('OmniAuth') %span.light.float-right = boolean_to_icon Gitlab::Auth.omniauth_enabled? - - reply_email = "Reply by email" - %p{ "aria-label" => "#{reply_email}: status " + (Gitlab::IncomingEmail.enabled? ? "on" : "off") } - = reply_email + %p{ "aria-label" => _("Reply by email: status %{status}") % { status: Gitlab::IncomingEmail.enabled? ? "on" : "off" } } + = _('Reply by email') %span.light.float-right = boolean_to_icon Gitlab::IncomingEmail.enabled? = render_if_exists 'admin/dashboard/elastic_and_geo' - - container_reg = "Container Registry" - %p{ "aria-label" => "#{container_reg}: status " + (Gitlab.config.registry.enabled ? "on" : "off") } - = container_reg + %p{ "aria-label" => _("Container Registry: status %{status}") % { status: Gitlab.config.registry.enabled ? "on" : "off" } } + = _('Container Registry') %span.light.float-right = boolean_to_icon Gitlab.config.registry.enabled - - gitlab_pages = 'GitLab Pages' - gitlab_pages_enabled = Gitlab.config.pages.enabled - %p{ "aria-label" => "#{gitlab_pages}: status " + (gitlab_pages_enabled ? "on" : "off") } - = gitlab_pages + %p{ "aria-label" => _("GitLab Pages: status %{status}") % { status: gitlab_pages_enabled ? "on" : "off" } } + = _('GitLab Pages') %span.light.float-right = boolean_to_icon gitlab_pages_enabled - - gitlab_shared_runners = 'Shared Runners' - gitlab_shared_runners_enabled = Gitlab.config.gitlab_ci.shared_runners_enabled - %p{ "aria-label" => "#{gitlab_shared_runners}: status " + (gitlab_shared_runners_enabled ? "on" : "off") } - = gitlab_shared_runners + %p{ "aria-label" => _("Shared Runners: status %{status}") % { status: gitlab_shared_runners_enabled ? "on" : "off" } } + = _('Shared Runners') %span.light.float-right = boolean_to_icon gitlab_shared_runners_enabled .col-md-4 .info-well .well-segment.admin-well %h4 - Components + = _('Components') - if Gitlab::CurrentSettings.version_check_enabled .float-right = version_status_badge %p - GitLab + = _('GitLab') %span.float-right = Gitlab::VERSION = "(#{Gitlab.revision})" %p - GitLab Shell + = _('GitLab Shell') %span.float-right = Gitlab::Shell.new.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 @@ -166,12 +158,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= _('Latest projects') - @projects.each do |project| %p = link_to project.full_name, admin_project_path(project), class: 'str-truncated-60' @@ -180,7 +172,7 @@ .col-md-4 .info-well .well-segment.admin-well - %h4 Latest users + %h4= _('Latest users') - @users.each do |user| %p = link_to [:admin, user], class: 'str-truncated-60' do @@ -190,7 +182,7 @@ .col-md-4 .info-well .well-segment.admin-well - %h4 Latest groups + %h4= _('Latest groups') - @groups.each do |group| %p = link_to [:admin, group], class: 'str-truncated-60' do diff --git a/app/views/admin/health_check/show.html.haml b/app/views/admin/health_check/show.html.haml index 0f5e97e288a..f73dbd0fd2d 100644 --- a/app/views/admin/health_check/show.html.haml +++ b/app/views/admin/health_check/show.html.haml @@ -27,7 +27,7 @@ %hr .card .card-header - Current Status: + = _('Current Status:') - if no_errors = icon('circle', class: 'cgreen') #{ s_('HealthCheck|Healthy') } diff --git a/app/views/admin/logs/show.html.haml b/app/views/admin/logs/show.html.haml index e4c0382a437..f75c8423d4c 100644 --- a/app/views/admin/logs/show.html.haml +++ b/app/views/admin/logs/show.html.haml @@ -1,5 +1,5 @@ - @no_container = true -- page_title "Logs" +- page_title _('Log') %div{ class: container_class } %ul.nav-links.log-tabs.nav.nav-tabs @@ -7,7 +7,7 @@ %li.nav-item = link_to klass.file_name, "##{klass.file_name_noext}", data: { toggle: 'tab' }, class: "#{active_when(klass == @loggers.first)} nav-link" .row-content-block - To prevent performance issues admin logs output the last 2000 lines + = _('To prevent performance issues admin logs output the last 2000 lines') .tab-content - @loggers.each do |klass| .tab-pane{ class: active_when(klass == @loggers.first), id: klass.file_name_noext } @@ -18,7 +18,7 @@ .float-right = link_to '#', class: 'log-bottom' do %i.fa.fa-arrow-down - Scroll down + = _('Scroll down') .file-content.logs %ol - klass.read_latest.each do |line| diff --git a/app/views/admin/requests_profiles/index.html.haml b/app/views/admin/requests_profiles/index.html.haml index adfc67d66d0..f08270b2a48 100644 --- a/app/views/admin/requests_profiles/index.html.haml +++ b/app/views/admin/requests_profiles/index.html.haml @@ -1,14 +1,12 @@ - @no_container = true -- page_title 'Requests Profiles' +- page_title _('Requests Profiles') %div{ class: container_class } %h3.page-title = page_title .bs-callout.clearfix - Pass the header - %code X-Profile-Token: #{@profile_token} - to profile the request + = _('Pass the header <code>X-Profile-Token: %{profile_token}</code> to profile the request').html_safe % { profile_token: @profile_token } - if @profiles.present? .prepend-top-default @@ -22,4 +20,4 @@ = link_to profile.time.to_s(:long), admin_requests_profile_path(profile) - else %p - No profiles found + = _('No profiles found') diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml index b19934e028d..09eea5e184f 100644 --- a/app/views/admin/system_info/show.html.haml +++ b/app/views/admin/system_info/show.html.haml @@ -1,30 +1,30 @@ - @no_container = true -- page_title "System Info" +- page_title _('System Info') %div{ class: container_class } .prepend-top-default .row .col-sm-4 .card.bg-light.light-well - %h4 CPU + %h4= _('CPU') .data - if @cpus - %h1 #{@cpus.length} cores + %h1= _("%{cpu_count} cores") % { cpu_count: @cpus.length } - else = icon('warning', class: 'text-warning') - Unable to collect CPU info + = _('Unable to collect CPU info') .col-sm-4 .card.bg-light.light-well - %h4 Memory Usage + %h4= _('Memory Usage') .data - if @memory %h1 #{number_to_human_size(@memory.active_bytes)} / #{number_to_human_size(@memory.total_bytes)} - else = icon('warning', class: 'text-warning') - Unable to collect memory info + = _('Unable to collect memory info') .col-sm-4 .card.bg-light.light-well - %h4 Disk Usage + %h4= _('Disk Usage') .data - @disks.each do |disk| %h1 #{number_to_human_size(disk[:bytes_used])} / #{number_to_human_size(disk[:bytes_total])} @@ -32,6 +32,6 @@ %p= disk[:mount_path] .col-sm-4 .card.bg-light.light-well - %h4 Uptime + %h4= _('Uptime') .data %h1= distance_of_time_in_words_to_now(Rails.application.config.booted_at) diff --git a/changelogs/unreleased/leftover-ext.yml b/changelogs/unreleased/leftover-ext.yml new file mode 100644 index 00000000000..6eec3c07069 --- /dev/null +++ b/changelogs/unreleased/leftover-ext.yml @@ -0,0 +1,5 @@ +--- +title: Externalize admin settings strings +merge_request: +author: +type: other diff --git a/locale/gitlab.pot b/locale/gitlab.pot index a72e921dcce..0606c8f54d0 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -117,6 +117,9 @@ msgid_plural "%{count} participants" msgstr[0] "" msgstr[1] "" +msgid "%{cpu_count} cores" +msgstr "" + msgid "%{filePath} deleted" msgstr "" @@ -363,6 +366,9 @@ msgstr "" msgid "Active Sessions" msgstr "" +msgid "Active Users" +msgstr "" + msgid "Activity" msgstr "" @@ -1230,6 +1236,9 @@ msgstr "" msgid "CONTRIBUTING" msgstr "" +msgid "CPU" +msgstr "" + msgid "Callback URL" msgstr "" @@ -2039,6 +2048,9 @@ msgstr "" msgid "CompareBranches|There isn't anything to compare." msgstr "" +msgid "Components" +msgstr "" + msgid "Confidential" msgstr "" @@ -2072,6 +2084,9 @@ msgstr "" msgid "Container Registry" msgstr "" +msgid "Container Registry: status %{status}" +msgstr "" + msgid "ContainerRegistry|Created" msgstr "" @@ -2312,6 +2327,9 @@ msgstr "" msgid "Current Branch" msgstr "" +msgid "Current Status:" +msgstr "" + msgid "CurrentUser|Profile" msgstr "" @@ -2653,6 +2671,9 @@ msgstr "" msgid "Discuss a specific suggestion or question that needs to be resolved" msgstr "" +msgid "Disk Usage" +msgstr "" + msgid "Dismiss" msgstr "" @@ -3130,6 +3151,9 @@ msgstr "" msgid "Faster as it re-uses the project workspace (falling back to clone if it doesn't exist)" msgstr "" +msgid "Features" +msgstr "" + msgid "Feb" msgstr "" @@ -3328,6 +3352,12 @@ msgstr "" msgid "GitHub import" msgstr "" +msgid "GitLab" +msgstr "" + +msgid "GitLab API" +msgstr "" + msgid "GitLab CI Linter has been moved" msgstr "" @@ -3337,15 +3367,30 @@ msgstr "" msgid "GitLab Import" msgstr "" +msgid "GitLab Pages" +msgstr "" + +msgid "GitLab Pages: status %{status}" +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 User" msgstr "" +msgid "GitLab Workhorse" +msgstr "" + msgid "GitLab project export" msgstr "" +msgid "GitLab uses the %{link_start}sidekiq%{link_end} library for asyc job processing" +msgstr "" + msgid "GitLab.com import" msgstr "" @@ -3400,6 +3445,12 @@ msgstr "" msgid "Graph" msgstr "" +msgid "Gravatar" +msgstr "" + +msgid "Gravatar: status %{status}" +msgstr "" + msgid "Group" msgstr "" @@ -3484,6 +3535,9 @@ msgstr "" msgid "Groups with access to <strong>%{project_name}</strong>" msgstr "" +msgid "Groups:" +msgstr "" + msgid "GroupsDropdown|Frequently visited" msgstr "" @@ -3966,6 +4020,12 @@ msgstr "" msgid "Kubernetes service integration has been deprecated. %{deprecated_message_content} your Kubernetes clusters using the new <a href=\"%{url}\"/>Kubernetes Clusters</a> page" msgstr "" +msgid "LDAP" +msgstr "" + +msgid "LDAP: status %{status}" +msgstr "" + msgid "LFS" msgstr "" @@ -4052,9 +4112,18 @@ msgstr "" msgid "Latest changes" msgstr "" +msgid "Latest groups" +msgstr "" + msgid "Latest pipeline for this branch" msgstr "" +msgid "Latest projects" +msgstr "" + +msgid "Latest users" +msgstr "" + msgid "Learn more" msgstr "" @@ -4147,6 +4216,9 @@ msgstr "" msgid "Locked to current projects" msgstr "" +msgid "Log" +msgstr "" + msgid "Logs" msgstr "" @@ -4270,6 +4342,9 @@ msgstr "" msgid "Members of <strong>%{project_name}</strong>" msgstr "" +msgid "Memory Usage" +msgstr "" + msgid "Merge Request" msgstr "" @@ -4572,6 +4647,9 @@ msgstr "" msgid "New tag" msgstr "" +msgid "New user" +msgstr "" + msgid "New..." msgstr "" @@ -4644,6 +4722,9 @@ msgstr "" msgid "No prioritised labels with such name or description" msgstr "" +msgid "No profiles found" +msgstr "" + msgid "No public groups" msgstr "" @@ -4695,6 +4776,9 @@ msgstr "" msgid "Note: Consider asking your GitLab administrator to configure %{github_integration_link}, which will allow login via GitHub and allow importing repositories without generating a Personal Access Token." msgstr "" +msgid "Notes" +msgstr "" + msgid "Notes|Are you sure you want to cancel creating this comment?" msgstr "" @@ -4797,6 +4881,12 @@ msgstr "" msgid "OfSearchInADropdown|Filter" msgstr "" +msgid "OmniAuth" +msgstr "" + +msgid "OmniAuth: status %{status}" +msgstr "" + msgid "One more item" msgid_plural "%d more items" msgstr[0] "" @@ -4904,6 +4994,9 @@ msgstr "" msgid "Part of merge request changes" msgstr "" +msgid "Pass the header <code>X-Profile-Token: %{profile_token}</code> to profile the request" +msgstr "" + msgid "Password" msgstr "" @@ -5573,6 +5666,9 @@ msgstr "" msgid "Projects that belong to a group are prefixed with the group namespace. Existing projects may be moved into a group." msgstr "" +msgid "Projects:" +msgstr "" + msgid "ProjectsDropdown|Frequently visited" msgstr "" @@ -5708,6 +5804,9 @@ msgstr "" msgid "README" msgstr "" +msgid "Rails" +msgstr "" + msgid "Read more" msgstr "" @@ -5815,6 +5914,12 @@ msgstr "" msgid "Rename folder" msgstr "" +msgid "Reply by email" +msgstr "" + +msgid "Reply by email: status %{status}" +msgstr "" + msgid "Reply to this email directly or %{view_it_on_gitlab}." msgstr "" @@ -5967,6 +6072,9 @@ msgstr "" msgid "Revoke" msgstr "" +msgid "Ruby" +msgstr "" + msgid "Run untagged jobs" msgstr "" @@ -6057,6 +6165,9 @@ msgstr "" msgid "Scope" msgstr "" +msgid "Scroll down" +msgstr "" + msgid "Scroll down to <strong>Google Code Project Hosting</strong> and enable the switch on the right." msgstr "" @@ -6339,6 +6450,9 @@ msgstr "" msgid "Shared Runners" msgstr "" +msgid "Shared Runners: status %{status}" +msgstr "" + msgid "Shared projects" msgstr "" @@ -6386,6 +6500,12 @@ msgstr "" msgid "Sign out" msgstr "" +msgid "Sign up" +msgstr "" + +msgid "Sign up: status %{status}" +msgstr "" + msgid "Sign-in restrictions" msgstr "" @@ -6656,6 +6776,9 @@ msgstr "" msgid "Starts at (UTC)" msgstr "" +msgid "Statistics" +msgstr "" + msgid "Status" msgstr "" @@ -7401,6 +7524,9 @@ msgstr "" msgid "To preserve performance only <strong>%{display_size} of %{real_size}</strong> files are displayed." msgstr "" +msgid "To prevent performance issues admin logs output the last 2000 lines" +msgstr "" + msgid "To start serving your jobs you can add Runners to your group" msgstr "" @@ -7509,6 +7635,12 @@ msgstr "" msgid "Type" msgstr "" +msgid "Unable to collect CPU info" +msgstr "" + +msgid "Unable to collect memory info" +msgstr "" + msgid "Unable to load the diff. %{button_try_again}" msgstr "" @@ -7602,6 +7734,9 @@ msgstr "" msgid "UploadLink|click to upload" msgstr "" +msgid "Uptime" +msgstr "" + msgid "Upvotes" msgstr "" @@ -7692,6 +7827,9 @@ msgstr "" msgid "Users requesting access to" msgstr "" +msgid "Users:" +msgstr "" + msgid "Various container registry settings." msgstr "" |