diff options
| -rw-r--r-- | app/views/projects/settings/ci_cd/_autodevops_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/settings/ci_cd/_form.html.haml | 48 | ||||
| -rw-r--r-- | app/views/projects/settings/ci_cd/show.html.haml | 26 | ||||
| -rw-r--r-- | app/views/projects/settings/integrations/_project_hook.html.haml | 8 | ||||
| -rw-r--r-- | app/views/projects/settings/integrations/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/settings/members/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/settings/repository/show.html.haml | 4 | ||||
| -rw-r--r-- | locale/gitlab.pot | 121 | ||||
| -rw-r--r-- | qa/qa/page/project/settings/ci_cd.rb | 2 |
9 files changed, 159 insertions, 58 deletions
diff --git a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml index 4359362bb05..31c2616d283 100644 --- a/app/views/projects/settings/ci_cd/_autodevops_form.html.haml +++ b/app/views/projects/settings/ci_cd/_autodevops_form.html.haml @@ -63,4 +63,4 @@ .form-text.text-muted = s_('CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery.').html_safe % { ci_file: ci_file_formatted } - = f.submit 'Save changes', class: "btn btn-success prepend-top-15" + = f.submit _('Save changes'), class: "btn btn-success prepend-top-15" diff --git a/app/views/projects/settings/ci_cd/_form.html.haml b/app/views/projects/settings/ci_cd/_form.html.haml index 7142a9d635e..5025460a2d0 100644 --- a/app/views/projects/settings/ci_cd/_form.html.haml +++ b/app/views/projects/settings/ci_cd/_form.html.haml @@ -4,20 +4,20 @@ = form_errors(@project) %fieldset.builds-feature .form-group.append-bottom-default.js-secret-runner-token - = f.label :runners_token, "Runner token", class: 'label-light' + = f.label :runners_token, _("Runner token"), class: 'label-light' .form-control.js-secret-value-placeholder = '*' * 20 = f.text_field :runners_token, class: "form-control hide js-secret-value", placeholder: 'xEeFCaDAB89' - %p.form-text.text-muted The secure token used by the Runner to checkout the project + %p.form-text.text-muted= _("The secure token used by the Runner to checkout the project") %button.btn.btn-info.prepend-top-10.js-secret-value-reveal-button{ type: 'button', data: { secret_reveal_status: 'false' } } = _('Reveal value') %hr .form-group %h5.prepend-top-0 - Git strategy for pipelines + = _("Git strategy for pipelines") %p - Choose between <code>clone</code> or <code>fetch</code> to get the recent application code + = _("Choose between <code>clone</code> or <code>fetch</code> to get the recent application code") = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'git-strategy'), target: '_blank' .form-check = f.radio_button :build_allow_git_fetch, 'false', { class: 'form-check-input' } @@ -25,29 +25,29 @@ %strong git clone %br %span.descr - Slower but makes sure the project workspace is pristine as it clones the repository from scratch for every job + = _("Slower but makes sure the project workspace is pristine as it clones the repository from scratch for every job") .form-check = f.radio_button :build_allow_git_fetch, 'true', { class: 'form-check-input' } = f.label :build_allow_git_fetch_true, class: 'form-check-label' do %strong git fetch %br %span.descr - Faster as it re-uses the project workspace (falling back to clone if it doesn't exist) + = _("Faster as it re-uses the project workspace (falling back to clone if it doesn't exist)") %hr .form-group - = f.label :build_timeout_human_readable, 'Timeout', class: 'label-light' + = f.label :build_timeout_human_readable, _('Timeout'), class: 'label-light' = f.text_field :build_timeout_human_readable, class: 'form-control' %p.form-text.text-muted - Per job. If a job passes this threshold, it will be marked as failed + = _("Per job. If a job passes this threshold, it will be marked as failed") = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'timeout'), target: '_blank' %hr .form-group - = f.label :ci_config_path, 'Custom CI config path', class: 'label-light' + = f.label :ci_config_path, _('Custom CI config path'), class: 'label-light' = f.text_field :ci_config_path, class: 'form-control', placeholder: '.gitlab-ci.yml' %p.form-text.text-muted - The path to CI config file. Defaults to <code>.gitlab-ci.yml</code> + = _("The path to CI config file. Defaults to <code>.gitlab-ci.yml</code>") = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'custom-ci-config-path'), target: '_blank' %hr @@ -55,36 +55,35 @@ .form-check = f.check_box :public_builds, { class: 'form-check-input' } = f.label :public_builds, class: 'form-check-label' do - %strong Public pipelines + %strong= _("Public pipelines") .form-text.text-muted - Allow public access to pipelines and job details, including output logs and artifacts + = _("Allow public access to pipelines and job details, including output logs and artifacts") = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'visibility-of-pipelines'), target: '_blank' .bs-callout.bs-callout-info - %p If enabled: + %p #{_("If enabled")}: %ul %li - For public projects, anyone can view pipelines and access job details (output logs and artifacts) + = _("For public projects, anyone can view pipelines and access job details (output logs and artifacts)") %li - For internal projects, any logged in user can view pipelines and access job details (output logs and artifacts) + = _("For internal projects, any logged in user can view pipelines and access job details (output logs and artifacts)") %li - For private projects, any member (guest or higher) can view pipelines and access job details (output logs and artifacts) + = _("For private projects, any member (guest or higher) can view pipelines and access job details (output logs and artifacts)") %p - If disabled, the access level will depend on the user's - permissions in the project. + = _("If disabled, the access level will depend on the user's permissions in the project.") %hr .form-group .form-check = f.check_box :auto_cancel_pending_pipelines, { class: 'form-check-input' }, 'enabled', 'disabled' = f.label :auto_cancel_pending_pipelines, class: 'form-check-label' do - %strong Auto-cancel redundant, pending pipelines + %strong= _("Auto-cancel redundant, pending pipelines") .form-text.text-muted - New pipelines will cancel older, pending pipelines on the same branch + = _("New pipelines will cancel older, pending pipelines on the same branch") = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'auto-cancel-pending-pipelines'), target: '_blank' %hr .form-group - = f.label :build_coverage_regex, "Test coverage parsing", class: 'label-light' + = f.label :build_coverage_regex, _("Test coverage parsing"), class: 'label-light' .input-group %span.input-group-prepend .input-group-text / @@ -92,11 +91,10 @@ %span.input-group-append .input-group-text / %p.form-text.text-muted - A regular expression that will be used to find the test coverage - output in the job trace. Leave blank to disable + = _("A regular expression that will be used to find the test coverage output in the job trace. Leave blank to disable") = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'test-coverage-parsing'), target: '_blank' .bs-callout.bs-callout-info - %p Below are examples of regex for existing tools: + %p= _("Below are examples of regex for existing tools:") %ul %li Simplecov (Ruby) - @@ -120,7 +118,7 @@ JaCoCo (Java/Kotlin) %code Total.*?([0-9]{1,3})% - = f.submit 'Save changes', class: "btn btn-save" + = f.submit _('Save changes'), class: "btn btn-save" %hr diff --git a/app/views/projects/settings/ci_cd/show.html.haml b/app/views/projects/settings/ci_cd/show.html.haml index 4d096699a70..be22bbd7a9b 100644 --- a/app/views/projects/settings/ci_cd/show.html.haml +++ b/app/views/projects/settings/ci_cd/show.html.haml @@ -1,6 +1,6 @@ - @content_class = "limit-container-width" unless fluid_layout -- page_title "CI / CD Settings" -- page_title "CI / CD" +- page_title _("CI / CD Settings") +- page_title _("CI / CD") - expanded = Rails.env.test? - general_expanded = @project.errors.empty? ? expanded : true @@ -8,11 +8,11 @@ %section.settings#js-general-pipeline-settings.no-animate{ class: ('expanded' if general_expanded) } .settings-header %h4 - General pipelines + = _("General pipelines") %button.btn.js-settings-toggle{ type: 'button' } - = expanded ? 'Collapse' : 'Expand' + = expanded ? _('Collapse') : _('Expand') %p - Access your runner token, customize your pipeline configuration, and view your pipeline status and coverage report. + = _("Access your runner token, customize your pipeline configuration, and view your pipeline status and coverage report.") .settings-content = render 'form' @@ -31,11 +31,11 @@ %section.qa-runners-settings.settings.no-animate{ class: ('expanded' if expanded) } .settings-header %h4 - Runners + = _("Runners") %button.btn.js-settings-toggle{ type: 'button' } - = expanded ? 'Collapse' : 'Expand' + = expanded ? _('Collapse') : _('Expand') %p - Register and see your runners for this project. + = _("Register and see your runners for this project.") .settings-content = render 'projects/runners/index' @@ -45,7 +45,7 @@ = _('Variables') = link_to icon('question-circle'), help_page_path('ci/variables/README', anchor: 'variables'), target: '_blank', rel: 'noopener noreferrer' %button.btn.js-settings-toggle{ type: 'button' } - = expanded ? 'Collapse' : 'Expand' + = expanded ? _('Collapse') : _('Expand') %p.append-bottom-0 = render "ci/variables/content" .settings-content @@ -54,12 +54,10 @@ %section.settings.no-animate#js-pipeline-triggers{ class: ('expanded' if expanded) } .settings-header %h4 - Pipeline triggers + = _("Pipeline triggers") %button.btn.js-settings-toggle{ type: 'button' } - = expanded ? 'Collapse' : 'Expand' + = expanded ? _('Collapse') : _('Expand') %p - Triggers can force a specific branch or tag to get rebuilt with an API call. These tokens will - impersonate their associated user including their access to projects and their project - permissions. + = _("Triggers can force a specific branch or tag to get rebuilt with an API call. These tokens will impersonate their associated user including their access to projects and their project permissions.") .settings-content = render 'projects/triggers/index' diff --git a/app/views/projects/settings/integrations/_project_hook.html.haml b/app/views/projects/settings/integrations/_project_hook.html.haml index 77d88aed883..ef445f2e139 100644 --- a/app/views/projects/settings/integrations/_project_hook.html.haml +++ b/app/views/projects/settings/integrations/_project_hook.html.haml @@ -8,9 +8,9 @@ %span.badge.badge-gray.deploy-project-label= event.to_s.titleize .col-md-4.col-lg-5.text-right-lg.prepend-top-5 %span.append-right-10.inline - SSL Verification: #{hook.enable_ssl_verification ? 'enabled' : 'disabled'} - = link_to 'Edit', edit_project_hook_path(@project, hook), class: 'btn btn-sm' + #{_("SSL Verification")}: #{hook.enable_ssl_verification ? _('enabled') : _('disabled')} + = link_to _('Edit'), edit_project_hook_path(@project, hook), class: 'btn btn-sm' = render 'shared/web_hooks/test_button', triggers: ProjectHook.triggers, hook: hook, button_class: 'btn-sm' - = link_to project_hook_path(@project, hook), data: { confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-transparent' do - %span.sr-only Remove + = link_to project_hook_path(@project, hook), data: { confirm: _('Are you sure?') }, method: :delete, class: 'btn btn-transparent' do + %span.sr-only= _("Remove") = icon('trash') diff --git a/app/views/projects/settings/integrations/show.html.haml b/app/views/projects/settings/integrations/show.html.haml index 2f1a548e119..76770290f36 100644 --- a/app/views/projects/settings/integrations/show.html.haml +++ b/app/views/projects/settings/integrations/show.html.haml @@ -1,5 +1,5 @@ - @content_class = "limit-container-width" unless fluid_layout -- breadcrumb_title "Integrations Settings" -- page_title 'Integrations' +- breadcrumb_title _("Integrations Settings") +- page_title _('Integrations') = render 'projects/hooks/index' = render 'projects/services/index' diff --git a/app/views/projects/settings/members/show.html.haml b/app/views/projects/settings/members/show.html.haml index ea2cd36b212..5fca734222b 100644 --- a/app/views/projects/settings/members/show.html.haml +++ b/app/views/projects/settings/members/show.html.haml @@ -1,5 +1,5 @@ - @content_class = "limit-container-width" unless fluid_layout -- page_title "Members" +- page_title _("Members") = render "projects/project_members/index" diff --git a/app/views/projects/settings/repository/show.html.haml b/app/views/projects/settings/repository/show.html.haml index 5dda2ec28b4..98c609d7bd4 100644 --- a/app/views/projects/settings/repository/show.html.haml +++ b/app/views/projects/settings/repository/show.html.haml @@ -1,5 +1,5 @@ -- breadcrumb_title "Repository Settings" -- page_title "Repository" +- breadcrumb_title _("Repository Settings") +- page_title _("Repository") - @content_class = "limit-container-width" unless fluid_layout = render "projects/mirrors/show" diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 80c1cb09964..5c4e10bfd4a 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab 1.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-06-29 16:17+1000\n" -"PO-Revision-Date: 2018-06-29 16:17+1000\n" +"POT-Creation-Date: 2018-07-01 16:35+1000\n" +"PO-Revision-Date: 2018-07-01 16:35+1000\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: \n" @@ -219,6 +219,9 @@ msgstr "" msgid "A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), %{among_other_things_link}." msgstr "" +msgid "A regular expression that will be used to find the test coverage output in the job trace. Leave blank to disable" +msgstr "" + msgid "A user with write access to the source branch selected this option" msgstr "" @@ -240,6 +243,9 @@ msgstr "" msgid "Access to failing storages has been temporarily disabled to allow the mount to recover. Reset storage information after the issue has been resolved to allow access again." msgstr "" +msgid "Access your runner token, customize your pipeline configuration, and view your pipeline status and coverage report." +msgstr "" + msgid "Account" msgstr "" @@ -348,6 +354,9 @@ msgstr "" msgid "Allow commits from members who can merge to the target branch." msgstr "" +msgid "Allow public access to pipelines and job details, including output logs and artifacts" +msgstr "" + msgid "Allow rendering of PlantUML diagrams in Asciidoc documents." msgstr "" @@ -363,6 +372,24 @@ msgstr "" msgid "An error occured creating the new branch." msgstr "" +msgid "An error occured whilst loading all the files." +msgstr "" + +msgid "An error occured whilst loading the file content." +msgstr "" + +msgid "An error occured whilst loading the file." +msgstr "" + +msgid "An error occured whilst loading the merge request changes." +msgstr "" + +msgid "An error occured whilst loading the merge request version data." +msgstr "" + +msgid "An error occured whilst loading the merge request." +msgstr "" + msgid "An error occurred previewing the blob" msgstr "" @@ -525,6 +552,9 @@ msgstr "" msgid "Auto Review Apps and Auto Deploy need a domain name to work correctly." msgstr "" +msgid "Auto-cancel redundant, pending pipelines" +msgstr "" + msgid "AutoDevOps|Auto DevOps" msgstr "" @@ -642,6 +672,9 @@ msgstr "" msgid "Begin with the selected commit" msgstr "" +msgid "Below are examples of regex for existing tools:" +msgstr "" + msgid "Boards" msgstr "" @@ -803,6 +836,9 @@ msgstr "" msgid "CI / CD" msgstr "" +msgid "CI / CD Settings" +msgstr "" + msgid "CI/CD configuration" msgstr "" @@ -923,6 +959,9 @@ msgstr "" msgid "Choose any color." msgstr "" +msgid "Choose between <code>clone</code> or <code>fetch</code> to get the recent application code" +msgstr "" + msgid "Choose file..." msgstr "" @@ -1722,6 +1761,9 @@ msgstr "" msgid "CurrentUser|Settings" msgstr "" +msgid "Custom CI config path" +msgstr "" + msgid "Custom notification events" msgstr "" @@ -2135,9 +2177,6 @@ msgstr "" msgid "Error loading project data. Please try again." msgstr "" -msgid "Error loading tree data. Please try again." -msgstr "" - msgid "Error occurred when toggling the notification subscription" msgstr "" @@ -2219,13 +2258,13 @@ msgstr "" msgid "Failure" msgstr "" -msgid "Feb" +msgid "Faster as it re-uses the project workspace (falling back to clone if it doesn't exist)" msgstr "" -msgid "February" +msgid "Feb" msgstr "" -msgid "Fetching diff files failed. Please reload the page to try again!" +msgid "February" msgstr "" msgid "Fields on this page are now uneditable, you can configure" @@ -2255,6 +2294,15 @@ msgstr "" msgid "FirstPushedBy|pushed by" msgstr "" +msgid "For internal projects, any logged in user can view pipelines and access job details (output logs and artifacts)" +msgstr "" + +msgid "For private projects, any member (guest or higher) can view pipelines and access job details (output logs and artifacts)" +msgstr "" + +msgid "For public projects, anyone can view pipelines and access job details (output logs and artifacts)" +msgstr "" + msgid "Fork" msgid_plural "Forks" msgstr[0] "" @@ -2293,6 +2341,9 @@ msgstr "" msgid "General" msgstr "" +msgid "General pipelines" +msgstr "" + msgid "Generate a default set of labels" msgstr "" @@ -2305,6 +2356,9 @@ msgstr "" msgid "Git storage health information has been reset" msgstr "" +msgid "Git strategy for pipelines" +msgstr "" + msgid "Git version" msgstr "" @@ -2499,6 +2553,12 @@ msgstr "" msgid "Identities" msgstr "" +msgid "If disabled, the access level will depend on the user's permissions in the project." +msgstr "" + +msgid "If enabled" +msgstr "" + msgid "If you already have files you can push them using the %{link_to_cli} below." msgstr "" @@ -2547,6 +2607,9 @@ msgstr "" msgid "Integrations" msgstr "" +msgid "Integrations Settings" +msgstr "" + msgid "Interested parties can even contribute by pushing commits if they want to." msgstr "" @@ -2962,6 +3025,9 @@ msgstr "" msgid "New merge request" msgstr "" +msgid "New pipelines will cancel older, pending pipelines on the same branch" +msgstr "" + msgid "New project" msgstr "" @@ -3199,6 +3265,9 @@ msgstr "" msgid "Pending" msgstr "" +msgid "Per job. If a job passes this threshold, it will be marked as failed" +msgstr "" + msgid "Perform advanced options such as changing path, transferring, or removing the group." msgstr "" @@ -3223,6 +3292,9 @@ msgstr "" msgid "Pipeline Schedules" msgstr "" +msgid "Pipeline triggers" +msgstr "" + msgid "PipelineCharts|Failed:" msgstr "" @@ -3646,6 +3718,9 @@ msgstr "" msgid "Public - The project can be accessed without any authentication." msgstr "" +msgid "Public pipelines" +msgstr "" + msgid "Push events" msgstr "" @@ -3679,6 +3754,9 @@ msgstr "" msgid "Register and see your runners for this group." msgstr "" +msgid "Register and see your runners for this project." +msgstr "" + msgid "Registry" msgstr "" @@ -3724,6 +3802,9 @@ msgstr "" msgid "Repository" msgstr "" +msgid "Repository Settings" +msgstr "" + msgid "Repository maintenance" msgstr "" @@ -3792,6 +3873,9 @@ msgstr "" msgid "Rollback" msgstr "" +msgid "Runner token" +msgstr "" + msgid "Runners" msgstr "" @@ -3807,6 +3891,9 @@ msgstr "" msgid "SSH Keys" msgstr "" +msgid "SSL Verification" +msgstr "" + msgid "Save" msgstr "" @@ -4001,6 +4088,9 @@ msgstr "" msgid "Size and domain settings for static websites" msgstr "" +msgid "Slower but makes sure the project workspace is pristine as it clones the repository from scratch for every job" +msgstr "" + msgid "Snippets" msgstr "" @@ -4321,6 +4411,9 @@ msgstr "" msgid "Terms of Service and Privacy Policy" msgstr "" +msgid "Test coverage parsing" +msgstr "" + msgid "The Issue Tracker is the place to add things that need to be improved or solved in a project" msgstr "" @@ -4351,6 +4444,9 @@ msgstr "" msgid "The number of failures of after which GitLab will completely prevent access to the storage. The number of failures can be reset in the admin interface: %{link_to_health_page} or using the %{api_documentation_link}." msgstr "" +msgid "The path to CI config file. Defaults to <code>.gitlab-ci.yml</code>" +msgstr "" + msgid "The phase of the development lifecycle." msgstr "" @@ -4378,6 +4474,9 @@ msgstr "" msgid "The review stage shows the time from creating the merge request to merging it. The data will automatically be added after you merge your first merge request." msgstr "" +msgid "The secure token used by the Runner to checkout the project" +msgstr "" + msgid "The staging stage shows the time between merging the MR and deploying code to the production environment. The data will be automatically added once you deploy to production for the first time." msgstr "" @@ -4678,6 +4777,9 @@ msgstr "" msgid "Timeago|right now" msgstr "" +msgid "Timeout" +msgstr "" + msgid "Time|hr" msgid_plural "Time|hrs" msgstr[0] "" @@ -4751,6 +4853,9 @@ msgstr "" msgid "Trigger this manual action" msgstr "" +msgid "Triggers can force a specific branch or tag to get rebuilt with an API call. These tokens will impersonate their associated user including their access to projects and their project permissions." +msgstr "" + msgid "Try again" msgstr "" diff --git a/qa/qa/page/project/settings/ci_cd.rb b/qa/qa/page/project/settings/ci_cd.rb index 1466bc2e0bf..0f739f61db9 100644 --- a/qa/qa/page/project/settings/ci_cd.rb +++ b/qa/qa/page/project/settings/ci_cd.rb @@ -16,7 +16,7 @@ module QA # rubocop:disable Naming/FileName element :domain_field, 'text_field :domain' element :enable_auto_devops_button, "%strong= s_('CICD|Enable Auto DevOps')" element :domain_input, "%strong= _('Domain')" - element :save_changes_button, "submit 'Save changes'" + element :save_changes_button, "submit _('Save changes')" end def expand_runners_settings(&block) |