From c858db1bc07e52866dfa3c918c97c4e950c59ada Mon Sep 17 00:00:00 2001 From: loris-fab Date: Thu, 6 Aug 2026 14:30:17 +0200 Subject: [PATCH 1/2] [T3359] FIX: Childpack typography under the child photo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Draw the parentheses around the birthdate in CSS instead of wrapping them in 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 "(" 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. --- child_compassion/i18n/da_DK.po | 5 ---- child_compassion/i18n/de.po | 5 ---- child_compassion/i18n/fr_CH.po | 11 ++------ child_compassion/i18n/it.po | 9 ++----- child_compassion/i18n/nb_NO.po | 5 ---- child_compassion/i18n/sv_SE.po | 5 ---- child_compassion/report/childpack.xml | 36 +++++++++++++++++---------- 7 files changed, 27 insertions(+), 49 deletions(-) diff --git a/child_compassion/i18n/da_DK.po b/child_compassion/i18n/da_DK.po index 30660fc73..b86bb3586 100644 --- a/child_compassion/i18n/da_DK.po +++ b/child_compassion/i18n/da_DK.po @@ -29,11 +29,6 @@ msgstr "*Fødselsdatoen er et estimat" msgid "365 children" msgstr "365 børn" -#. module: child_compassion -#: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document -msgid "(" -msgstr "(" - #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document msgid "About the child development center" diff --git a/child_compassion/i18n/de.po b/child_compassion/i18n/de.po index 11ea084ad..f02bf6302 100644 --- a/child_compassion/i18n/de.po +++ b/child_compassion/i18n/de.po @@ -29,11 +29,6 @@ msgstr "Der Geburtstag ist eine Schätzung." msgid "365 children" msgstr "365 Kinder" -#. module: child_compassion -#: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document -msgid "(" -msgstr "Geb." - #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document msgid "About the child development center" diff --git a/child_compassion/i18n/fr_CH.po b/child_compassion/i18n/fr_CH.po index 5d3351b77..99a6a7beb 100644 --- a/child_compassion/i18n/fr_CH.po +++ b/child_compassion/i18n/fr_CH.po @@ -29,13 +29,6 @@ msgstr "* La date de naissance est estimée." msgid "365 children" msgstr "365 enfants" -#. module: child_compassion -#: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document -#, fuzzy -#| msgid "Born" -msgid "(" -msgstr "Né" - #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document msgid "About the child development center" @@ -49,12 +42,12 @@ msgstr "Disponible jusqu'au : " #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document msgid "Born (F)" -msgstr "Née" +msgstr "Née le" #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document msgid "Born" -msgstr "Né" +msgstr "Né le" #. module: child_compassion #: model:ir.model.constraint,message:child_compassion.constraint_compassion_household_household_uniq diff --git a/child_compassion/i18n/it.po b/child_compassion/i18n/it.po index 9ded4171f..888df7a71 100644 --- a/child_compassion/i18n/it.po +++ b/child_compassion/i18n/it.po @@ -29,11 +29,6 @@ msgstr "* Il compleanno è una stima." msgid "365 children" msgstr "365 bambini" -#. module: child_compassion -#: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document -msgid "(" -msgstr "Nato" - #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document msgid "About the child development center" @@ -47,12 +42,12 @@ msgstr "Disponibile fino a: " #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document msgid "Born (F)" -msgstr "Nata" +msgstr "Nata il" #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document msgid "Born" -msgstr "Nato" +msgstr "Nato il" #. module: child_compassion #: model:ir.model.constraint,message:child_compassion.constraint_compassion_household_household_uniq diff --git a/child_compassion/i18n/nb_NO.po b/child_compassion/i18n/nb_NO.po index 7a1b2dcf7..5742909a8 100644 --- a/child_compassion/i18n/nb_NO.po +++ b/child_compassion/i18n/nb_NO.po @@ -29,11 +29,6 @@ msgstr "*Fødselsdatoen er et estimat" msgid "365 children" msgstr "365 barn" -#. module: child_compassion -#: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document -msgid "(" -msgstr "(" - #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document msgid "About the child development center" diff --git a/child_compassion/i18n/sv_SE.po b/child_compassion/i18n/sv_SE.po index 8bd23e79f..535b65a9d 100644 --- a/child_compassion/i18n/sv_SE.po +++ b/child_compassion/i18n/sv_SE.po @@ -29,11 +29,6 @@ msgstr "*Födelsedatumet är en uppskattning" msgid "365 children" msgstr "365 barn" -#. module: child_compassion -#: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document -msgid "(" -msgstr "(" - #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document msgid "About the child development center" diff --git a/child_compassion/report/childpack.xml b/child_compassion/report/childpack.xml index 34700101b..17844e6d8 100644 --- a/child_compassion/report/childpack.xml +++ b/child_compassion/report/childpack.xml @@ -125,20 +125,22 @@

