From 8d5fcec6bf0c159e372879d38787bdbcd562faac Mon Sep 17 00:00:00 2001 From: Luke Bennett Date: Mon, 28 Jan 2019 04:00:38 +0000 Subject: Externalize admin services strings --- app/views/admin/services/_form.html.haml | 4 ++-- app/views/admin/services/edit.html.haml | 4 ++-- app/views/admin/services/index.html.haml | 12 ++++++------ app/views/shared/_service_settings.html.haml | 2 +- changelogs/unreleased/services-ext.yml | 5 +++++ locale/gitlab.pot | 18 ++++++++++++++++++ 6 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 changelogs/unreleased/services-ext.yml diff --git a/app/views/admin/services/_form.html.haml b/app/views/admin/services/_form.html.haml index 1798b44bbb7..c6358824abb 100644 --- a/app/views/admin/services/_form.html.haml +++ b/app/views/admin/services/_form.html.haml @@ -1,10 +1,10 @@ %h3.page-title = @service.title -%p #{@service.description} template +%p= _('%{service_description} template') % { service_description: @service.description } = form_for :service, url: admin_application_settings_service_path, method: :put, html: { class: 'fieldset-form' } do |form| = render 'shared/service_settings', form: form, subject: @service .footer-block.row-content-block - = form.submit 'Save', class: 'btn btn-success' + = form.submit _('Save'), class: 'btn btn-success' diff --git a/app/views/admin/services/edit.html.haml b/app/views/admin/services/edit.html.haml index 512176649e6..8c6c2195d66 100644 --- a/app/views/admin/services/edit.html.haml +++ b/app/views/admin/services/edit.html.haml @@ -1,4 +1,4 @@ -- add_to_breadcrumbs "Service Templates", admin_application_settings_services_path +- add_to_breadcrumbs _('Service Templates'), admin_application_settings_services_path - breadcrumb_title @service.title -- page_title @service.title, "Service Templates" +- page_title @service.title, _('Service Templates') = render 'form' diff --git a/app/views/admin/services/index.html.haml b/app/views/admin/services/index.html.haml index 89872c1b91a..1bf3400bd43 100644 --- a/app/views/admin/services/index.html.haml +++ b/app/views/admin/services/index.html.haml @@ -1,15 +1,15 @@ -- page_title "Service Templates" -%h3.page-title Service templates -%p.light Service template allows you to set default values for project services +- page_title _('Service Templates') +%h3.page-title= _('Service templates') +%p.light= _('Service template allows you to set default values for project services') .table-holder %table.table %thead %tr %th - %th Service - %th Description - %th Last edit + %th= _('Service') + %th= _('Description') + %th= _('Last edit') - @services.sort_by(&:title).each do |service| %tr %td diff --git a/app/views/shared/_service_settings.html.haml b/app/views/shared/_service_settings.html.haml index 6fa61c15493..172852db892 100644 --- a/app/views/shared/_service_settings.html.haml +++ b/app/views/shared/_service_settings.html.haml @@ -16,7 +16,7 @@ - if @service.configurable_events.present? .form-group.row - .col-sm-2.text-right Trigger + .col-sm-2.text-right= _('Trigger') .col-sm-10 - @service.configurable_events.each do |event| diff --git a/changelogs/unreleased/services-ext.yml b/changelogs/unreleased/services-ext.yml new file mode 100644 index 00000000000..97ad7949095 --- /dev/null +++ b/changelogs/unreleased/services-ext.yml @@ -0,0 +1,5 @@ +--- +title: Externalize admin services strings +merge_request: +author: +type: other diff --git a/locale/gitlab.pot b/locale/gitlab.pot index a72e921dcce..d749a14d258 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -150,6 +150,9 @@ msgstr "" msgid "%{percent}%% complete" msgstr "" +msgid "%{service_description} template" +msgstr "" + msgid "%{strong_start}%{branch_count}%{strong_end} Branch" msgid_plural "%{strong_start}%{branch_count}%{strong_end} Branches" msgstr[0] "" @@ -4025,6 +4028,9 @@ msgstr "" msgid "Last contact" msgstr "" +msgid "Last edit" +msgstr "" + msgid "Last edited %{date}" msgstr "" @@ -6267,9 +6273,18 @@ 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 "" +msgid "Service template allows you to set default values for project services" +msgstr "" + +msgid "Service templates" +msgstr "" + msgid "Session expiration, projects limit and attachment size." msgstr "" @@ -7479,6 +7494,9 @@ msgstr "" msgid "Trending" msgstr "" +msgid "Trigger" +msgstr "" + msgid "Trigger this manual action" msgstr "" -- cgit v1.2.1