diff --git a/app/views/branded/contact_us/contacts/new.html.erb b/app/views/branded/contact_us/contacts/new.html.erb index 41da44d9d..e66766380 100644 --- a/app/views/branded/contact_us/contacts/new.html.erb +++ b/app/views/branded/contact_us/contacts/new.html.erb @@ -3,6 +3,12 @@ title _('Contact Us') email = Rails.configuration.x.dmproadmap.organisation_helpdesk_email masked_email = email.gsub('@', ' [at] ').gsub('.', ' [dot] ') + +if user_signed_in? + instructions = _('%{application_name} is provided by the %{organisation_name}.
You can find out more about us on our website (new window)%{open_in_new_window_text}. If you would like to contact us about %{application_name}, please fill out the form below.') +else + instructions = _('%{application_name} is provided by the %{organisation_name}.
You can find out more about us on our website (new window)%{open_in_new_window_text}. If you would like to contact us about %{application_name}, please email our helpdesk: %{helpdesk_email}.') +end %>
@@ -13,20 +19,17 @@ masked_email = email.gsub('@', ' [at] ').gsub('.', ' [dot] ')

- <%= sanitize _('%{application_name} is provided by the %{organisation_name}.
You can find out more about us on our website (new window)%{open_in_new_window_text}. If you would like to contact us about %{application_name}, please fill out the form below.') % { + <%= sanitize instructions % { organisation_name: Rails.configuration.x.dmproadmap.organisation_name, organisation_url: Rails.configuration.x.dmproadmap.organisation_url, application_name: ApplicationService.application_name, + helpdesk_email: masked_email, open_in_new_window_text: _('Opens in new window') }, tags: %w( a br span em ) %>

<% if user_signed_in? %> <%= render :partial => "contact_us/contacts/new_left" %> - <% else %> -

- <%= _('Please email our helpdesk, %{helpdesk_email}, if you have an inquiry.') % { helpdesk_email: masked_email } %> -

<% end %>
diff --git a/config/locale/client.pot b/config/locale/client.pot index d285038cf..f2b03ee7e 100644 --- a/config/locale/client.pot +++ b/config/locale/client.pot @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: app 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2025-01-29 23:45+0000\n" -"PO-Revision-Date: 2025-01-29 23:45+0000\n" +"POT-Creation-Date: 2025-01-29 23:58+0000\n" +"PO-Revision-Date: 2025-01-29 23:58+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -90,11 +90,11 @@ msgid "Submit" msgstr "" #: ../../app/views/branded/contact_us/contacts/new.html.erb:2 -#: ../../app/views/branded/contact_us/contacts/new.html.erb:10 +#: ../../app/views/branded/contact_us/contacts/new.html.erb:16 msgid "Contact Us" msgstr "" -#: ../../app/views/branded/contact_us/contacts/new.html.erb:16 +#: ../../app/views/branded/contact_us/contacts/new.html.erb:8 msgid "" "%{application_name} is provided by the %{organisation_name}.
You can fin" "d out more about us on our You can fin" +"d out more about us on our website (new window)%{open_in_new_window_text}. If you " +"would like to contact us about %{application_name}, please email our helpdesk:" +" %{helpdesk_email}." +msgstr "" + +#: ../../app/views/branded/contact_us/contacts/new.html.erb:27 #: ../../app/views/branded/paginable/plans/_organisationally_or_publicly_visible.html.erb:51 #: ../../app/views/branded/paginable/templates/_organisational.html.erb:95 #: ../../app/views/branded/paginable/templates/_publicly_visible.html.erb:36 msgid "Opens in new window" msgstr "" -#: ../../app/views/branded/contact_us/contacts/new.html.erb:28 -msgid "Please email our helpdesk, %{helpdesk_email}, if you have an inquiry." -msgstr "" - #: ../../app/views/branded/contributors/_form.html.erb:4 msgid "Phone numbers should only include numbers and dashes ('-')." msgstr "" diff --git a/config/locale/en/LC_MESSAGES/client.mo b/config/locale/en/LC_MESSAGES/client.mo index c8267ae1e..3d5cc0559 100644 Binary files a/config/locale/en/LC_MESSAGES/client.mo and b/config/locale/en/LC_MESSAGES/client.mo differ diff --git a/config/locale/en/client.po b/config/locale/en/client.po index 01dc59bc7..884ee56ed 100644 --- a/config/locale/en/client.po +++ b/config/locale/en/client.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: app 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2025-01-29 23:45+0000\n" -"PO-Revision-Date: 2025-01-29 23:45+0000\n" +"POT-Creation-Date: 2025-01-29 23:58+0000\n" +"PO-Revision-Date: 2025-01-29 23:58+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: English\n" "Language: en\n" @@ -90,11 +90,11 @@ msgid "Submit" msgstr "Submit" #: ../../app/views/branded/contact_us/contacts/new.html.erb:2 -#: ../../app/views/branded/contact_us/contacts/new.html.erb:10 +#: ../../app/views/branded/contact_us/contacts/new.html.erb:16 msgid "Contact Us" msgstr "Contact Us" -#: ../../app/views/branded/contact_us/contacts/new.html.erb:16 +#: ../../app/views/branded/contact_us/contacts/new.html.erb:8 msgid "" "%{application_name} is provided by the %{organisation_name}.
You can fin" "d out more about us on our You can fin" +"d out more about us on our website (new window)%{open_in_new_window_text}. If you " +"would like to contact us about %{application_name}, please email our helpdesk:" +" %{helpdesk_email}." +msgstr "" +"%{application_name} is provided by the %{organisation_name}.
You can fin" +"d out more about us on our website (new window)%{open_in_new_window_text}. If you " +"would like to contact us about %{application_name}, please email our helpdesk:" +" %{helpdesk_email}." + +#: ../../app/views/branded/contact_us/contacts/new.html.erb:27 #: ../../app/views/branded/paginable/plans/_organisationally_or_publicly_visible.html.erb:51 #: ../../app/views/branded/paginable/templates/_organisational.html.erb:95 #: ../../app/views/branded/paginable/templates/_publicly_visible.html.erb:36 msgid "Opens in new window" msgstr "Opens in new window" -#: ../../app/views/branded/contact_us/contacts/new.html.erb:28 -msgid "Please email our helpdesk, %{helpdesk_email}, if you have an inquiry." -msgstr "Please email our helpdesk, %{helpdesk_email}, if you have an inquiry." - #: ../../app/views/branded/contributors/_form.html.erb:4 msgid "Phone numbers should only include numbers and dashes ('-')." msgstr "Phone numbers should only include numbers and dashes ('-')." diff --git a/config/locale/en_US/LC_MESSAGES/client.mo b/config/locale/en_US/LC_MESSAGES/client.mo index cfe14476f..7ffb3de49 100644 Binary files a/config/locale/en_US/LC_MESSAGES/client.mo and b/config/locale/en_US/LC_MESSAGES/client.mo differ diff --git a/config/locale/en_US/client.po b/config/locale/en_US/client.po index 96dd0c6a5..db99388ee 100644 --- a/config/locale/en_US/client.po +++ b/config/locale/en_US/client.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: app 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2025-01-29 23:45+0000\n" -"PO-Revision-Date: 2025-01-30 00:45+0100\n" +"POT-Creation-Date: 2025-01-29 23:58+0000\n" +"PO-Revision-Date: 2025-01-30 00:58+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: English\n" "Language: en_US\n" @@ -90,11 +90,11 @@ msgid "Submit" msgstr "Submit" #: ../../app/views/branded/contact_us/contacts/new.html.erb:2 -#: ../../app/views/branded/contact_us/contacts/new.html.erb:10 +#: ../../app/views/branded/contact_us/contacts/new.html.erb:16 msgid "Contact Us" msgstr "Contact Us" -#: ../../app/views/branded/contact_us/contacts/new.html.erb:16 +#: ../../app/views/branded/contact_us/contacts/new.html.erb:8 msgid "" "%{application_name} is provided by the %{organisation_name}.
You can fin" "d out more about us on our You can fin" +"d out more about us on our website (new window)%{open_in_new_window_text}. If you " +"would like to contact us about %{application_name}, please email our helpdesk:" +" %{helpdesk_email}." +msgstr "" + +#: ../../app/views/branded/contact_us/contacts/new.html.erb:27 #: ../../app/views/branded/paginable/plans/_organisationally_or_publicly_visible.html.erb:51 #: ../../app/views/branded/paginable/templates/_organisational.html.erb:95 #: ../../app/views/branded/paginable/templates/_publicly_visible.html.erb:36 msgid "Opens in new window" msgstr "" -#: ../../app/views/branded/contact_us/contacts/new.html.erb:28 -msgid "Please email our helpdesk, %{helpdesk_email}, if you have an inquiry." -msgstr "" - #: ../../app/views/branded/contributors/_form.html.erb:4 msgid "Phone numbers should only include numbers and dashes ('-')." msgstr "" diff --git a/config/locale/es/LC_MESSAGES/client.mo b/config/locale/es/LC_MESSAGES/client.mo index 992511948..b27a72aea 100644 Binary files a/config/locale/es/LC_MESSAGES/client.mo and b/config/locale/es/LC_MESSAGES/client.mo differ diff --git a/config/locale/es/client.po b/config/locale/es/client.po index d1120bfaf..5790e76bf 100644 --- a/config/locale/es/client.po +++ b/config/locale/es/client.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: app 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2025-01-29 23:45+0000\n" -"PO-Revision-Date: 2025-01-30 00:45+0100\n" +"POT-Creation-Date: 2025-01-29 23:58+0000\n" +"PO-Revision-Date: 2025-01-30 00:58+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: Spanish\n" "Language: es\n" @@ -90,11 +90,11 @@ msgid "Submit" msgstr "Enviar" #: ../../app/views/branded/contact_us/contacts/new.html.erb:2 -#: ../../app/views/branded/contact_us/contacts/new.html.erb:10 +#: ../../app/views/branded/contact_us/contacts/new.html.erb:16 msgid "Contact Us" msgstr "Contactanos" -#: ../../app/views/branded/contact_us/contacts/new.html.erb:16 +#: ../../app/views/branded/contact_us/contacts/new.html.erb:8 msgid "" "%{application_name} is provided by the %{organisation_name}.
You can fin" "d out more about us on our . Si desea ponerse en contacto con nosotros acerca de %{a" "pplication_name}, complete el siguiente formulario." -#: ../../app/views/branded/contact_us/contacts/new.html.erb:20 +#: ../../app/views/branded/contact_us/contacts/new.html.erb:10 +msgid "" +"%{application_name} is provided by the %{organisation_name}.
You can fin" +"d out more about us on our website (new window)%{open_in_new_window_text}. If you " +"would like to contact us about %{application_name}, please email our helpdesk:" +" %{helpdesk_email}." +msgstr "" + +#: ../../app/views/branded/contact_us/contacts/new.html.erb:27 #: ../../app/views/branded/paginable/plans/_organisationally_or_publicly_visible.html.erb:51 #: ../../app/views/branded/paginable/templates/_organisational.html.erb:95 #: ../../app/views/branded/paginable/templates/_publicly_visible.html.erb:36 msgid "Opens in new window" msgstr "Abre en nueva ventana" -#: ../../app/views/branded/contact_us/contacts/new.html.erb:28 -msgid "Please email our helpdesk, %{helpdesk_email}, if you have an inquiry." -msgstr "" - #: ../../app/views/branded/contributors/_form.html.erb:4 msgid "Phone numbers should only include numbers and dashes ('-')." msgstr "Los números de teléfono solo deben incluir números y guiones ('-')." diff --git a/config/locale/pt_BR/LC_MESSAGES/client.mo b/config/locale/pt_BR/LC_MESSAGES/client.mo index 198291c87..ee9266a5f 100644 Binary files a/config/locale/pt_BR/LC_MESSAGES/client.mo and b/config/locale/pt_BR/LC_MESSAGES/client.mo differ diff --git a/config/locale/pt_BR/client.po b/config/locale/pt_BR/client.po index cce9bf2c6..7bd1c0e86 100644 --- a/config/locale/pt_BR/client.po +++ b/config/locale/pt_BR/client.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: app 1.0\n" "Report-Msgid-Bugs-To: contact@translation.io\n" -"POT-Creation-Date: 2025-01-29 23:45+0000\n" -"PO-Revision-Date: 2025-01-30 00:45+0100\n" +"POT-Creation-Date: 2025-01-29 23:58+0000\n" +"PO-Revision-Date: 2025-01-30 00:58+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: Portuguese\n" "Language: pt_BR\n" @@ -90,11 +90,11 @@ msgid "Submit" msgstr "Submeter" #: ../../app/views/branded/contact_us/contacts/new.html.erb:2 -#: ../../app/views/branded/contact_us/contacts/new.html.erb:10 +#: ../../app/views/branded/contact_us/contacts/new.html.erb:16 msgid "Contact Us" msgstr "Contate-nos" -#: ../../app/views/branded/contact_us/contacts/new.html.erb:16 +#: ../../app/views/branded/contact_us/contacts/new.html.erb:8 msgid "" "%{application_name} is provided by the %{organisation_name}.
You can fin" "d out more about us on our You can fin" +"d out more about us on our website (new window)%{open_in_new_window_text}. If you " +"would like to contact us about %{application_name}, please email our helpdesk:" +" %{helpdesk_email}." +msgstr "" +"%{application_name} é fornecido por %{organisation_name}.
Você pode desc" +"obrir mais sobre nós em nosso site (nova janela) %{open_in_new_window_text} . Se v" +"ocê quiser entrar em contato conosco sobre %{application_name}, envie um e-mai" +"l para nosso helpdesk: %{helpdesk_email}." + +#: ../../app/views/branded/contact_us/contacts/new.html.erb:27 #: ../../app/views/branded/paginable/plans/_organisationally_or_publicly_visible.html.erb:51 #: ../../app/views/branded/paginable/templates/_organisational.html.erb:95 #: ../../app/views/branded/paginable/templates/_publicly_visible.html.erb:36 msgid "Opens in new window" msgstr "Abre em uma nova janela" -#: ../../app/views/branded/contact_us/contacts/new.html.erb:28 -msgid "Please email our helpdesk, %{helpdesk_email}, if you have an inquiry." -msgstr "" -"Envie um e-mail para nosso helpdesk, %{helpdesk_email}, se tiver alguma dúvida" -"." - #: ../../app/views/branded/contributors/_form.html.erb:4 msgid "Phone numbers should only include numbers and dashes ('-')." msgstr "Os números de telefone devem incluir apenas números e traços ('-')."