cleanup new contact form message and reran translations

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}.<br /> You can find out more about us on our <a href="%{organisation_url}" class="has-new-window-popup-info" target="_blank">website <em class="sr-only">(new window)</em><span class="new-window-popup-info">%{open_in_new_window_text}</span></a>. 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}.<br /> You can find out more about us on our <a href="%{organisation_url}" class="has-new-window-popup-info" target="_blank">website <em class="sr-only">(new window)</em><span class="new-window-popup-info">%{open_in_new_window_text}</span></a>. If you would like to contact us about %{application_name}, please email our helpdesk: %{helpdesk_email}.')
+end
 %>
 
 <div class="row">
@@ -13,20 +19,17 @@ masked_email = email.gsub('@', ' [at] ').gsub('.', ' [dot] ')
 <div class="row">
   <div class="col-md-6"><!-- Left column container -->
     <p>
-      <%= sanitize _('%{application_name} is provided by the %{organisation_name}.<br /> You can find out more about us on our <a href="%{organisation_url}" class="has-new-window-popup-info" target="_blank">website <em class="sr-only">(new window)</em><span class="new-window-popup-info">%{open_in_new_window_text}</span></a>. 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 ) %>
     </p>
 
     <% if user_signed_in? %>
       <%= render :partial => "contact_us/contacts/new_left" %>
-    <% else %>
-      <p>
-        <%= _('Please email our helpdesk, %{helpdesk_email}, if you have an inquiry.') % { helpdesk_email: masked_email } %>
-      </p>
     <% end %>
   </div><!-- Left column container -->
   <div class="col-md-6"><!-- Right column container -->

config/locale/client.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\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}.<br /> You can fin"
 "d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
@@ -104,17 +104,23 @@ msgid ""
 "elow."
 msgstr ""
 
-#: ../../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}.<br /> You can fin"
+"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
+"-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
+"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. 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 ""

config/locale/en/client.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\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 <EMAIL@ADDRESS>\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}.<br /> You can fin"
 "d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
@@ -110,17 +110,29 @@ msgstr ""
 "would like to contact us about %{application_name}, please fill out the form b"
 "elow."
 
-#: ../../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}.<br /> You can fin"
+"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
+"-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
+"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. 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}.<br /> You can fin"
+"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
+"-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
+"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. 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 ('-')."

config/locale/en_US/client.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\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 <EMAIL@ADDRESS>\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}.<br /> You can fin"
 "d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
@@ -104,17 +104,23 @@ msgid ""
 "elow."
 msgstr ""
 
-#: ../../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}.<br /> You can fin"
+"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
+"-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
+"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. 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 ""

config/locale/es/client.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\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 <EMAIL@ADDRESS>\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}.<br /> You can fin"
 "d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
@@ -110,17 +110,23 @@ msgstr ""
 "dow_text}</span></a> . 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}.<br /> You can fin"
+"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
+"-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
+"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. 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 ('-')."

config/locale/pt_BR/client.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: app 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\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 <EMAIL@ADDRESS>\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}.<br /> You can fin"
 "d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
@@ -110,19 +110,29 @@ msgstr ""
 " você quiser entrar em contato conosco sobre o %{application_name}, preencha o"
 " formulário abaixo."
 
-#: ../../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}.<br /> You can fin"
+"d out more about us on our <a href=\"%{organisation_url}\" class=\"has-new-window"
+"-popup-info\" target=\"_blank\">website <em class=\"sr-only\">(new window)</em><spa"
+"n class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a>. If you "
+"would like to contact us about %{application_name}, please email our helpdesk:"
+" %{helpdesk_email}."
+msgstr ""
+"%{application_name} é fornecido por %{organisation_name}.<br /> Você pode desc"
+"obrir mais sobre nós em nosso <a href=\"%{organisation_url}\" class=\"has-new-win"
+"dow-popup-info\" target=\"_blank\">site <em class=\"sr-only\">(nova janela)</em> <s"
+"pan class=\"new-window-popup-info\">%{open_in_new_window_text}</span></a> . 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 ('-')."