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

[FIX] website: fix recent static template typo #162757

Closed
wants to merge 1 commit into from
Closed

Conversation

tsabi
Copy link
Contributor

@tsabi tsabi commented Apr 20, 2024

Recent commit 1 made a typo when converting templates

@robodoo
Copy link
Contributor

robodoo commented Apr 20, 2024

Pull request status dashboard.

@C3POdoo C3POdoo requested a review from a team April 20, 2024 20:25
Copy link
Contributor

@rdeodoo rdeodoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello, thank you for your contribution.

Could you please mention this commit in your commit msg ? 0246153

@@ -25,7 +25,7 @@ export class FullscreenIndication extends Component {
}

get fullScreenIndicationText() {
return markup(sprintf(escape(_t("Press %(key)s to exit full string")), "<span>esc</span>"));
return markup(sprintf(escape(_t("Press %(key)s to exit fullscreen")), "<span>esc</span>"));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return markup(sprintf(escape(_t("Press %(key)s to exit fullscreen")), "<span>esc</span>"));
return markup(sprintf(escape(_t("Press %(key)s to exit full screen")), "<span>esc</span>"));

As before the mistake made 3 days ago with 0246153

@tsabi
Copy link
Contributor Author

tsabi commented Apr 22, 2024

Dear @rdeodoo
Thanks, i just modified my commit as requested! :)

@rdeodoo rdeodoo changed the title [FIX] website: typo [FIX] website: fix recent static template typo Apr 22, 2024
Copy link
Contributor

@rdeodoo rdeodoo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@robodoo r+ squash

Thank you for your fix, appreciated 👍

This squash command should be using the PR desc to replace the commit message, I adjusted a few things to fit a bit more our guidelines.
Note that X-original-commit is something supposed to be added on forward port only.
I referenced the commit using markdown link, and a more detailed title.

@robodoo
Copy link
Contributor

robodoo commented Apr 22, 2024

@rdeodoo you may want to rebuild or fix this PR as it has failed CI.

@robodoo
Copy link
Contributor

robodoo commented Apr 22, 2024

Merge method set to squash.

@rdeodoo
Copy link
Contributor

rdeodoo commented Apr 22, 2024

You actually need to sign the CLA in your commit https://github.com/odoo/odoo/blob/17.0/doc/cla/sign-cla.md

@tsabi
Copy link
Contributor Author

tsabi commented Apr 22, 2024

@rdeodoo
Oh sorry i forget the sign of the CLA. I reworded my commit again!

@MiquelRForgeFlow
Copy link
Contributor

@tsabi You have to do add an extra commit like #160844, not rewording the commit. See https://github.com/odoo/odoo/blob/17.0/doc/cla/sign-cla.md.

@tsabi
Copy link
Contributor Author

tsabi commented Apr 22, 2024

@MiquelRForgeFlow
I've already signed the CLA earlier, I've also got several commits merged in the Odoo repo

All of these are me:
https://github.com/odoo/odoo/blob/17.0/doc/cla/corporate/odootech.md
https://github.com/odoo/odoo/blob/17.0/doc/cla/corporate/online-erp-hungary-kft.md
https://github.com/odoo/odoo/blob/17.0/doc/cla/corporate/i3rendszerhaz.md

I think the problem is that I don't have an email address in my commit, just my name. I just installed a new PyCharm, i will look how to set up that

@MiquelRForgeFlow
Copy link
Contributor

MiquelRForgeFlow commented Apr 22, 2024

You are commiting here with email (...@bdsc.hu), which is different from the one in those corporate CLA (...@odootech.hu, ...@online-erp.hu, ...@i3rendszerhaz.hu). Maybe you should update a CLA, or do an individual CLA instead.

@tsabi tsabi force-pushed the 17.0-fix1 branch 2 times, most recently from d47615c to 9207411 Compare April 22, 2024 20:46
Recent commit 0246153 made a typo when converting templates: `full string` should be `full screen`

---
I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr
@xmo-odoo
Copy link
Collaborator

@robodoo override=ci/security

@tsabi
Copy link
Contributor Author

tsabi commented Apr 23, 2024

@MiquelRForgeFlow
Ok, finally fixed my email address! Git rewording didn't modified it, needed to completely recreate my commit.

@rdeodoo
Copy link
Contributor

rdeodoo commented Apr 23, 2024

Ty 👍
@robodoo r+ squash

(I still prefer to use the PR desc as commit msg, not overflowing 72 char, absolute commit url and using markdown link)

@robodoo
Copy link
Contributor

robodoo commented Apr 23, 2024

Merge method set to squash.

robodoo pushed a commit that referenced this pull request Apr 23, 2024
Recent commit [1] made a typo when converting templates

[1]: 0246153

closes #162757

Signed-off-by: Romain Derie (rde) <rde@odoo.com>
@robodoo robodoo closed this in 488205d Apr 23, 2024
willylohws pushed a commit to willylohws/odoo that referenced this pull request May 1, 2024
Recent commit [1] made a typo when converting templates

[1]: odoo@0246153

closes odoo#162757

Signed-off-by: Romain Derie (rde) <rde@odoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants