diff --git a/app/views/admin/application_settings/_account_and_limit.html.haml b/app/views/admin/application_settings/_account_and_limit.html.haml index 1d58b0106c4b61712f97f6d9425d75e86aa0c957..3b9bf228a349e6af7b6873731f25bfabaa8c14a4 100644 --- a/app/views/admin/application_settings/_account_and_limit.html.haml +++ b/app/views/admin/application_settings/_account_and_limit.html.haml @@ -26,7 +26,7 @@ = f.label :remember_me_enabled, _('Remember me'), class: 'label-light' - remember_me_help_link = help_page_path('user/profile/index', anchor: 'stay-signed-in-for-two-weeks') - remember_me_help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: remember_me_help_link } - = f.gitlab_ui_checkbox_component :remember_me_enabled, _('Allow users to extend their session'), help_text: _("Users can select 'Remember me' on sign-in to keep their session active beyond the session duration. %{link_start}Learn more.%{link_end}").html_safe % { link_start: remember_me_help_link_start, link_end: '</a>'.html_safe } + = f.gitlab_ui_checkbox_component :remember_me_enabled, _('Allow users to extend their session'), help_text: _("Users can select 'Remember me' on sign-in to keep their session active beyond the session duration. %{link_start}Learn more%{link_end}.").html_safe % { link_start: remember_me_help_link_start, link_end: '</a>'.html_safe } = render_if_exists 'admin/application_settings/git_two_factor_session_expiry', form: f = render_if_exists 'admin/application_settings/personal_access_token_expiration_policy', form: f @@ -44,13 +44,13 @@ = f.text_field :user_default_internal_regex, placeholder: _('Regex pattern'), class: 'form-control gl-form-input gl-mt-2' .help-block = _('Specify an email address regex pattern to identify default internal users.') - = link_to _('Learn more.'), help_page_path('administration/external_users', anchor: 'set-a-new-user-to-external'), target: '_blank', rel: 'noopener noreferrer' + #{link_to _('Learn more'), help_page_path('administration/external_users', anchor: 'set-a-new-user-to-external'), target: '_blank', rel: 'noopener noreferrer'}. - unless Gitlab.com? .form-group = f.label :deactivate_dormant_users, _('Dormant users'), class: 'label-bold' - dormant_users_help_link = help_page_path('administration/moderate_users', anchor: 'automatically-deactivate-dormant-users') - dormant_users_help_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: dormant_users_help_link } - = f.gitlab_ui_checkbox_component :deactivate_dormant_users, _('Deactivate dormant users after a period of inactivity'), help_text: _('Users can reactivate their account by signing in. %{link_start}Learn more.%{link_end}').html_safe % { link_start: dormant_users_help_link_start, link_end: '</a>'.html_safe } + = f.gitlab_ui_checkbox_component :deactivate_dormant_users, _('Deactivate dormant users after a period of inactivity'), help_text: _('Users can reactivate their account by signing in. %{link_start}Learn more%{link_end}.').html_safe % { link_start: dormant_users_help_link_start, link_end: '</a>'.html_safe } .form-group = f.label :deactivate_dormant_users_period, _('Days of inactivity before deactivation'), class: 'label-light' = f.number_field :deactivate_dormant_users_period, class: 'form-control gl-form-input', min: 90, required: true diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 14f22fc125c0147cee860dbc8ca734d80191cd84..96db24c6360b9897c4f0d8e9c262fe19b795a229 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -54440,7 +54440,7 @@ msgstr "" msgid "Users can launch a development environment from a GitLab browser tab when the %{linkStart}Gitpod%{linkEnd} integration is enabled." msgstr "" -msgid "Users can reactivate their account by signing in. %{link_start}Learn more.%{link_end}" +msgid "Users can reactivate their account by signing in. %{link_start}Learn more%{link_end}." msgstr "" msgid "Users can render diagrams in AsciiDoc, Markdown, reStructuredText, and Textile documents using Kroki." @@ -54449,7 +54449,7 @@ msgstr "" msgid "Users can request access (if visibility is public or internal)" msgstr "" -msgid "Users can select 'Remember me' on sign-in to keep their session active beyond the session duration. %{link_start}Learn more.%{link_end}" +msgid "Users can select 'Remember me' on sign-in to keep their session active beyond the session duration. %{link_start}Learn more%{link_end}." msgstr "" msgid "Users cannot be added to projects in this group"