-
Couldn't load subscription status.
- Fork 30.2k
[FIX] core: propagate update of modifiers attributes from base terms #150152
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
[FIX] core: propagate update of modifiers attributes from base terms #150152
Conversation
3b3ccdd to
73bf5fb
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems a very interesting feature. But
- The
transformcannot handle multi layer xml/html
e.g.<small><span ... - I don't know if it would be too complicated to explain the expected result after translation sync. For your problem, can we just diasble the close matching feature when
env.lang is None/ a special context / upgrade?
|
1c9a589 to
04ee594
Compare
|
Hello @HydrionBurst I pushed a more detailed description with a full example. I also made the structural matching more robust and put the use of the new transformation behind |
04ee594 to
2e24f40
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That patch feels a bit invasive for a module upgrade issue. But it looks kind of okay to me. Did you benchmark it? Is the result worth the added overhead?
|
For info I'm working in running this in runbot DB with all modules installed + some improvements. I'll take into account the suggestions ;) |
2e24f40 to
a8bef90
Compare
|
OK, so I pushed all your suggestions with some small details.
With the previous version the run I did on a runbot db with all modules installed in an upgrade 16->17 with these languages installed
I'm re-running the upgrade with the latest version of the code. I'll post the total time spent in the adapters. Total time of the upgrade is around 40min. EDIT: on my last run, 31min total upgrade time of which just 0.3 seconds were spent in the adapters for the roughly 7.5K calls to the non-identity adapter. |
a8bef90 to
cae6592
Compare
cae6592 to
863fe79
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Except the small question, others LGTM
Thanks for your great work!
6f7ae59 to
9eb8a29
Compare
|
@odoo/rd-security could you please approve this? The |
They're both completely unnecessary, you can use |
|
@robodoo override=ci/security Both calls to |
`get_text_content` will transform contiguous space chars into single spaces, plus translate special HTML elements ``` >>> " ".join(html.fromstring(f"a\n b & c").text_content().split()) 'a b & c' ``` In order the correctly verify if a term is text-only we need to use the HTML parser. Note that to be resilient against bad XML, but valid HTML, we cannot use the default XML parser.
When we update an inline translated element (like `<span>`) for the base language `en_US` we should update the modifiers attributes for all languages. For example when updating from (16.0) https://github.com/odoo/odoo/blob/7ecd9413/odoo/addons/base/views/ir_ui_view_views.xml#L127-L129 https://github.com/odoo/odoo/blob/7ecd9413/odoo/addons/base/i18n/fr.po#L7233-L7235 to (17.0) https://github.com/odoo/odoo/blob/b1461d28/odoo/addons/base/views/ir_ui_view_views.xml#L126-L128 https://github.com/odoo/odoo/blob/b1461d28/odoo/addons/base/i18n/fr.po#L12087-L12089 The base term, `en_US`, is updated since the text matches but the attributes of the translated terms, `fr_FR` for example, are not updated. Later when the PO file is loaded in non-overwrite mode the translated terms for `fr_FR` is not updated. This causes all sort of issues during an upgrade for inline-translated terms -- like `<span>`. More so since the recent change that converts domain-based attributes into inline Python expressions. In this patch we propagate modifiers attributes from inline-translated items in the new base term into all translated terms when the base term is updated. In that way we ensure the attributes are correct in all languages even if later the loading of their corresponding PO file doesn't update the term. For a detailed example, let's see what happens when loading the view above during an upgrade 16->17, right at the first load of the XML file at https://github.com/odoo/odoo/blob/b1461d28/odoo/fields.py#L1864 ``` (Pdb) p old_term '<span attrs="{\'invisible\': [(\'reset_mode\', \'!=\', \'soft\')]}">This view has no previous version.</span>\n <span attrs="{\'invisible\': [(\'reset_mode\', \'!=\', \'hard\')]}">This view is not coming from a file.</span>\n <span attrs="{\'invisible\': [(\'reset_mode\', \'!=\', \'other_view\')]}">You need two views to compare.</span>' (Pdb) p closest_term '<span invisible="reset_mode != \'soft\'">This view has no previous version.</span>\n <span invisible="reset_mode != \'hard\'">This view is not coming from a file.</span>\n <span invisible="reset_mode != \'other_view\'">You need two views to compare.</span>' (Pdb) p translation_dictionary[old_term] defaultdict(<class 'dict'>, {'fr_FR': '<span attrs="{\'invisible\': [(\'reset_mode\', \'!=\', \'soft\')]}">Cette vue n\'a pas de version antérieure.</span>\n <span attrs="{\'invisible\': [(\'reset_mode\', \'!=\', \'hard\')]}">Cette vue ne provient pas d\'un fichier.</span>\n <span attrs="{\'invisible\': [(\'reset_mode\', \'!=\', \'other_view\')]}">Vous avez besoin de deux vues pour comparer.</span>'}) ``` As we can see the new term will get an updated value for its `invisible` attribute, while also removing `attrs`. The translated terms will be still keep the old modifier though. Now later when the fr_FR.po file is loaded we reach this point https://github.com/odoo/odoo/blob/b1461d28/odoo/tools/translate.py#L1442 ``` (Pdb) p term_en '<span invisible="reset_mode != \'soft\'">This view has no previous version.</span>\n <span invisible="reset_mode != \'hard\'">This view is not coming from a file.</span>\n <span invisible="reset_mode != \'other_view\'">You need two views to compare.</span>' (Pdb) p translation_dictionary[term_en] defaultdict(<function DeepDefaultDict at 0x7fc9640cdfc0>, {'fr_FR': '<span attrs="{\'invisible\': [(\'reset_mode\', \'!=\', \'soft\')]}">Cette vue n\'a pas de version antérieure.</span>\n <span attrs="{\'invisible\': [(\'reset_mode\', \'!=\', \'hard\')]}">Cette vue ne provient pas d\'un fichier.</span>\n <span attrs="{\'invisible\': [(\'reset_mode\', \'!=\', \'other_view\')]}">Vous avez besoin de deux vues pour comparer.</span>'}) ``` Thus the translated values are NOT updated, keeping the _wrong_ modifiers. This is later fixed during the upgrade in a clumsy way. C.f. the warnings like this one in runbot: ``` Incomplete conversion for view(id=77, lang=fr_FR) at <span attrs="{'invisible': [('reset_mode', '!=', 'soft')]}">Cette vue n'a pas de version antérieure.</span> ``` Note that such warnings are gone in current PR CI. The root issue here is that when the fr_FR translation is loaded the terms are not updated due to a combination of factors: 1. The text content of the term didn't change 2. There is no override flag set for translations Option 2 is not a valid option during upgrades because we want to keep custom translations. We could instead of the current patch tweak how option 1 works and perhaps make the closest term more restricted. This would lead to the update of the whole translation though while the actual issue here is _just_ the modifiers. Moreover if the translations are out of sync the translated terms will still keep the wrong values that could still be essential for the correct functioning of the record they belong too (view archs -- for example). Finally this is a more extreme case (16.0): https://github.com/odoo/enterprise/blob/1e63b4a8/sale_subscription/views/sale_order_views.xml#L142 In this case during the upgrade we fix the modifier value (refer to runbot warning above -- it's the same script that fixes it) and set ``` invisible="(subscription_management == 'upsell') or (recurrence_id == False)" ``` for translations, which is wrong. The correct value is (17.0): ``` invisible="not plan_id or subscription_state == '7_upsell'" ``` https://github.com/odoo/enterprise/blob/530ba3ad/sale_subscription/views/sale_order_views.xml#L136
9eb8a29 to
522145a
Compare
|
@robodoo rebase-ff r+ |
|
Merge method set to rebase and fast-forward. |
`get_text_content` will transform contiguous space chars into single spaces, plus translate special HTML elements ``` >>> " ".join(html.fromstring(f"a\n b & c").text_content().split()) 'a b & c' ``` In order the correctly verify if a term is text-only we need to use the HTML parser. Note that to be resilient against bad XML, but valid HTML, we cannot use the default XML parser. Part-of: #150152
Before:
The typofix feature treats terms in the old and new values with similar text
content as the same term, migrating the translations of the old term to the new
term.
For example
The old value has the mapping:
'Draft': 'Brouillon'
The new value contains the term:
'<span invisible="name or name_placeholder or quick_edit_mode">Draft</span>'
Since the old term and the new term share the same text content, 'Draft', after
`write`, the new term reuses the old translation of 'Draft'. However, the
translation 'Brouillon' is always visible, unlike its en_US counterpart.
This behavior is acceptable in non-upgrade mode because the user writes the
en_US value and is responsible for verifying translations afterward. However, it
is problematic during upgrades because users cannot easily identify which
records have changed and need to be rechecked.
After:
The translation inheritance behavior can be described as below
Translations can be inherited after `write` from old terms to new terms which
share the very close text contents
1. when `write` in production mode, text contents for translation terms are more
important than the HTML/XML structures of them, and the old term translations
should be remained as much as possible. Because
* the writing user is responsible to recheck all translations after `write`.
* it is easier for the writing user to copy technical HTML/XML structures
than translate text contents for a language they may not know.
* the feature can also be used as typofix when the only small diff is the
text content
2. when `write` in upgrade time, the HTML/XML structure is more important than
the text content, and the new term structure should be remained as much as
possible. Because
* HTML/XML structures might be changed a lot after upgrade, which may
contain behavior relevant diff (e.g. `invisible`), even if text contents
are not changed.
* users have no idea which records' values are changed during upgrade and
are hard to recheck their translations.
* new terms are highly likely to be correctly translated in the latest po
files which will be imported during upgrade.
* the typofix feature can still be remained when the only small diff is the
text content
Based on the above feature analysis, we use the below new strategy
1. translations can be inherited only if the old source term and the new source
term share the same HTML/XML structure
2. translations can be inherited only if the old translation term and the new
source term share the same HTML/XML structure
3. when translations are inherited, MODIFIER_ATTRS will be synchronized with
the new source term, other attributes will be copied from the source term if
available.
Backward-Port-Of: odoo#194181
Backward-Port-Of: odoo#150152
Before:
The typofix feature treats terms in the old and new values with similar text
content as the same term, migrating the translations of the old term to the new
term.
For example
The old value has the mapping:
'Draft': 'Brouillon'
The new value contains the term:
'<span invisible="name or name_placeholder or quick_edit_mode">Draft</span>'
Since the old term and the new term share the same text content, 'Draft', after
`write`, the new term reuses the old translation of 'Draft'. However, the
translation 'Brouillon' is always visible, unlike its en_US counterpart.
This behavior is acceptable in non-upgrade mode because the user writes the
en_US value and is responsible for verifying translations afterward. However, it
is problematic during upgrades because users cannot easily identify which
records have changed and need to be rechecked.
After:
The translation inheritance behavior can be described as below
Translations can be inherited after `write` from old terms to new terms which
share the very close text contents
1. when `write` in production mode, text contents for translation terms are more
important than the HTML/XML structures of them, and the old term translations
should be remained as much as possible. Because
* the writing user is responsible to recheck all translations after `write`.
* it is easier for the writing user to copy technical HTML/XML structures
than translate text contents for a language they may not know.
* the feature can also be used as typofix when the only small diff is the
text content
2. when `write` in upgrade time, the HTML/XML structure is more important than
the text content, and the new term structure should be remained as much as
possible. Because
* HTML/XML structures might be changed a lot after upgrade, which may
contain behavior relevant diff (e.g. `invisible`), even if text contents
are not changed.
* users have no idea which records' values are changed during upgrade and
are hard to recheck their translations.
* new terms are highly likely to be correctly translated in the latest po
files which will be imported during upgrade.
* the typofix feature can still be remained when the only small diff is the
text content
Based on the above feature analysis, we use the below new strategy
1. translations can be inherited only if the old source term and the new source
term share the same HTML/XML structure
2. translations can be inherited only if the old translation term and the new
source term share the same HTML/XML structure
3. when translations are inherited, MODIFIER_ATTRS will be synchronized with
the new source term, other attributes will be copied from the source term if
available.
closes #194186
Backward-port-of: #194181
Backward-port-of: #150152
Signed-off-by: Raphael Collet <rco@odoo.com>
Before:
The typofix feature treats terms in the old and new values with similar text
content as the same term, migrating the translations of the old term to the new
term.
For example
The old value has the mapping:
'Draft': 'Brouillon'
The new value contains the term:
'<span invisible="name or name_placeholder or quick_edit_mode">Draft</span>'
Since the old term and the new term share the same text content, 'Draft', after
`write`, the new term reuses the old translation of 'Draft'. However, the
translation 'Brouillon' is always visible, unlike its en_US counterpart.
This behavior is acceptable in non-upgrade mode because the user writes the
en_US value and is responsible for verifying translations afterward. However, it
is problematic during upgrades because users cannot easily identify which
records have changed and need to be rechecked.
After:
The translation inheritance behavior can be described as below
Translations can be inherited after `write` from old terms to new terms which
share the very close text contents
1. when `write` in production mode, text contents for translation terms are more
important than the HTML/XML structures of them, and the old term translations
should be remained as much as possible. Because
* the writing user is responsible to recheck all translations after `write`.
* it is easier for the writing user to copy technical HTML/XML structures
than translate text contents for a language they may not know.
* the feature can also be used as typofix when the only small diff is the
text content
2. when `write` in upgrade time, the HTML/XML structure is more important than
the text content, and the new term structure should be remained as much as
possible. Because
* HTML/XML structures might be changed a lot after upgrade, which may
contain behavior relevant diff (e.g. `invisible`), even if text contents
are not changed.
* users have no idea which records' values are changed during upgrade and
are hard to recheck their translations.
* new terms are highly likely to be correctly translated in the latest po
files which will be imported during upgrade.
* the typofix feature can still be remained when the only small diff is the
text content
Based on the above feature analysis, we use the below new strategy
1. translations can be inherited only if the old source term and the new source
term share the same HTML/XML structure
2. translations can be inherited only if the old translation term and the new
source term share the same HTML/XML structure
3. when translations are inherited, MODIFIER_ATTRS will be synchronized with
the new source term, other attributes will be copied from the source term if
available.
closes odoo#194186
Backward-port-of: odoo#194181
Backward-port-of: odoo#150152
Signed-off-by: Raphael Collet <rco@odoo.com>
Before:
The typofix feature treats terms in the old and new values with similar text
content as the same term, migrating the translations of the old term to the new
term.
For example
The old value has the mapping:
'Draft': 'Brouillon'
The new value contains the term:
'<span invisible="name or name_placeholder or quick_edit_mode">Draft</span>'
Since the old term and the new term share the same text content, 'Draft', after
`write`, the new term reuses the old translation of 'Draft'. However, the
translation 'Brouillon' is always visible, unlike its en_US counterpart.
This behavior is acceptable in non-upgrade mode because the user writes the
en_US value and is responsible for verifying translations afterward. However, it
is problematic during upgrades because users cannot easily identify which
records have changed and need to be rechecked.
After:
The translation inheritance behavior can be described as below
Translations can be inherited after `write` from old terms to new terms which
share the very close text contents
1. when `write` in production mode, text contents for translation terms are more
important than the HTML/XML structures of them, and the old term translations
should be remained as much as possible. Because
* the writing user is responsible to recheck all translations after `write`.
* it is easier for the writing user to copy technical HTML/XML structures
than translate text contents for a language they may not know.
* the feature can also be used as typofix when the only small diff is the
text content
2. when `write` in upgrade time, the HTML/XML structure is more important than
the text content, and the new term structure should be remained as much as
possible. Because
* HTML/XML structures might be changed a lot after upgrade, which may
contain behavior relevant diff (e.g. `invisible`), even if text contents
are not changed.
* users have no idea which records' values are changed during upgrade and
are hard to recheck their translations.
* new terms are highly likely to be correctly translated in the latest po
files which will be imported during upgrade.
* the typofix feature can still be remained when the only small diff is the
text content
Based on the above feature analysis, we use the below new strategy
1. translations can be inherited only if the old source term and the new source
term share the same HTML/XML structure
2. translations can be inherited only if the old translation term and the new
source term share the same HTML/XML structure
3. when translations are inherited, MODIFIER_ATTRS will be synchronized with
the new source term, other attributes will be copied from the source term if
available.
closes odoo#194186
Backward-port-of: odoo#194181
Backward-port-of: odoo#150152
Signed-off-by: Raphael Collet <rco@odoo.com>
Before:
The typofix feature treats terms in the old and new values with similar text
content as the same term, migrating the translations of the old term to the new
term.
For example
The old value has the mapping:
'Draft': 'Brouillon'
The new value contains the term:
'<span invisible="name or name_placeholder or quick_edit_mode">Draft</span>'
Since the old term and the new term share the same text content, 'Draft', after
`write`, the new term reuses the old translation of 'Draft'. However, the
translation 'Brouillon' is always visible, unlike its en_US counterpart.
This behavior is acceptable in non-upgrade mode because the user writes the
en_US value and is responsible for verifying translations afterward. However, it
is problematic during upgrades because users cannot easily identify which
records have changed and need to be rechecked.
After:
The translation inheritance behavior can be described as below
Translations can be inherited after `write` from old terms to new terms which
share the very close text contents
1. when `write` in production mode, text contents for translation terms are more
important than the HTML/XML structures of them, and the old term translations
should be remained as much as possible. Because
* the writing user is responsible to recheck all translations after `write`.
* it is easier for the writing user to copy technical HTML/XML structures
than translate text contents for a language they may not know.
* the feature can also be used as typofix when the only small diff is the
text content
2. when `write` in upgrade time, the HTML/XML structure is more important than
the text content, and the new term structure should be remained as much as
possible. Because
* HTML/XML structures might be changed a lot after upgrade, which may
contain behavior relevant diff (e.g. `invisible`), even if text contents
are not changed.
* users have no idea which records' values are changed during upgrade and
are hard to recheck their translations.
* new terms are highly likely to be correctly translated in the latest po
files which will be imported during upgrade.
* the typofix feature can still be remained when the only small diff is the
text content
Based on the above feature analysis, we use the below new strategy
1. translations can be inherited only if the old source term and the new source
term share the same HTML/XML structure
2. translations can be inherited only if the old translation term and the new
source term share the same HTML/XML structure
3. when translations are inherited, MODIFIER_ATTRS will be synchronized with
the new source term, other attributes will be copied from the source term if
available.
closes odoo#194186
Backward-port-of: odoo#194181
Backward-port-of: odoo#150152
Signed-off-by: Raphael Collet <rco@odoo.com>

