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

Mail translations 2nd attempt #450

Merged
merged 1 commit into from
Nov 20, 2024

Conversation

hakito
Copy link
Contributor

@hakito hakito commented Nov 2, 2024

  • Remove *-custom.tpl from repo - should only be provided by the user
  • Ignore custom translation files
  • defaultPath is a fallback path - The name is misleading, as it's not the default.language setting
  • Remove dead code
    • DisplayLocalized in SmartyPage was never called
    • DisplayLocalized in Page was only a copy, which is still called, but the languageCode parameter is not used.
  • Fix save custom email template for selected language - fixes Custom email templates saved for wrong language #424
  • Fallback to default lang for missing custom templates ..but only when custom template is available for default lang.
  • Add config description
  • Change ReservationShareMail property name - It conflicts with the now protected email property
  • Fix unit test for updating email template
  • closes Limit languages for emails #416

* Remove *-custom.tpl from repo - should only be provided by the user
* Ignore custom translation files
* defaultPath is a fallback path - The name is misleading, as it's not the default.language setting
* Remove dead code
  * DisplayLocalized in SmartyPage was never called
  * DisplayLocalized in Page was only a copy, which is still called, but the languageCode parameter is not used.
* Fix save custom email template for selected language - fixes LibreBooking#424
* Fallback to default lang for missing custom templates ..but only when custom template is available for default lang.
* Add config description
* Change ReservationShareMail property name - It conflicts with the now protected email property
* Fix unit test for updating email template
* closes LibreBooking#416
@hakito hakito force-pushed the mail-translations2 branch from f6d3799 to 507817e Compare November 2, 2024 08:18
@hakito
Copy link
Contributor Author

hakito commented Nov 2, 2024

@effgarces The revert in #441 removed also the changes for #416 and #424. So here is a PR only with the changes for the translations and no refactoring of the email system itself.

I also considered the comment from lucs7 .

The tests are currently failing because of #451

@hakito hakito force-pushed the mail-translations2 branch 2 times, most recently from c32a876 to 507817e Compare November 4, 2024 07:05
@hakito
Copy link
Contributor Author

hakito commented Nov 4, 2024

Now checks are green after DST adaption in New York. (See #451)

@hakito hakito marked this pull request as ready for review November 4, 2024 07:07
@effgarces effgarces merged commit 35d0593 into LibreBooking:develop Nov 20, 2024
4 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Custom email templates saved for wrong language Limit languages for emails
2 participants