Commit 640eaa9f authored by Vitaly Slobodin's avatar Vitaly Slobodin

Merge branch '330192-kpaizee-revise-plantuml-ui-text' into 'master'

Revise UI text for PlantUML settings

See merge request gitlab-org/gitlab!67497
parents 5016933c d5178727
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
%button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand') = expanded ? _('Collapse') : _('Expand')
%p %p
= _('Allow rendering of PlantUML diagrams in Asciidoc documents.') = _('Render diagrams in your documents using PlantUML.')
= link_to _('Learn more.'), help_page_path('administration/integration/plantuml.md'), target: '_blank', rel: 'noopener noreferrer'
.settings-content .settings-content
= form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-plantuml-settings'), html: { class: 'fieldset-form', id: 'plantuml-settings' } do |f| = form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-plantuml-settings'), html: { class: 'fieldset-form', id: 'plantuml-settings' } do |f|
= form_errors(@application_setting) if expanded = form_errors(@application_setting) if expanded
...@@ -20,8 +21,6 @@ ...@@ -20,8 +21,6 @@
= f.label :plantuml_url, _('PlantUML URL'), class: 'label-bold' = f.label :plantuml_url, _('PlantUML URL'), class: 'label-bold'
= f.text_field :plantuml_url, class: 'form-control gl-form-input', placeholder: 'http://your-plantuml-instance:8080' = f.text_field :plantuml_url, class: 'form-control gl-form-input', placeholder: 'http://your-plantuml-instance:8080'
.form-text.text-muted .form-text.text-muted
Allow rendering of = _('The hostname of your PlantUML server.')
= link_to "PlantUML", "http://plantuml.com"
diagrams in Asciidoc documents using an external PlantUML service.
= f.submit _('Save changes'), class: "gl-button btn btn-confirm" = f.submit _('Save changes'), class: "gl-button btn btn-confirm"
...@@ -3342,9 +3342,6 @@ msgstr "" ...@@ -3342,9 +3342,6 @@ msgstr ""
msgid "Allow public access to pipelines and job details, including output logs and artifacts." msgid "Allow public access to pipelines and job details, including output logs and artifacts."
msgstr "" msgstr ""
msgid "Allow rendering of PlantUML diagrams in Asciidoc documents."
msgstr ""
msgid "Allow requests to the local network from hooks and services." msgid "Allow requests to the local network from hooks and services."
msgstr "" msgstr ""
...@@ -27724,6 +27721,9 @@ msgstr "" ...@@ -27724,6 +27721,9 @@ msgstr ""
msgid "Rename/Move" msgid "Rename/Move"
msgstr "" msgstr ""
msgid "Render diagrams in your documents using PlantUML."
msgstr ""
msgid "Renew subscription" msgid "Renew subscription"
msgstr "" msgstr ""
...@@ -33016,6 +33016,9 @@ msgstr "" ...@@ -33016,6 +33016,9 @@ msgstr ""
msgid "The group_project_ids parameter is only allowed for a group" msgid "The group_project_ids parameter is only allowed for a group"
msgstr "" msgstr ""
msgid "The hostname of your PlantUML server."
msgstr ""
msgid "The hostname of your Snowplow collector." msgid "The hostname of your Snowplow collector."
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment