Repository navigation
Replies: 3 comments
|
Sounds good to me @acolomb, but i18n seems to be broken now in latest tag. |
|
Indeed strange. I reset the weblate internal branch to your latest v2 commit. Then it correctly reapplied outstanding changes, and included empty strings for missing translations. The latter I could fix by enabling the "Remove blank strings" add-on for all components. Now the latest diff is just four Chinese added translations and a comment removed from one file (a consequence of Weblate rewriting the whole file with just the needed contents on commit). For now, this should work fine again. I wish there was a way though to avoid Weblate running its branch in parallel long-term. That also regularly leads to an alert there, "The VCS repository has many changes compared to upstream." The correct way would be for Weblate to notice when you've integrated all its changes upstream, then reset its internal branch to your v2 branch. But I can configure only:
The latter might cause more conflicts if you commit changes to files that also have outstanding translation updates at the time. So it requires more discipline to merge translations before toching any of these files. What we have now (option 1) requires someone (usually me) to reset the Weblate internal branch from time to time, making it apply any outstanding changes afterwards. Which immediately results in a new translation PR if there are any. Running the weblate branch in parallel to upstream (with a merge after each upstream commit) is pretty stable, but the nagging alert is really unnecessary. In the current situation, this parallel-branch model somehow led to the empty diff PRs, which I really cannot explain. The best behavior from Weblate's side would actually be to notice when all its outstanding changes have been merged, then reset its branch to upstream instead of merging it. That works naturally if upstream itself created a merge commit for the weblate changes, but not if upstream squash-merged the PR. It's one of the fundamental problems with squash-merging, because Git loses track of already merged commits. However, understandably upstream prefers a linear commit history. Here are your options, if you're open to changing the workflow:
Let me know if any of this sounds more reasonable / pleasant that the status quo. But I'm also fine with cleaning up from time to time, when the "VCS has changes" alert pops up. |
Uh oh!
There was an error while loading. Please reload this page.
Hi @xor-gate,
after recently onboarding the new BasicSync effort on the Android front, I remembered that this part of the larger Syncthing ecosystem is not yet integrated with the Weblate platform used for the core and some other wrappers. Would you be interested in getting that set up?
Updates would come in via PR if you prefer, we can talk about the details later. I think it makes sense to keep translations of related components in one place. To benefit from re-using similar terms and to tap the potential of crowd-sourced translations. There are already active translators for many languages. I was surprised how fast progress was made for BasicSync.
After looking at the repo, I think it should work fine with Weblate. Just let me know what you think and I can start digging deeper and set up some experiments.
Kind regards
André
All reactions