diff --git a/app/views/registrations/welcome/show.html.haml b/app/views/registrations/welcome/show.html.haml index 4de4296c965208ae15aca358c683ead394567256..d44a29a5bba2ac4fb6c92dcd74ba056d01834c00 100644 --- a/app/views/registrations/welcome/show.html.haml +++ b/app/views/registrations/welcome/show.html.haml @@ -4,10 +4,8 @@ .d-flex.gl-flex-direction-column.gl-align-items-center.gl-w-full.gl-p-5 .edit-profile.login-page.d-flex.flex-column.gl-align-items-center.pt-lg-3 = render_if_exists "registrations/welcome/progress_bar" - %h2.gl-text-center= html_escape(_('Welcome to GitLab%{br_tag}%{name}!')) % { name: html_escape(current_user.first_name), br_tag: '<br/>'.html_safe } - %p - .gl-text-center= html_escape(_('In order to personalize your experience with GitLab%{br_tag}we would like to know a bit more about you.')) % { br_tag: '<br/>'.html_safe } - + %h2.gl-text-center= html_escape(_('Welcome to GitLab,%{br_tag}%{name}!')) % { name: html_escape(current_user.first_name), br_tag: '<br/>'.html_safe } + %p.gl-text-center= html_escape(_('To personalize your GitLab experience, we\'d like to know a bit more about you. We won\'t share this information with anyone.')) % { br_tag: '<br/>'.html_safe } = form_for(current_user, url: users_sign_up_welcome_path, html: { class: 'card gl-w-full! gl-p-5', 'aria-live' => 'assertive' }) do |f| .devise-errors = render 'devise/shared/error_messages', resource: current_user @@ -20,9 +18,6 @@ .form-group.col-sm-12.js-other-role-group{ class: ("hidden") } = f.label :other_role, _('What is your job title? (optional)'), class: 'form-check-label gl-mb-3' = f.text_field :other_role, class: 'form-control' - .row - .form-group.col-sm-12 - .form-text.gl-text-gray-500.gl-mt-0.gl-line-height-normal.gl-px-1= _('This will help us personalize your onboarding experience.') = render_if_exists "registrations/welcome/setup_for_company", f: f .row .form-group.col-sm-12.gl-mb-0 diff --git a/changelogs/unreleased/kcomoli-copy-fixes-welcome-page.yml b/changelogs/unreleased/kcomoli-copy-fixes-welcome-page.yml new file mode 100644 index 0000000000000000000000000000000000000000..0b4fca343a831c2f272d0d954815aa48d1e5b9f2 --- /dev/null +++ b/changelogs/unreleased/kcomoli-copy-fixes-welcome-page.yml @@ -0,0 +1,6 @@ +--- +title: Improve overall copy, remove redundant reassurance in the form, and fix empty + %p rendered in the DOM of the welcome page. +merge_request: 52660 +author: +type: other diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 510386c6c98c50fbdb778a2d5bbf4dfafb5e216c..2d63d015ed79b5e206dcff684fbd0ea69482551d 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -14955,9 +14955,6 @@ msgstr "" msgid "In order to enable Service Desk for your instance, you must first set up incoming email." msgstr "" -msgid "In order to personalize your experience with GitLab%{br_tag}we would like to know a bit more about you." -msgstr "" - msgid "In progress" msgstr "" @@ -29422,9 +29419,6 @@ msgstr "" msgid "This will clear repository check states for ALL projects in the database. This cannot be undone. Are you sure?" msgstr "" -msgid "This will help us personalize your onboarding experience." -msgstr "" - msgid "This will redirect you to an external sign in page." msgstr "" @@ -29900,6 +29894,9 @@ msgstr "" msgid "To open Jaeger and easily view tracing from GitLab, link the %{link} page to your server" msgstr "" +msgid "To personalize your GitLab experience, we'd like to know a bit more about you. We won't share this information with anyone." +msgstr "" + msgid "To preserve performance only %{strong_open}%{display_size} of %{real_size}%{strong_close} files are displayed." msgstr "" @@ -32090,10 +32087,10 @@ msgstr "" msgid "Welcome to GitLab" msgstr "" -msgid "Welcome to GitLab%{br_tag}%{name}!" +msgid "Welcome to GitLab, %{first_name}!" msgstr "" -msgid "Welcome to GitLab, %{first_name}!" +msgid "Welcome to GitLab,%{br_tag}%{name}!" msgstr "" msgid "Welcome to the guided GitLab tour"