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 whitespace in locales created by the generator #4737

Merged
merged 2 commits into from
May 5, 2023

Conversation

davisagli
Copy link
Member

This avoids creation of changes when i18n is synced, which causes the i18n check in a plone cookiecutter project to fail. Fixes collective/cookiecutter-plone-starter#63

Also removed the translator names from the empty locale files, since these are locales for a new project, not the existing translations that those people worked on.

@davisagli davisagli requested a review from sneridagh May 4, 2023 22:29
@netlify
Copy link

netlify bot commented May 4, 2023

Deploy Preview for volto canceled.

Name Link
🔨 Latest commit 7454edd
🔍 Latest deploy log https://app.netlify.com/sites/volto/deploys/645431f2b67a2b0008e6ee50

@davisagli
Copy link
Member Author

The towncrier check shouldn't be failing; I added a news entry inside packages/generator-volto

@cypress
Copy link

cypress bot commented May 4, 2023

Passing run #5065 ↗︎

0 493 20 0 Flakiness 0

Details:

news
Project: Volto Commit: 7454eddfc5
Status: Passed Duration: 14:14 💡
Started: May 4, 2023 10:33 PM Ended: May 4, 2023 10:48 PM

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings.

@sneridagh sneridagh merged commit dd5cb01 into master May 5, 2023
@sneridagh sneridagh deleted the fix-generator-locales branch May 5, 2023 15:51
sneridagh added a commit that referenced this pull request May 10, 2023
* master: (83 commits)
  Apply suggestion from browser for password field (#4524)
  (fix):Object.normaliseMail: Cannot read properties of null (#4558)
  Fix link in Volto, remove from linkcheck ignore in Documentation v6.0 (#4742)
  added documentation regarding the static middleware #4518 (#4736)
  Closes issue #4567 (#4570)
  Fix whitespace in locales created by the generator (#4737)
  Tidy up from synch with 16.x.x (#4728)
  Release notes from 16.20.2, 16.20.3, 16.20.4 (#4729)
  Use new URL 6.docs.plone.org (#4726)
  Security upgrade for momentjs (#4715)
  Don't decode querystring while adding apiExpanders (#4719)
  (Synchronize redundant block id in listing block on pasting) Fix duplicating listing block (#4239)
  Translate add-on control panel (cleaned up PR) (#4620)
  Fix Move to top of folder ordering in folder content view by searchin… (#4709)
  Fix robot.txt - the sitemap link should respect x-forwarded headers (#4704)
  Refactor faulty reorder elements in ObjectBrowserList widget (#4703)
  Release changelog notes for 16.20.1
  Release 17.0.0-alpha.5
  Generate a split sitemap (also fix robots.txt) (#4639)
  Fix search block in edit mode re-queries multiple blocks with an empty search text (#4694)
  ...
sneridagh added a commit that referenced this pull request May 11, 2023
* master: (185 commits)
  fix: unresponsive add page (#4507)
  Apply suggestion from browser for password field (#4524)
  (fix):Object.normaliseMail: Cannot read properties of null (#4558)
  Fix link in Volto, remove from linkcheck ignore in Documentation v6.0 (#4742)
  added documentation regarding the static middleware #4518 (#4736)
  Closes issue #4567 (#4570)
  Fix whitespace in locales created by the generator (#4737)
  Tidy up from synch with 16.x.x (#4728)
  Release notes from 16.20.2, 16.20.3, 16.20.4 (#4729)
  Use new URL 6.docs.plone.org (#4726)
  Security upgrade for momentjs (#4715)
  Don't decode querystring while adding apiExpanders (#4719)
  (Synchronize redundant block id in listing block on pasting) Fix duplicating listing block (#4239)
  Translate add-on control panel (cleaned up PR) (#4620)
  Fix Move to top of folder ordering in folder content view by searchin… (#4709)
  Fix robot.txt - the sitemap link should respect x-forwarded headers (#4704)
  Refactor faulty reorder elements in ObjectBrowserList widget (#4703)
  Release changelog notes for 16.20.1
  Release 17.0.0-alpha.5
  Generate a split sitemap (also fix robots.txt) (#4639)
  ...
sneridagh added a commit that referenced this pull request May 12, 2023
Co-authored-by: David Glick <david@glicksoftware.com>
sneridagh added a commit to ninanoleto/volto that referenced this pull request May 20, 2023
* master: (29 commits)
  Remove max_line_length from .editorconfig (plone#4776)
  Fix bug showing logs at the browsers when richtext widget is use (plone#4780)
  Show expired and future content in contents view (plone#4764)
  Fix reducing expanders loaded in a subrequest (plone#4761)
  Update release notes for 16.20.5 and 16.20.6 (plone#4759)
  Release 17.0.0-alpha.7
  Try to sort out volto's use of language codes (plone#4741)
  Improve .npmignore to not include not needed files/folders (plone#4746)
  Release 17.0.0-alpha.6
  Control panel list SSR (plone#3749)
  Open all accordion'd content in InlineForm by default, allow arbitrarily close any number of them (plone#4178)
  Upgrade to Plone 6.0.4 (plone#4743)
  fix: unresponsive add page (plone#4507)
  Apply suggestion from browser for password field (plone#4524)
  (fix):Object.normaliseMail: Cannot read properties of null (plone#4558)
  Fix link in Volto, remove from linkcheck ignore in Documentation v6.0 (plone#4742)
  added documentation regarding the static middleware plone#4518 (plone#4736)
  Closes issue plone#4567 (plone#4570)
  Fix whitespace in locales created by the generator (plone#4737)
  Tidy up from synch with 16.x.x (plone#4728)
  ...
sneridagh added a commit that referenced this pull request May 20, 2023
* master: (29 commits)
  Remove max_line_length from .editorconfig (#4776)
  Fix bug showing logs at the browsers when richtext widget is use (#4780)
  Show expired and future content in contents view (#4764)
  Fix reducing expanders loaded in a subrequest (#4761)
  Update release notes for 16.20.5 and 16.20.6 (#4759)
  Release 17.0.0-alpha.7
  Try to sort out volto's use of language codes (#4741)
  Improve .npmignore to not include not needed files/folders (#4746)
  Release 17.0.0-alpha.6
  Control panel list SSR (#3749)
  Open all accordion'd content in InlineForm by default, allow arbitrarily close any number of them (#4178)
  Upgrade to Plone 6.0.4 (#4743)
  fix: unresponsive add page (#4507)
  Apply suggestion from browser for password field (#4524)
  (fix):Object.normaliseMail: Cannot read properties of null (#4558)
  Fix link in Volto, remove from linkcheck ignore in Documentation v6.0 (#4742)
  added documentation regarding the static middleware #4518 (#4736)
  Closes issue #4567 (#4570)
  Fix whitespace in locales created by the generator (#4737)
  Tidy up from synch with 16.x.x (#4728)
  ...
sneridagh added a commit to ninanoleto/volto that referenced this pull request May 20, 2023
* typescript-support-in-core: (29 commits)
  Remove max_line_length from .editorconfig (plone#4776)
  Fix bug showing logs at the browsers when richtext widget is use (plone#4780)
  Show expired and future content in contents view (plone#4764)
  Fix reducing expanders loaded in a subrequest (plone#4761)
  Update release notes for 16.20.5 and 16.20.6 (plone#4759)
  Release 17.0.0-alpha.7
  Try to sort out volto's use of language codes (plone#4741)
  Improve .npmignore to not include not needed files/folders (plone#4746)
  Release 17.0.0-alpha.6
  Control panel list SSR (plone#3749)
  Open all accordion'd content in InlineForm by default, allow arbitrarily close any number of them (plone#4178)
  Upgrade to Plone 6.0.4 (plone#4743)
  fix: unresponsive add page (plone#4507)
  Apply suggestion from browser for password field (plone#4524)
  (fix):Object.normaliseMail: Cannot read properties of null (plone#4558)
  Fix link in Volto, remove from linkcheck ignore in Documentation v6.0 (plone#4742)
  added documentation regarding the static middleware plone#4518 (plone#4736)
  Closes issue plone#4567 (plone#4570)
  Fix whitespace in locales created by the generator (plone#4737)
  Tidy up from synch with 16.x.x (plone#4728)
  ...
@Fosten
Copy link

Fosten commented Jul 20, 2023

Test i18n sync fails due to one extra whitespace character in the pt locale:
https://github.com/Fosten/plone-pimaker-site/actions/runs/5606557238/jobs/10256823783
Test i18n sync passes after fixing line 3 here:
Fosten/plone-pimaker-site@56fa968

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.

i18n sync error
3 participants