From 510a843fdd7d4802c0232e291701d1636ff6a362 Mon Sep 17 00:00:00 2001
From: Nate <github@najo.com>
Date: Wed, 12 Feb 2020 13:56:53 -0700
Subject: [PATCH] Email Templates: Integrate select box on template type.

---
 app/email_templates/app_languages.php       | 26 ++++++++++++++++++---
 app/email_templates/email_template_edit.php |  7 +++---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/app/email_templates/app_languages.php b/app/email_templates/app_languages.php
index edf25b51cd..be3b6ca1ad 100644
--- a/app/email_templates/app_languages.php
+++ b/app/email_templates/app_languages.php
@@ -281,15 +281,15 @@
 		$text['label-template_type']['sv-se'] = '';
 		$text['label-template_type']['uk-ua'] = '';
 
-		$text['description-template_type']['en-us'] = 'Set the type as html or text.';
+		$text['description-template_type']['en-us'] = 'Set the content type.';
 		$text['description-template_type']['ar-eg'] = '';
 		$text['description-template_type']['de-at'] = '';
 		$text['description-template_type']['de-ch'] = '';
 		$text['description-template_type']['de-de'] = '';
 		$text['description-template_type']['es-cl'] = '';
 		$text['description-template_type']['es-mx'] = '';
-		$text['description-template_type']['fr-ca'] = 'Définir le type en HTML ou texte';
-		$text['description-template_type']['fr-fr'] = 'Définir le type en HTML ou texte';
+		$text['description-template_type']['fr-ca'] = 'Définir le type';
+		$text['description-template_type']['fr-fr'] = 'Définir le type';
 		$text['description-template_type']['he-il'] = '';
 		$text['description-template_type']['it-it'] = '';
 		$text['description-template_type']['nl-nl'] = '';
@@ -301,6 +301,26 @@
 		$text['description-template_type']['sv-se'] = '';
 		$text['description-template_type']['uk-ua'] = '';
 
+		$text['label-template_text']['en-us'] = "Text";
+		$text['label-template_text']['ar-eg'] = "";
+		$text['label-template_text']['de-at'] = "Text"; //copied from de-de
+		$text['label-template_text']['de-ch'] = "Text"; //copied from de-de
+		$text['label-template_text']['de-de'] = "Text";
+		$text['label-template_text']['es-cl'] = "Texto";
+		$text['label-template_text']['es-mx'] = "Texto"; //copied from es-cl
+		$text['label-template_text']['fr-ca'] = "Texte"; //copied from fr-fr
+		$text['label-template_text']['fr-fr'] = "Texte";
+		$text['label-template_text']['he-il'] = "טקסט";
+		$text['label-template_text']['it-it'] = "Testo";
+		$text['label-template_text']['nl-nl'] = "Text";
+		$text['label-template_text']['pl-pl'] = "Tekst";
+		$text['label-template_text']['pt-br'] = "Texto"; //copied from pt-pt
+		$text['label-template_text']['pt-pt'] = "Texto";
+		$text['label-template_text']['ro-ro'] = "";
+		$text['label-template_text']['ru-ru'] = "Текст";
+		$text['label-template_text']['sv-se'] = "Text";
+		$text['label-template_text']['uk-ua'] = "Текст";
+
 		$text['label-template_enabled']['en-us'] = 'Enabled';
 		$text['label-template_enabled']['ar-eg'] = '';
 		$text['label-template_enabled']['de-at'] = '';
diff --git a/app/email_templates/email_template_edit.php b/app/email_templates/email_template_edit.php
index d3fc15c844..f4698d6aef 100644
--- a/app/email_templates/email_template_edit.php
+++ b/app/email_templates/email_template_edit.php
@@ -273,7 +273,10 @@
 	echo "	".$text['label-template_type']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' style='position: relative;' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='template_type' maxlength='255' value=\"".escape($template_type)."\">\n";
+	echo "	<select class='formfld' name='template_type'>\n";
+	echo "		<option value='html'>HTML</option>\n";
+	echo "		<option value='text' ".($template_type == 'text' ? "selected='selected'" : null).">".$text['label-template_text']."</option>\n";
+	echo "	</select>\n";
 	echo "<br />\n";
 	echo $text['description-template_type']."\n";
 	echo "</td>\n";
@@ -298,8 +301,6 @@
 		echo "		<option value='false'>".$text['label-false']."</option>\n";
 	}
 	echo "	</select>\n";
-	echo "<br />\n";
-	echo $text['description-template_enabled']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";