Skip to content

Prepare for Plone 6.2 #486

Open
Open
@mauritsvanrees

Description

@mauritsvanrees

@erral I see two challenges for locales in Plone 6.2:

  1. I think we should move to native namespaces. This means we need a major release of plone.app.locales that only works on Plone 6.2. The translations themselves could remain unchanged and would be fine for 6.0 and 6.1 as well.

  2. We plan to move lots of templates around, especially from Products.CMFPlone to plone.app.layout. That could make it hard to merge changes back to the previous major branch, because there will be lots of differences in comments that refer to files and line numbers, even though the msg ids would be the same.

So it could be good to have a way to keep the branches for 6.0/6.1 and 6.2 in sync. Maybe it will be easy enough to let everyone (including Weblate) merge to master, which would be for 6.2+, and manually merge the changes every now and then to the previous major branch for 6.0/6.1.

Or I guess it would be fine to keep master for 6.0/6.1 for now, and let buildout.coredev 6.2 use a branch native. This can remain largely unchanged during development. For an alpha/beta/rc release you could just copy the locales directory from master to native. Or remove the native branch and create it freshly. Probably in release candidate stage we can do this one final time, and from then on make the branch with native namespaces the canonical one. I guess simply copy the master branch to 6.x at that time, and redo the few native namespace changes on master.

Alternatively, i18ndude rebuild-pot already has an option --no-line-numbers so the comments only have filenames/paths, not the line number of the msgid. We could probably add an option to not render the paths at all. That would make the difference between the two major branches practically zero.
Or use i18ndude admix/trmerge to merge .po changes from one to the other.

My gut feeling: it is easiest to keep using master for 6.0/6.1 for now, and have a native or probably plone-62 branch with only the namespace change.

What do you think?

Metadata

Metadata

Assignees

Labels

No labels
No labels

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions