Skip to content

Conversation

@fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Dec 29, 2025

Some parts of the documention were currently not translatable:

  • the custom Card directives
  • the strings in the layout HTML pages
  • the placeholder text in the search box
  • the "Edit on GitHub" text on each page

This commit makes sure that all of these are translatable now.

Forward-Port-Of: #15830
Forward-Port-Of: #15800

@robodoo
Copy link
Collaborator

robodoo commented Dec 29, 2025

Pull request status dashboard

@fw-bot
Copy link
Collaborator Author

fw-bot commented Dec 29, 2025

@dylankiss @ticodoo cherrypicking of pull request #15800 failed.

stdout:

CONFLICT (modify/delete): .weblate.json deleted in f1695eae42fd8f75702da5ddb5b6eace6d418dbe and modified in d3e9dfab8df2e6f0848352da2270b06cd4185c42.  Version d3e9dfab8df2e6f0848352da2270b06cd4185c42 of .weblate.json left in tree.
Auto-merging locale/sources/finance.pot
CONFLICT (content): Merge conflict in locale/sources/finance.pot
Auto-merging locale/sources/general.pot
CONFLICT (content): Merge conflict in locale/sources/general.pot
Auto-merging locale/sources/hr.pot
CONFLICT (content): Merge conflict in locale/sources/hr.pot
Auto-merging locale/sources/inventory_and_mrp.pot
CONFLICT (content): Merge conflict in locale/sources/inventory_and_mrp.pot
Auto-merging locale/sources/marketing.pot
CONFLICT (content): Merge conflict in locale/sources/marketing.pot
Auto-merging locale/sources/productivity.pot
CONFLICT (content): Merge conflict in locale/sources/productivity.pot
Auto-merging locale/sources/sales.pot
CONFLICT (content): Merge conflict in locale/sources/sales.pot
Auto-merging locale/sources/websites.pot
CONFLICT (content): Merge conflict in locale/sources/websites.pot

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

@fw-bot
Copy link
Collaborator Author

fw-bot commented Jan 6, 2026

@dylankiss @ticodoo this forward port of #15800 is awaiting action (not merged or closed).

Some parts of the documention were currently not translatable:
- the custom `Card` directives
- the strings in the layout HTML pages
- the placeholder text in the search box
- the "Edit on GitHub" text on each page

This commit makes sure that all of these are translatable now.
These files are not translated at the moment.
We are cleaning up their outdated POT files. If we ever want them
translated, we can add them back in with the sync.
@dylankiss dylankiss force-pushed the saas-18.2-17.0-fix-untranslatable-parts-dyki-486192-fw branch from 686702d to 9f454b1 Compare January 6, 2026 08:40
@C3POdoo C3POdoo requested review from a team January 6, 2026 08:42
@dylankiss
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Jan 6, 2026
Some parts of the documention were currently not translatable:
- the custom `Card` directives
- the strings in the layout HTML pages
- the placeholder text in the search box
- the "Edit on GitHub" text on each page

This commit makes sure that all of these are translatable now.

Part-of: #15851
Signed-off-by: Tiffany Chang (tic) <[email protected]>
Signed-off-by: Dylan Kiss (dyki) <[email protected]>
robodoo pushed a commit that referenced this pull request Jan 6, 2026
These files are not translated at the moment.
We are cleaning up their outdated POT files. If we ever want them
translated, we can add them back in with the sync.

closes #15851

Signed-off-by: Tiffany Chang (tic) <[email protected]>
Signed-off-by: Dylan Kiss (dyki) <[email protected]>
@robodoo robodoo closed this Jan 6, 2026
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.

3 participants