T3359-Childpack_typo - #2131
Open
loris-fab wants to merge 2 commits into
Open
Conversation
- Draw the parentheses around the birthdate in CSS instead of wrapping them
in <span> tags. The opening one was exposed as a translatable term and
fr_CH/de/it had it translated as "Né"/"Geb."/"Nato", so the line read
"8 NÉ NÉ 01 JANV. 2018 )" instead of "8 (NÉ LE 01 JANV. 2018)". Nesting
the spans also let the HTML whitespace collapsing add a space on both
sides of each parenthesis.
- Drop the now unused "<span>(</span>" entry from the six .po files.
- Add the missing preposition to the French and Italian "Born" translations
("Né le", "Nato il"); de/da/nb/sv read fine without one.
Rename the source term from "Born" to "Born on" so it gets a msgid no database translation matches yet, which makes the .po files apply on a plain module upgrade. Odoo calls load_module_terms with overwrite=False unless --i18n-overwrite is passed, so the "Né le" / "Nato il" msgstr of the previous commit were ignored on an existing database and the childpack still printed "NÉE 01 JANV. 2018". The English wording gains the missing preposition too.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Goal
The childpack PDF printed a garbled line under the child photo. In French it read
8 NÉ NÉ 01 JANV. 2018 )instead of8 (NÉ LE 01 JANV. 2018), and German andItalian had the same problem.
Technical aspect
Two distinct bugs in
child_compassion/report/childpack.xml, both in the.summaryblock:<span>, whichexposed
(as a translatable term.fr_CH,deandithad it translated asNé/Geb./Nato, so the opening parenthesis was replaced by a second birthlabel. They are now drawn with
:before/:afterCSS rules, which notranslation can reach. The
msgid "<span>(</span>"entries are removed from thesix
.pofiles.space on both sides of each parenthesis. Nesting the label and the date inside a
single wrapper span removes those.
French and Italian labels lacked prepositions (
Néinstead ofNé le). Updatingmsgstralone doesn't apply on standard Odoo upgrades due tooverwrite=False. To force the update across environments without needing--i18n-overwrite, the source term was renamed fromBorntoBorn on, creating a newmsgid.Misc
No misc