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.

Sign up for GitHub

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

Jump to bottom

[FW][IMP] website: handle text options in translation mode #158419

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FW][IMP] website: handle text options in translation mode #158419

wants to merge 1 commit into from
+470 −25

Conversation

fw-bot
Copy link
Contributor

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

The goal of this PR is to simply disable the "Text Animation" button from the editor's
toolbar in translate mode. An adaptation of code in stable 17.0 will be added to
allow the use of text options (text animations & text highlights) in the translation mode,
mainly by allowing the creation of snippet editors if the target is a text option snippet.

opw-3686777

Forward-Port-Of: #157726
Forward-Port-Of: #157087

@robodoo
Copy link
Contributor

robodoo commented Mar 20, 2024

Pull request status dashboard.

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 20, 2024

@xO-Tx @qsm-odoo this PR targets master and is the last of the forward-port chain containing:

To merge the full chain, use

@fw-bot r+

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

@robodoo robodoo added the forwardport This PR was created by @fw-bot label Mar 20, 2024
@C3POdoo C3POdoo added the OE the report is linked to a support ticket (opw-...) label Mar 20, 2024
@fw-bot fw-bot force-pushed the master-15.0-text-options-translation-mou-BecB-fw branch from 60a331c to 6dfe660 Compare March 20, 2024 16:25
@fw-bot fw-bot mentioned this pull request Mar 20, 2024
Open
@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 20, 2024

@xO-Tx @qsm-odoo WARNING: the update of #158402 to c0ece60 has caused a conflict in this pull request, data may have been lost.

stdout:

Auto-merging addons/web_editor/static/src/js/editor/snippets.editor.js
Auto-merging addons/website/static/src/components/wysiwyg_adapter/wysiwyg_adapter.js
CONFLICT (content): Merge conflict in addons/website/static/src/components/wysiwyg_adapter/wysiwyg_adapter.js
Auto-merging addons/website/static/src/js/editor/snippets.editor.js
CONFLICT (content): Merge conflict in addons/website/static/src/js/editor/snippets.editor.js

stderr:

17:24:54.265975 git.c:463               trace: built-in: git cherry-pick 133b7c84d6ed0356a1d37faed4d2726568284f78
error: could not apply 133b7c84d6ed... [IMP] web_editor, website: allow text options translation
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:

@C3POdoo C3POdoo requested review from a team March 20, 2024 16:36
@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 20, 2024

@xO-Tx @qsm-odoo ci/runbot failed on this forward-port PR

@fw-bot fw-bot mentioned this pull request Mar 21, 2024
Closed
@fw-bot fw-bot force-pushed the master-15.0-text-options-translation-mou-BecB-fw branch from 6dfe660 to 66f7076 Compare March 28, 2024 16:17
@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 28, 2024

@xO-Tx @qsm-odoo WARNING: the update of #158402 to 0d1ad52 has caused a conflict in this pull request, data may have been lost.

stdout:

Auto-merging addons/web_editor/static/src/js/editor/snippets.editor.js
Auto-merging addons/website/static/src/js/editor/snippets.editor.js
CONFLICT (content): Merge conflict in addons/website/static/src/js/editor/snippets.editor.js

stderr:

17:16:46.612734 git.c:463               trace: built-in: git cherry-pick 0e7a0dbabc72ac8046c302e264678d35008c3040
error: could not apply 0e7a0dbabc72... [IMP] web_editor, website: allow text options translation
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:

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 28, 2024

@xO-Tx @qsm-odoo ci/runbot failed on this forward-port PR

@fw-bot fw-bot force-pushed the master-15.0-text-options-translation-mou-BecB-fw branch from 66f7076 to 598ba19 Compare April 17, 2024 13:30
@fw-bot
Copy link
Contributor Author

fw-bot commented Apr 17, 2024

@xO-Tx @qsm-odoo WARNING: the update of #158402 to 0e1c749 has caused a conflict in this pull request, data may have been lost.

stdout:

Auto-merging addons/web_editor/static/src/js/editor/snippets.editor.js
CONFLICT (content): Merge conflict in addons/web_editor/static/src/js/editor/snippets.editor.js
Auto-merging addons/website/static/src/js/editor/snippets.editor.js
CONFLICT (content): Merge conflict in addons/website/static/src/js/editor/snippets.editor.js

stderr:

15:29:31.979321 git.c:463               trace: built-in: git cherry-pick e8a3dae8aa98aed502803e422dec58ed673c5e5a
error: could not apply e8a3dae8aa98... [IMP] web_editor, website: allow text options translation
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:

@fw-bot fw-bot force-pushed the master-15.0-text-options-translation-mou-BecB-fw branch from 598ba19 to 7374146 Compare April 18, 2024 10:50
@fw-bot
Copy link
Contributor Author

fw-bot commented Apr 18, 2024

@xO-Tx @qsm-odoo WARNING: the update of #158402 to 8abd7c4 has caused a conflict in this pull request, data may have been lost.

stdout:

Auto-merging addons/web_editor/static/src/js/editor/snippets.editor.js
CONFLICT (content): Merge conflict in addons/web_editor/static/src/js/editor/snippets.editor.js
Auto-merging addons/website/static/src/js/editor/snippets.editor.js
CONFLICT (content): Merge conflict in addons/website/static/src/js/editor/snippets.editor.js

stderr:

12:49:41.395075 git.c:463               trace: built-in: git cherry-pick a5c512fcbd3f3ce06e12f4f9e81fd1d49c9cda88
error: could not apply a5c512fcbd3f... [IMP] web_editor, website: allow text options translation
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:

@xO-Tx
[IMP] web_editor, website: allow text options translation
6752811 
The goal of this commit is to add a minimal and stable compatible code
adaptation that allows to use text options (text animations & text
highlights) in the translation mode. Mainly by allowing the creation of
snippet editors if the target is a text option snippet.

opw-3686777

X-original-commit: aa070b5
@fw-bot fw-bot force-pushed the master-15.0-text-options-translation-mou-BecB-fw branch from 7374146 to 6752811 Compare April 30, 2024 15:38
@fw-bot
Copy link
Contributor Author

fw-bot commented Apr 30, 2024

@xO-Tx @qsm-odoo WARNING: the update of #158402 to 2459974 has caused a conflict in this pull request, data may have been lost.

stdout:

Auto-merging addons/web_editor/static/src/js/editor/snippets.editor.js
CONFLICT (content): Merge conflict in addons/web_editor/static/src/js/editor/snippets.editor.js
Auto-merging addons/website/static/src/js/editor/snippets.editor.js
CONFLICT (content): Merge conflict in addons/website/static/src/js/editor/snippets.editor.js

stderr:

17:37:42.977415 git.c:463               trace: built-in: git cherry-pick aa070b50e95d4299a0d63a8e6902807797dd3e25
error: could not apply aa070b50e95d... [IMP] web_editor, website: allow text options translation
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:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
forwardport This PR was created by @fw-bot OE the report is linked to a support ticket (opw-...)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@fw-bot @robodoo @C3POdoo @xO-Tx