Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.0] com_mails: string typo & template fields labels display missing #29224

Merged
merged 2 commits into from
May 26, 2020
Merged

[4.0] com_mails: string typo & template fields labels display missing #29224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab7d723
[4.0] com_mails: string typo & template fields labels display missing
infograf768 May 26, 2020
409acff
Update administrator/language/en-GB/com_users.ini
infograf768 May 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions administrator/components/com_mails/tmpl/template/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/com_users.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 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"
Expand Down