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] formula assistant: localize argument separator #3871

Conversation

fw-bot
Copy link
Collaborator

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

Description

The argument separator in the formula assistant was not localized, it was always a comma no matter the locale. This commit fixes it.

Task: : 3789860

review checklist

  • feature is organized in plugin, or UI components
  • support of duplicate sheet (deep copy)
  • in model/core: ranges are Range object, and can be adapted (adaptRanges)
  • in model/UI: ranges are strings (to show the user)
  • undo-able commands (uses this.history.update)
  • multiuser-able commands (has inverse commands and transformations where needed)
  • new/updated/removed commands are documented
  • exportable in excel
  • translations (_t("qmsdf %s", abc))
  • unit tested
  • clean commented code
  • track breaking changes
  • doc is rebuild (npm run doc)
  • status is correct in Odoo

Forward-Port-Of: #3790

@robodoo
Copy link
Collaborator

robodoo commented Mar 21, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented Mar 21, 2024

@hokolomopo @LucasLefevre cherrypicking of pull request #3790 failed.

stdout:

Auto-merging src/components/composer/formula_assistant/formula_assistant.ts
CONFLICT (content): Merge conflict in src/components/composer/formula_assistant/formula_assistant.ts
Auto-merging src/components/composer/formula_assistant/formula_assistant.xml
Auto-merging tests/composer/formula_assistant_component.test.ts
CONFLICT (content): Merge conflict in tests/composer/formula_assistant_component.test.ts

stderr:

15:36:23.976517 git.c:463               trace: built-in: git cherry-pick 6e582424488dda5df1df8404ea0ea9e2d2f73c6a
error: could not apply 6e5824244... [FIX] formula assistant: localize argument separator
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

The argument separator in the formula assistant was not localized, it
was always a comma no matter the locale. This commit fixes it.

Task: 3789860
X-original-commit: 050c6fb
@hokolomopo hokolomopo force-pushed the 17.0-saas-16.4-formula-assisstant-separator-locale-adrm-9th4-fw branch from 953412e to 1335618 Compare March 22, 2024 09:02
@hokolomopo
Copy link
Contributor

@robodoo r+

@robodoo robodoo closed this in 7e7b069 Mar 22, 2024
@fw-bot fw-bot deleted the 17.0-saas-16.4-formula-assisstant-separator-locale-adrm-9th4-fw branch April 5, 2024 09:47
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.

None yet

3 participants