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

Config with default template 4eba7476 #3776

Draft
wants to merge 22 commits into
base: master
Choose a base branch
from

Conversation

mauritsvanrees
Copy link
Sponsor Member

This recreates PR #3775 which I had accidentally merged too soon.

BTW, some tests are failing, investigating now.

@mister-roboto
Copy link

@mauritsvanrees thanks for creating this Pull Request and helping to improve Plone!

TL;DR: Finish pushing changes, pass all other checks, then paste a comment:

@jenkins-plone-org please run jobs

To ensure that these changes do not break other parts of Plone, the Plone test suite matrix needs to pass, but it takes 30-60 min. Other CI checks are usually much faster and the Plone Jenkins resources are limited, so when done pushing changes and all other checks pass either start all Jenkins PR jobs yourself, or simply add the comment above in this PR to start all the jobs automatically.

Happy hacking!

"${sentances}. ${sentance}",
mapping={"sentances": err, "sentance": error},
"${sentences}. ${sentence}",
mapping={"sentences": err, "sentence": error},
Copy link
Sponsor Member Author

Choose a reason for hiding this comment

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

@erral codespell was run, and this may mean that similar changes are needed in plone.app.locales. Currently this PR is for CMFPlone master, which since today is only for Plone 6.1. But this PR should be back ported soon to new branch 6.0.x.

Copy link
Sponsor Member

Choose a reason for hiding this comment

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

OK. Some weeks ago I also modified manually the translations in such cases, so I would need to do it again when this is backported to 6.0.x.

Thanks for the heads up.

@mauritsvanrees
Copy link
Sponsor Member Author

@gforcada I see problems with various templates, at least controlpanel/browser/types.pt and controlpanel/browser/usergroups_groupmembership.pt. I am inclined to remove all zpretty changes from this PR, and retry that part later (where later could easily be tomorrow, I don't want to drag this on). Also remove zpretty from pre-commit for now, otherwise it will fail. What do you think?

@gforcada
Copy link
Sponsor Contributor

@mauritsvanrees all good 👍🏾 I applied zpretty in plenty of small chunks so we can disable zpretty but keep some of the changes already, to limit the number of files that still need to be parsed.

I did not have time yesterday to look at the test failures, I did see them, but I was busy talking with you and others during the sprint 😅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants