diff --git a/app/helpers/gitpod_helper.rb b/app/helpers/gitpod_helper.rb index 875a44c51bb10afc895ebdc0146ecfa339faf93f..726c852fcdd9cd8ef7ddcb042d1b8b0c7831cde9 100644 --- a/app/helpers/gitpod_helper.rb +++ b/app/helpers/gitpod_helper.rb @@ -2,6 +2,6 @@ module GitpodHelper def gitpod_enable_description - s_('Enable %{linkStart}Gitpod%{linkEnd} integration to launch a development environment in your browser directly from GitLab.') + s_('Users can launch a development environment from a GitLab browser tab when the %{linkStart}Gitpod%{linkEnd} integration is enabled.') end end diff --git a/app/views/admin/application_settings/_gitpod.html.haml b/app/views/admin/application_settings/_gitpod.html.haml index 6d335e2db162ef9c9c585e0654774b99d0f847a5..c08b41e8c557fbdba32c4af8081f5574785b2f36 100644 --- a/app/views/admin/application_settings/_gitpod.html.haml +++ b/app/views/admin/application_settings/_gitpod.html.haml @@ -22,7 +22,9 @@ = f.label :gitpod_enabled, s_('Gitpod|Enable Gitpod integration'), class: 'form-check-label' .form-group = f.label :gitpod_url, s_('Gitpod|Gitpod URL'), class: 'label-bold' - = f.text_field :gitpod_url, class: 'form-control gl-form-input', placeholder: s_('Gitpod|e.g. https://gitpod.example.com') + = f.text_field :gitpod_url, class: 'form-control gl-form-input', placeholder: s_('Gitpod|https://gitpod.example.com') .form-text.text-muted - = s_('Gitpod|Add the URL to your Gitpod instance configured to read your GitLab projects.') + = s_('Gitpod|The URL to your Gitpod instance configured to read your GitLab projects, such as https://gitpod.example.com.') + - link_start = '<a href="%{url}">'.html_safe % { url: help_page_path('integration/gitpod', anchor: 'enable-gitpod-in-your-user-settings') } + = s_('Gitpod|To use the integration, each user must also enable Gitpod on their GitLab account. %{link_start}How do I enable it?%{link_end} ').html_safe % { link_start: link_start, link_end: '</a>'.html_safe } = f.submit s_('Save changes'), class: 'gl-button btn btn-confirm' diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 714006a1120b152ec8988172d64d0dee8920bfe3..59ec5ad68e215a16e62c61ffe5ab61946fbf4e3a 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -12109,9 +12109,6 @@ msgstr "" msgid "Enable" msgstr "" -msgid "Enable %{linkStart}Gitpod%{linkEnd} integration to launch a development environment in your browser directly from GitLab." -msgstr "" - msgid "Enable Auto DevOps" msgstr "" @@ -15335,16 +15332,19 @@ msgstr "" msgid "Gitpod" msgstr "" -msgid "Gitpod|Add the URL to your Gitpod instance configured to read your GitLab projects." -msgstr "" - msgid "Gitpod|Enable Gitpod integration" msgstr "" msgid "Gitpod|Gitpod URL" msgstr "" -msgid "Gitpod|e.g. https://gitpod.example.com" +msgid "Gitpod|The URL to your Gitpod instance configured to read your GitLab projects, such as https://gitpod.example.com." +msgstr "" + +msgid "Gitpod|To use the integration, each user must also enable Gitpod on their GitLab account. %{link_start}How do I enable it?%{link_end} " +msgstr "" + +msgid "Gitpod|https://gitpod.example.com" msgstr "" msgid "Given access %{time_ago}" @@ -35782,6 +35782,9 @@ msgstr "" msgid "Users" msgstr "" +msgid "Users can launch a development environment from a GitLab browser tab when the %{linkStart}Gitpod%{linkEnd} integration is enabled." +msgstr "" + msgid "Users in License" msgstr ""