Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Oct 27, 2025

Weblate sometimes incorrectly msgmerges when a line ends with /"" and wraps one of the "'s to the next line causing an invalid po file since the closing " is now escaped so the line never correctly ends.

This unfortunately has to be manually fixed directly in the code for now.

Forward-Port-Of: #15031

Weblate sometimes incorrectly msgmerges when a line ends with `/""`
and wraps one of the `"`'s to the next line causing an invalid po file
since the closing `"` is now escaped so the line never correctly ends.

This unfortunately has to be manually fixed directly in the code for
now.

X-original-commit: b9e95ba
@robodoo
Copy link
Collaborator

robodoo commented Oct 27, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 27, 2025

@ticodoo cherrypicking of pull request #15031 failed.

stdout:

CONFLICT (modify/delete): locale/ko/LC_MESSAGES/finance.po deleted in 0ffae360c3da50a3ae05cad21288ea90bb762aaa and modified in 5bf0553f31f01184aa55286c0de028be273d8143.  Version 5bf0553f31f01184aa55286c0de028be273d8143 of locale/ko/LC_MESSAGES/finance.po left in tree.

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

@ticodoo ticodoo closed this Oct 27, 2025
@ticodoo ticodoo deleted the master-19.0-i18n-fix-ko-wrap-tic-473033-fw branch October 27, 2025 14:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants