Opened 2 years ago

Closed 21 months ago

#18068 closed task (fixed)

Prevent overwriting translations from the beta4 branch when switching back to master

Reported by: bitigchi Owned by: nielx
Priority: normal Milestone: Unscheduled
Component: Sys-Admin Version: R1/Development
Keywords: Cc:
Blocked By: Blocking:
Platform: All

Description

Currently auto-committer directly commits updated translations to the beta4 branch. Since master branch is left untouched, after the release of beta4 and reverting auto-committer to the master branch, recent translations will be lost, and the translators will have to re-translate the bits they've translated during the last week (and up till the release). This happened with the beta3 release, I remember ending up having to re-translate all the new and updated bits for the beta3 release.

23aa00729fc31811dc8d63c56c563fb9f9d3b277 and ed1a2247d78d2958b121559d95d6364bb64f21ed need to be cherry-picked into master, and this should be repeated for all the auto-committer commits or it should commit to both branches until the beta4 release.

Change History (8)

comment:1 by waddlesplash, 2 years ago

Owner: changed from stippi to nielx
Status: newassigned

comment:2 by waddlesplash, 2 years ago

Component: User InterfaceSys-Admin
Keywords: i18n l10n removed

comment:3 by nielx, 2 years ago

Resolution: no change required
Status: assignedclosed

Won't fix.

The translations will be pushed to the r1beta4 branch until that branch is frozen (based on the timeline this will be somewhere this month), after that it will be repointed to the master branch and all translations in Pootle will be merged in master then.

I do not see the need to do additional work right now.

comment:4 by nielx, 2 years ago

Resolution: no change required
Status: closedreopened

Re-open, it seems I did not correctly understood that this ticket is to flag to make sure previous translations are not lost after switching back to master.

comment:5 by nielx, 2 years ago

The actual way to prevent this from happening is to re-write the catalogs to disk after switching the branch, and then start the sync.

comment:6 by nielx, 2 years ago

Summary: Cherry-pick translation commits from the beta4 branchPrevent overwriting translations from the beta4 branch when switching back to master

comment:7 by bitigchi, 21 months ago

This is fixed.

comment:8 by waddlesplash, 21 months ago

Resolution: fixed
Status: reopenedclosed
Note: See TracTickets for help on using tickets.