From ab7d7233211a58b7c6231116b868c33adcb46180 Mon Sep 17 00:00:00 2001
From: Jean-Marie Simonet <infografjms@gmail.com>
Date: Tue, 26 May 2020 11:03:02 +0200
Subject: [PATCH 1/2] [4.0] com_mails: string typo & template fields labels
 display missing

---
 administrator/components/com_mails/tmpl/template/edit.php | 3 +++
 administrator/language/en-GB/com_users.ini                | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/administrator/components/com_mails/tmpl/template/edit.php b/administrator/components/com_mails/tmpl/template/edit.php
index 8f1191922900e..2f151796cb9bf 100644
--- a/administrator/components/com_mails/tmpl/template/edit.php
+++ b/administrator/components/com_mails/tmpl/template/edit.php
@@ -53,6 +53,7 @@
 				<?php echo $this->form->renderField('subject'); ?>
 			</div>
 			<div class="col-md-3">
+				<?php echo $this->form->getField('subject_switcher')->label; ?>
 				<?php echo $this->form->getField('subject_switcher')->input; ?>
 			</div>
 		</div>
@@ -63,6 +64,7 @@
 				<?php echo $this->form->renderField('body'); ?>
 			</div>
 			<div class="col-md-3">
+				<?php echo $this->form->getField('body_switcher')->label; ?>
 				<?php echo $this->form->getField('body_switcher')->input; ?>
 				<div class="tags-container-body <?php echo $fieldBody->disabled ? 'hidden' : ''; ?>">
 					<h2><?php echo Text::_('COM_MAILS_FIELDSET_TAGS_LABEL'); ?></h2>
@@ -78,6 +80,7 @@
 				<?php echo $this->form->renderField('htmlbody'); ?>
 			</div>
 			<div class="col-md-3">
+				<?php echo $this->form->getField('htmlbody_switcher')->label; ?>
 				<?php echo $this->form->getField('htmlbody_switcher')->input; ?>
 				<div class="tags-container-htmlbody <?php echo $fieldHtmlBody->disabled ? 'hidden' : ''; ?>">
 					<h2><?php echo Text::_('COM_MAILS_FIELDSET_TAGS_LABEL'); ?></h2>
diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini
index 694c58d3a015f..4d93b2f458c60 100644
--- a/administrator/language/en-GB/com_users.ini
+++ b/administrator/language/en-GB/com_users.ini
@@ -188,7 +188,7 @@ COM_USERS_MAIL_PLEASE_FILL_IN_THE_FORM_CORRECTLY="Please fill in the form correc
 COM_USERS_MAIL_PLEASE_FILL_IN_THE_MESSAGE="Please enter a message"
 COM_USERS_MAIL_PLEASE_FILL_IN_THE_SUBJECT="Please enter a subject"
 COM_USERS_MAIL_PLEASE_SELECT_A_GROUP="Please select a Group"
-COM_USERS_MAIL_REMINDER_DESC="This mail is sent to a user when by the \"Forgot your username?\" link e.g. in a login form."
+COM_USERS_MAIL_REMINDER_DESC="This mail is sent to a user by the \"Forgot your username?\" link e.g. in a login form."
 COM_USERS_MAIL_REMINDER_TITLE="Users: Username Reminder"
 COM_USERS_MAIL_THE_MAIL_COULD_NOT_BE_SENT="The mail could not be sent."
 COM_USERS_MASS_MAIL="Mass Mail Users"

From 409acffaa08cf373f9c3c48cb1cf5860d9d7d8fa Mon Sep 17 00:00:00 2001
From: infograf768 <infografjms@gmail.com>
Date: Tue, 26 May 2020 12:47:36 +0200
Subject: [PATCH 2/2] Update administrator/language/en-GB/com_users.ini

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
---
 administrator/language/en-GB/com_users.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/language/en-GB/com_users.ini b/administrator/language/en-GB/com_users.ini
index 4d93b2f458c60..6991d1c085577 100644
--- a/administrator/language/en-GB/com_users.ini
+++ b/administrator/language/en-GB/com_users.ini
@@ -188,7 +188,7 @@ COM_USERS_MAIL_PLEASE_FILL_IN_THE_FORM_CORRECTLY="Please fill in the form correc
 COM_USERS_MAIL_PLEASE_FILL_IN_THE_MESSAGE="Please enter a message"
 COM_USERS_MAIL_PLEASE_FILL_IN_THE_SUBJECT="Please enter a subject"
 COM_USERS_MAIL_PLEASE_SELECT_A_GROUP="Please select a Group"
-COM_USERS_MAIL_REMINDER_DESC="This mail is sent to a user by the \"Forgot your username?\" link e.g. in a login form."
+COM_USERS_MAIL_REMINDER_DESC="This mail is sent to a user by using the \"Forgot your username?\" link e.g. in a login form."
 COM_USERS_MAIL_REMINDER_TITLE="Users: Username Reminder"
 COM_USERS_MAIL_THE_MAIL_COULD_NOT_BE_SENT="The mail could not be sent."
 COM_USERS_MASS_MAIL="Mass Mail Users"