When we update an inline translated element (like
<span>) for the baselanguage
en_USwe should update the modifiers attributes for alllanguages.
For example when updating from (16.0)
https://github.com/odoo/odoo/blob/7ecd9413/odoo/addons/base/views/ir_ui_view_views.xml#L127-L129
https://github.com/odoo/odoo/blob/7ecd9413/odoo/addons/base/i18n/fr.po#L7233-L7235
to (17.0)
https://github.com/odoo/odoo/blob/b1461d28/odoo/addons/base/views/ir_ui_view_views.xml#L126-L128
https://github.com/odoo/odoo/blob/b1461d28/odoo/addons/base/i18n/fr.po#L12087-L12089
The base term,
en_US, is updated since the text matches but theattributes of the translated terms,
fr_FRfor example, are notupdated. Later when the PO file is loaded in non-overwrite mode the
translated terms for
fr_FRis not updated. This causes all sort ofissues during an upgrade for inline-translated terms -- like
<span>.More so since the recent change that converts domain-based attributes
into inline Python expressions.
In this patch we propagate modifiers attributes from inline-translated
items in the new base term into all translated terms when the base term
is updated. In that way we ensure the attributes are correct in all
languages even if later the loading of their corresponding PO file
doesn't update the term.
For a detailed example, let's see what happens when loading the view
above during an upgrade 16->17, right at the first load of the XML file
at https://github.com/odoo/odoo/blob/b1461d28/odoo/fields.py#L1864
As we can see the new term will get an updated value for its
invisibleattribute, while also removing
attrs. The translated terms will bestill keep the old modifier though.
Now later when the fr_FR.po file is loaded we reach this point
https://github.com/odoo/odoo/blob/b1461d28/odoo/tools/translate.py#L1442
Thus the translated values are NOT updated, keeping the wrong
modifiers. This is later fixed during the upgrade in a clumsy way.
C.f. the warnings like this one in runbot:
Note that such warnings are gone in current PR CI.
The root issue here is that when the fr_FR translation is loaded the
terms are not updated due to a combination of factors:
Option 2 is not a valid option during upgrades because we want to keep
custom translations. We could instead of the current patch tweak how
option 1 works and perhaps make the closest term more restricted. This
would lead to the update of the whole translation though while the
actual issue here is just the modifiers. Moreover if the translations
are out of sync the translated terms will still keep the wrong values
that could still be essential for the correct functioning of the record
they belong too (view archs -- for example).
Finally this is a more extreme case (16.0):
https://github.com/odoo/enterprise/blob/1e63b4a8/sale_subscription/views/sale_order_views.xml#L142
In this case during the upgrade we fix the modifier value (refer to
runbot warning above -- it's the same script that fixes it) and set
for translations, which is wrong. The correct value is (17.0):
https://github.com/odoo/enterprise/blob/530ba3ad/sale_subscription/views/sale_order_views.xml#L136