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

[FW][FIX] base: duration widget for unsupported babel format #155978

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Feb 29, 2024

In case of exception of type KeyError during the formatting with Babel instead to raise a Traceback, we first retry with the en_US locale.

Babel fixes each week new bug of formatting like the one in the test, but we cannot bump our default babel version since it is not in the stable Ubuntu 22 so it is a best effort fix that will not hide all bugs but is better that nothing.

python-babel/babel#827

Description of the issue/feature this PR addresses:

Current behavior before PR:

Desired behavior after PR is merged:


I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #155909

@robodoo
Copy link
Contributor

robodoo commented Feb 29, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Feb 29, 2024

@JKE-be @mart-e cherrypicking of pull request #155909 failed.

stdout:

Auto-merging odoo/addons/base/models/ir_qweb_fields.py
Auto-merging odoo/addons/base/tests/test_qweb.py
CONFLICT (content): Merge conflict in odoo/addons/base/tests/test_qweb.py

stderr:

20:00:49.706673 git.c:463               trace: built-in: git cherry-pick e17ba0a904631a6a7d40bfed3b34218956def63b
error: could not apply e17ba0a90463... [FIX] base: duration widget for unsupported babel format
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Feb 29, 2024
@C3POdoo C3POdoo added the RD research & development, internal work label Feb 29, 2024
@JKE-be JKE-be force-pushed the saas-17.1-17.0-duration-keyerror-jke-uiXs-fw branch from e01fa87 to 5f9ddd8 Compare March 1, 2024 08:39
@JKE-be
Copy link
Contributor

JKE-be commented Mar 1, 2024

@robodoo r+

@C3POdoo C3POdoo requested review from a team, rco-odoo and ryv-odoo and removed request for a team March 1, 2024 08:41
@robodoo
Copy link
Contributor

robodoo commented Mar 1, 2024

@JKE-be @mart-e unable to stage: merge conflict

In case of exception of type KeyError during the formatting with Babel
instead to raise a Traceback, we first retry with the en_US locale.

Babel fixes each week new bug of formatting like the one in the test,
but we cannot bump our default babel version since it is not in the
stable Ubuntu 22 so it is a best effort fix that will not hide all bugs
but is better that nothing.

python-babel/babel#827

X-original-commit: 7cc2436
@JKE-be JKE-be force-pushed the saas-17.1-17.0-duration-keyerror-jke-uiXs-fw branch from 5f9ddd8 to 56b6f08 Compare March 4, 2024 08:39
@JKE-be
Copy link
Contributor

JKE-be commented Mar 4, 2024

@robodoo r+

robodoo pushed a commit that referenced this pull request Mar 4, 2024
In case of exception of type KeyError during the formatting with Babel
instead to raise a Traceback, we first retry with the en_US locale.

Babel fixes each week new bug of formatting like the one in the test,
but we cannot bump our default babel version since it is not in the
stable Ubuntu 22 so it is a best effort fix that will not hide all bugs
but is better that nothing.

python-babel/babel#827

closes #155978

X-original-commit: 7cc2436
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
Signed-off-by: Jérémy Kersten <jke@odoo.com>
robodoo pushed a commit that referenced this pull request Mar 4, 2024
In case of exception of type KeyError during the formatting with Babel
instead to raise a Traceback, we first retry with the en_US locale.

Babel fixes each week new bug of formatting like the one in the test,
but we cannot bump our default babel version since it is not in the
stable Ubuntu 22 so it is a best effort fix that will not hide all bugs
but is better that nothing.

python-babel/babel#827

closes #155978

X-original-commit: 7cc2436
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
Signed-off-by: Jérémy Kersten <jke@odoo.com>
@robodoo robodoo closed this Mar 4, 2024
@fw-bot fw-bot deleted the saas-17.1-17.0-duration-keyerror-jke-uiXs-fw branch March 18, 2024 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot RD research & development, internal work
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants