Commit 2809b8bb authored by Tom Quirk's avatar Tom Quirk

Improve translatability of email confirmation page

Includes some minor UI polish, too.

Changelog: changed
parent d0604b03
- user_email = "(#{params[:email]})" if params[:email].present? - user_email = "(#{params[:email]})" if params[:email].present?
- request_link_start = '<a href="%{new_user_confirmation_path}">'.html_safe % { new_user_confirmation_path: new_user_confirmation_path }
- request_link_end = '</a>'.html_safe
.well-confirmation.gl-text-center.gl-mb-6 .well-confirmation.gl-text-center.gl-mb-6
%h1.gl-mt-0 %h1.gl-mt-0
= _("Almost there...") = _("Almost there...")
%p.lead.gl-mb-6 %p{ class: 'gl-mb-6 gl-font-lg!' }
= _('Please check your email %{email} to confirm your account') % { email: user_email } = _('Please check your email %{email} to confirm your account') % { email: user_email }
%hr %hr
- if Gitlab::CurrentSettings.after_sign_up_text.present? - if Gitlab::CurrentSettings.after_sign_up_text.present?
.well-confirmation.gl-text-center .well-confirmation.gl-text-center
= markdown_field(Gitlab::CurrentSettings, :after_sign_up_text) = markdown_field(Gitlab::CurrentSettings, :after_sign_up_text)
%p.text-center %p.gl-text-center
= _("No confirmation email received? Please check your spam folder or") = _("No confirmation email received? Check your spam folder or %{request_link_start}request new confirmation email%{request_link_end}.").html_safe % { request_link_start: request_link_start, request_link_end: request_link_end }
.gl-mb-6.prepend-top-20.gl-text-center
%a.gl-link{ href: new_user_confirmation_path }
= _("Request new confirmation email")
...@@ -22982,7 +22982,7 @@ msgstr "" ...@@ -22982,7 +22982,7 @@ msgstr ""
msgid "No compliance frameworks are in use. Create one from the %{link} section in Group Settings." msgid "No compliance frameworks are in use. Create one from the %{link} section in Group Settings."
msgstr "" msgstr ""
msgid "No confirmation email received? Please check your spam folder or" msgid "No confirmation email received? Check your spam folder or %{request_link_start}request new confirmation email%{request_link_end}."
msgstr "" msgstr ""
msgid "No connection could be made to a Gitaly Server, please check your logs!" msgid "No connection could be made to a Gitaly Server, please check your logs!"
...@@ -28880,9 +28880,6 @@ msgstr "" ...@@ -28880,9 +28880,6 @@ msgstr ""
msgid "Request details" msgid "Request details"
msgstr "" msgstr ""
msgid "Request new confirmation email"
msgstr ""
msgid "Request parameter %{param} is missing." msgid "Request parameter %{param} is missing."
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