From bcdce09dbac60cbf1699f622693d05557a2d7a6f Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Fri, 22 Mar 2024 17:28:15 +0100
Subject: [PATCH 1/4] fix(Contact form): make email translatable

---
 frappe/www/contact.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frappe/www/contact.py b/frappe/www/contact.py
index 4e791ca067..78743bb138 100644
--- a/frappe/www/contact.py
+++ b/frappe/www/contact.py
@@ -34,10 +34,13 @@ def send_message(sender, message, subject="Website Query"):
 		if forward_to_email := frappe.db.get_single_value("Contact Us Settings", "forward_to_email"):
 			frappe.sendmail(recipients=forward_to_email, reply_to=sender, content=message, subject=subject)
 
+		reply = _(
+			"Thank you for reaching out to us. We will get back to you at the earliest.\n\n\nYour query:\n\n{0}"
+		).format(message)
 		frappe.sendmail(
 			recipients=sender,
-			content=f"<div style='white-space: pre-wrap'>Thank you for reaching out to us. We will get back to you at the earliest.\n\n\nYour query:\n\n{message}</div>",
-			subject="We've received your query!",
+			content=f"<div style='white-space: pre-wrap'>{reply}</div>",
+			subject=_("We've received your query!"),
 		)
 
 	# for clearing outgoing email error message

From b440eab24f1a83f8835eacb00dd4b82fb6a347cc Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Fri, 22 Mar 2024 17:44:37 +0100
Subject: [PATCH 2/4] fix(Contact form): make title and options translatable

---
 frappe/www/contact.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/www/contact.html b/frappe/www/contact.html
index a6672d63d2..d34c63589d 100644
--- a/frappe/www/contact.html
+++ b/frappe/www/contact.html
@@ -1,7 +1,7 @@
 {% extends "templates/web.html" %}
 
 {% set title = heading or "Contact Us" %}
-{% block header %}<h1>{{ heading or "Contact Us" }}</h1>{% endblock %}
+{% block header %}<h1>{{ heading or _("Contact Us") }}</h1>{% endblock %}
 
 {% block page_content %}
 <style>
@@ -23,10 +23,10 @@
 				<select name="subject" class="form-control">
 				{% if query_options -%}
 					{% for option in query_options.split("\n") -%}
-					<option value="{{ option }}">{{ option }}</option>
+					<option value="{{ option }}">{{ _(option) }}</option>
 					{%- endfor %}
 				{% else %}
-					<option value="General">General</option>
+					<option value="General">{{ _("General") }}</option>
 				{% endif %}
 				</select>
 			</div>

From 457f5bf4376f3ee781cd9aa75c77522eff2a3748 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Fri, 22 Mar 2024 17:45:10 +0100
Subject: [PATCH 3/4] fix(Contact form): translate internal notification to
 system language

---
 frappe/www/contact.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/www/contact.py b/frappe/www/contact.py
index 78743bb138..da924aa1b6 100644
--- a/frappe/www/contact.py
+++ b/frappe/www/contact.py
@@ -46,11 +46,12 @@ def send_message(sender, message, subject="Website Query"):
 	# for clearing outgoing email error message
 	frappe.clear_last_message()
 
+	system_language = frappe.db.get_single_value("System Settings", "language")
 	# add to to-do ?
 	frappe.get_doc(
 		doctype="Communication",
 		sender=sender,
-		subject=_("New Message from Website Contact Page"),
+		subject=_("New Message from Website Contact Page", system_language),
 		sent_or_received="Received",
 		content=message,
 		status="Open",

From f40fa6ec7333c8b70f2d428e3e66be1b15b03790 Mon Sep 17 00:00:00 2001
From: barredterra <14891507+barredterra@users.noreply.github.com>
Date: Fri, 22 Mar 2024 17:54:22 +0100
Subject: [PATCH 4/4] style: newlines that don't trigger semgrep

---
 frappe/www/contact.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frappe/www/contact.py b/frappe/www/contact.py
index da924aa1b6..1d6db31f68 100644
--- a/frappe/www/contact.py
+++ b/frappe/www/contact.py
@@ -35,7 +35,12 @@ def send_message(sender, message, subject="Website Query"):
 			frappe.sendmail(recipients=forward_to_email, reply_to=sender, content=message, subject=subject)
 
 		reply = _(
-			"Thank you for reaching out to us. We will get back to you at the earliest.\n\n\nYour query:\n\n{0}"
+			"""Thank you for reaching out to us. We will get back to you at the earliest.
+
+
+Your query:
+
+{0}"""
 		).format(message)
 		frappe.sendmail(
 			recipients=sender,