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_vat: make VAT examples translatable #159724

Closed

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Mar 28, 2024

Currently some VAT examples that contain other terms than only the number are always displayed in English. This commit makes sure they can be translated.


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

Forward-Port-Of: #159051
Forward-Port-Of: #158629

@robodoo
Copy link
Contributor

robodoo commented Mar 28, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 28, 2024

@dylankiss @oomsveta cherrypicking of pull request #158629 failed.

stdout:

Auto-merging addons/base_vat/i18n/base_vat.pot
CONFLICT (content): Merge conflict in addons/base_vat/i18n/base_vat.pot
Auto-merging addons/base_vat/models/res_partner.py

stderr:

16:54:04.510743 git.c:463               trace: built-in: git cherry-pick 9fb18174000ff09848b2bf6d21bbe84c7370786b
error: could not apply 9fb18174000f... [FIX] base_vat: make VAT examples translatable
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

@C3POdoo C3POdoo added the RD research & development, internal work label Mar 28, 2024
@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Mar 28, 2024
Currently some VAT examples that contain other terms than only the
number are always displayed in English. This commit makes sure they can
be translated.

X-original-commit: 504240b
@dylankiss dylankiss force-pushed the 17.0-15.0-i18n-base-vat-dyki-2IrF-fw branch from b11eddc to dda738e Compare April 4, 2024 07:41
@dylankiss
Copy link
Contributor

@robodoo r+

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