From a576650d96d0793c7a3cd4039af37a85264c6cfb Mon Sep 17 00:00:00 2001 From: Amy Qualls Date: Tue, 14 Sep 2021 12:18:27 -0700 Subject: [PATCH 1/2] Polish UI text for web terminals Spell out words, and cross-link out to the documentation. Improve the user experience in small ways. --- .../admin/application_settings/_terminal.html.haml | 2 +- app/views/admin/application_settings/general.html.haml | 3 ++- locale/gitlab.pot | 10 ++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/views/admin/application_settings/_terminal.html.haml b/app/views/admin/application_settings/_terminal.html.haml index d6e31a24cf6050..c53f63e124b140 100644 --- a/app/views/admin/application_settings/_terminal.html.haml +++ b/app/views/admin/application_settings/_terminal.html.haml @@ -6,5 +6,5 @@ = f.label :terminal_max_session_time, _('Max session time'), class: 'label-bold' = f.number_field :terminal_max_session_time, class: 'form-control gl-form-input' .form-text.text-muted - = _('Maximum time for web terminal websocket connection (in seconds). 0 for unlimited.') + = _('Maximum time, in seconds, for a web terminal websocket connection. 0 for unlimited.') = f.submit _('Save changes'), class: "gl-button btn btn-confirm" diff --git a/app/views/admin/application_settings/general.html.haml b/app/views/admin/application_settings/general.html.haml index 9102769cc6eae6..a72c96bb577101 100644 --- a/app/views/admin/application_settings/general.html.haml +++ b/app/views/admin/application_settings/general.html.haml @@ -79,7 +79,8 @@ %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' } = expanded_by_default? ? _('Collapse') : _('Expand') %p - = _('Set max session time for web terminal.') + = _('Set the maximum session time for a web terminal.') + = link_to _('How do I use a web terminal?'), help_page_path('ci/environments/index.md', anchor: 'web-terminals'), target: '_blank', rel: 'noopener noreferrer' .settings-content = render 'terminal' diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 029198a83e5a25..21810143a73458 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -16805,6 +16805,9 @@ msgstr "" msgid "How do I set up this service?" msgstr "" +msgid "How do I use a web terminal?" +msgstr "" + msgid "How it works" msgstr "" @@ -20954,10 +20957,10 @@ msgstr "" msgid "Maximum time between updates that a mirror can have when scheduled to synchronize." msgstr "" -msgid "Maximum time for web terminal websocket connection (in seconds). 0 for unlimited." +msgid "Maximum time that users are allowed to skip the setup of two-factor authentication (in hours). Set to 0 (zero) to enforce at next sign in." msgstr "" -msgid "Maximum time that users are allowed to skip the setup of two-factor authentication (in hours). Set to 0 (zero) to enforce at next sign in." +msgid "Maximum time, in seconds, for a web terminal websocket connection. 0 for unlimited." msgstr "" msgid "Maximum unauthenticated API requests per rate limit period per IP" @@ -30847,6 +30850,9 @@ msgstr "" msgid "Set the iteration to %{iteration_reference}." msgstr "" +msgid "Set the maximum session time for a web terminal." +msgstr "" + msgid "Set the milestone to %{milestone_reference}." msgstr "" -- GitLab From 37677b003b4d47960f35a3e63659d8df437f1e2d Mon Sep 17 00:00:00 2001 From: Amy Qualls Date: Mon, 20 Sep 2021 07:34:21 -0700 Subject: [PATCH 2/2] Update translations file after rebase Catch the branch up with 'master', fix merge conflicts, and then regenerate the translations file. --- locale/gitlab.pot | 3 --- 1 file changed, 3 deletions(-) diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 21810143a73458..0f0424d96ed74c 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -30799,9 +30799,6 @@ msgstr "" msgid "Set limits for web and API requests." msgstr "" -msgid "Set max session time for web terminal." -msgstr "" - msgid "Set milestone" msgstr "" -- GitLab