- - - ( - - + - Born (F) - - - Born - - - ) + + Born (F) + + + Born + + +

Date: Thu, 6 Aug 2026 14:41:05 +0200 Subject: [PATCH 2/2] [T3359] FIX: Make the childpack birth label translations reload MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- child_compassion/i18n/da_DK.po | 4 ++-- child_compassion/i18n/de.po | 4 ++-- child_compassion/i18n/fr_CH.po | 4 ++-- child_compassion/i18n/it.po | 4 ++-- child_compassion/i18n/nb_NO.po | 4 ++-- child_compassion/i18n/sv_SE.po | 4 ++-- child_compassion/report/childpack.xml | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/child_compassion/i18n/da_DK.po b/child_compassion/i18n/da_DK.po index b86bb3586..1444f4ec6 100644 --- a/child_compassion/i18n/da_DK.po +++ b/child_compassion/i18n/da_DK.po @@ -41,12 +41,12 @@ msgstr "Tilgængelig indtil: " #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document -msgid "Born (F)" +msgid "Born on (F)" msgstr "Fødselsdato" #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document -msgid "Born" +msgid "Born on" msgstr "Fødselsdato" #. module: child_compassion diff --git a/child_compassion/i18n/de.po b/child_compassion/i18n/de.po index f02bf6302..5ea55db58 100644 --- a/child_compassion/i18n/de.po +++ b/child_compassion/i18n/de.po @@ -41,12 +41,12 @@ msgstr "Gültig bis: " #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document -msgid "Born (F)" +msgid "Born on (F)" msgstr "Geb." #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document -msgid "Born" +msgid "Born on" msgstr "Geb." #. module: child_compassion diff --git a/child_compassion/i18n/fr_CH.po b/child_compassion/i18n/fr_CH.po index 99a6a7beb..8693cbd16 100644 --- a/child_compassion/i18n/fr_CH.po +++ b/child_compassion/i18n/fr_CH.po @@ -41,12 +41,12 @@ msgstr "Disponible jusqu'au : " #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document -msgid "Born (F)" +msgid "Born on (F)" msgstr "Née le" #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document -msgid "Born" +msgid "Born on" msgstr "Né le" #. module: child_compassion diff --git a/child_compassion/i18n/it.po b/child_compassion/i18n/it.po index 888df7a71..263188065 100644 --- a/child_compassion/i18n/it.po +++ b/child_compassion/i18n/it.po @@ -41,12 +41,12 @@ msgstr "Disponibile fino a: " #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document -msgid "Born (F)" +msgid "Born on (F)" msgstr "Nata il" #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document -msgid "Born" +msgid "Born on" msgstr "Nato il" #. module: child_compassion diff --git a/child_compassion/i18n/nb_NO.po b/child_compassion/i18n/nb_NO.po index 5742909a8..089267005 100644 --- a/child_compassion/i18n/nb_NO.po +++ b/child_compassion/i18n/nb_NO.po @@ -41,12 +41,12 @@ msgstr "Tilgjengelig til: " #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document -msgid "Born (F)" +msgid "Born on (F)" msgstr "født" #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document -msgid "Born" +msgid "Born on" msgstr "født" #. module: child_compassion diff --git a/child_compassion/i18n/sv_SE.po b/child_compassion/i18n/sv_SE.po index 535b65a9d..909364904 100644 --- a/child_compassion/i18n/sv_SE.po +++ b/child_compassion/i18n/sv_SE.po @@ -41,12 +41,12 @@ msgstr "Tillgänglig till: " #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document -msgid "Born (F)" +msgid "Born on (F)" msgstr "född" #. module: child_compassion #: model_terms:ir.ui.view,arch_db:child_compassion.childpack_document -msgid "Born" +msgid "Born on" msgstr "född" #. module: child_compassion diff --git a/child_compassion/report/childpack.xml b/child_compassion/report/childpack.xml index 17844e6d8..609b79086 100644 --- a/child_compassion/report/childpack.xml +++ b/child_compassion/report/childpack.xml @@ -132,10 +132,10 @@ - Born (F) + Born on (F) - Born + Born on