fix(reservation): pdf generation is not working in French #697
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When a reminder is set and the language is set to French, the reservation pdf can't be generated because the template does not escape for javascript after translation. In French the default string contains an apostrophe and this is breaking the javascript code. It also makes the update of the reservation impossible since the javascript code generate an error. Adding "|escape:'javascript'" to ReminderBeforeStart and ReminderBeforeEnd fix the problem. The code also fix the French translation. Closes: LibreBooking#584
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a PDF generation error in French due to unescaped apostrophes in reminder strings, and corrects several French translations.
- Escape translated reminder strings for JavaScript context in pdf.tpl
- Update French translations for ReminderBeforeEnd and correct typos in fr_fr.php
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| tpl/Reservation/pdf.tpl | Add ` |
| lang/fr_fr.php | Correct ReminderBeforeEnd semantics and fix typos in several strings |
Comments suppressed due to low confidence (2)
lang/fr_fr.php:414
- The semantics of
ReminderBeforeEndwere changed from "après l'heure de fin" to "avant l'heure de fin"; verify that this matches the intended behavior for end-time reminders.
$strings['ReminderBeforeEnd'] = 'avant l\'heure de fin';
tpl/Reservation/pdf.tpl:262
- Consider adding a unit or integration test to validate PDF generation with French reminder strings containing apostrophes to prevent regressions.
{ content: '{$ReminderTimeEnd} {translate key=$ReminderIntervalEnd} {$ReminderBeforeEnd|escape:'javascript'}'},
Contributor
Author
|
For information, my first try was the cleaner version {translate key=ReminderBeforeStart|escape:'javascript'} as suggested by copilot, but it had no effect. |
JohnVillalovos
approved these changes
Jul 17, 2025
Contributor
JohnVillalovos
left a comment
There was a problem hiding this comment.
LGTM
Thanks @belcirelk
Contributor
|
@belcirelk Feel free to join us in our Discord channel if you like https://discord.gg/4TGThPtmX8 Come by and say hi. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When a reminder is set and the language is set to French, the reservation pdf can't be generated because the template does not escape for javascript after translation. In French the default string contains an apostrophe and this is breaking the javascript code. It also makes the update of the reservation impossible since the javascript code generate an error. Adding "|escape:'javascript'" to ReminderBeforeStart and ReminderBeforeEnd fix the problem. The code also fix the French translation.
Closes: #584