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.

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] Converting additional mails to mail templates #31621

Merged
merged 7 commits into from
Jan 7, 2021

Conversation

Hackwar
Copy link
Member

@Hackwar Hackwar commented Dec 9, 2020

Pull Request for Issue #29215.

Summary of Changes

This converts the mails of the actionlogs component, the privacy component and the privacy consent plugin to the mail template system.

  • Notification mail from com_actionlogs (administrator\components\com_actionlogs\src\Model\ActionlogModel.php line 174)
  • com_messages notification (administrator\components\com_messages\src\Model\MessageModel.php line 435)
  • com_privacy send export to user (administrator\components\com_privacy\src\Model\ExportModel.php line 240)
  • com_privacy notification about a new request (administrator\components\com_privacy\src\Model\RequestModel.php line 362)
  • com_privacy creating a new request (components\com_privacy\src\Model\RequestModel.php line 188/190 ATTENTION!! HERE IS A BUG! The mail is send twice!)
  • reminder of expiring privacy consent (plugins\system\privacyconsent\privacyconsent.php line 604)
  • User registration (components\com_users\src\Model\RegistrationModel.php line 198, 254, 650, 711)

The mentioned bug has also been fixed.

Testing Instructions

You have to trigger the feature to send these mails to test this.

  • Go to your user profile in the backend and enable to receive actionlog updates. You should get a mail when you login.
  • Create a request for export or removal in the frontend privacy component to trigger the frontend mails.
  • Create a request for export or removal in the backend privacy component to trigger the backend mails.
  • Send the export of data in the backend via mail to trigger that one...
  • Enable renewable consents, give consent and then edit it in the database to be close to expiration. That should trigger that last mail.
  • Register users with all the different settings we have.

@joomla-cms-bot joomla-cms-bot added Language Change This is for Translators PR-4.0-dev labels Dec 9, 2020
@HLeithner HLeithner marked this pull request as draft December 9, 2020 13:41
@brianteeman
Copy link
Contributor

Dont you need to delete this file if it is no longer being used ?
administrator\components\com_actionlogs\layouts\logstable.php

@brianteeman
Copy link
Contributor

You've removed the instructions to translators
You can use the following merge codes for all COM_PRIVACY_EMAIL strings:

But shouldnt that be replaced with a note to translators about the placeholders in the new strings?

@richard67
Copy link
Member

@Hackwar I see 2 new update SQL scripts 4.0.0-2020-12-08.sql, but I can't see any changes in supports.sql for new installations in this PR. Forgotten?

@Hackwar
Copy link
Member Author

Hackwar commented Dec 20, 2020

@brianteeman I deleted the file. Regarding the placeholders: Since those aren't fixed anymore and can be extended at will, I don't think the notes are helpfull enough to keep them. I understand your point, but I think that will create more confusion than be helpfull. If you disagree hard on that, I can put those back in, but I would prefer to leave that out.

@richard67 Fixed.

…ailtemplates

# Conflicts:
#	administrator/language/en-GB/com_users.ini
#	language/en-GB/com_users.ini
@Hackwar Hackwar marked this pull request as ready for review December 29, 2020 22:24
@Hackwar
Copy link
Member Author

Hackwar commented Dec 29, 2020

Ok, now all mails have been converted to templates. I don't want to have to do that again...

I encountered one issue: When you are in the mail template component, you can filter by extension. When you do that, you get only a reduced number of strings translated in that list, since we only load the extension translation files for which we currently have templates displayed. I'm not yet sure where to put code to load those files every time...

@Hackwar
Copy link
Member Author

Hackwar commented Dec 29, 2020

BTW: That makes 25 mail templates so far in the system.

@richard67
Copy link
Member

Adding the release blocker label as inherited from the issue #29215 .

@wilsonge wilsonge merged commit 88e7243 into joomla:4.0-dev Jan 7, 2021
@wilsonge
Copy link
Contributor

wilsonge commented Jan 7, 2021

I'm merging this without tests so it's in the beta for this evening

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Language Change This is for Translators
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants