Skip to content
This repository has been archived by the owner on Jul 30, 2022. It is now read-only.

TranslateWiki pushing updates to Master #318

Open
Hutchy68 opened this issue Feb 13, 2018 · 6 comments
Open

TranslateWiki pushing updates to Master #318

Hutchy68 opened this issue Feb 13, 2018 · 6 comments

Comments

@Hutchy68
Copy link
Collaborator

Setup

  • Foreground version: master and develop branches
  • Extension version (if connected to the issue):

Issue

Just adding a note here as I don't know how this will be fixed.

Our default branch is develop and I was under the impression Translatewiki.net would be pushing localisation changes to it. I discovered it has been pushing them to master. To make things more complicated, TranslateWiki.net pushed a qqq.json file at master branch in one of their first pushes, which was really broken from what the qqq.json file in develop is. See the history of qqq.json file and in particular, 5b29279. I did fix it this morning with 1a4c6fc.

I hope this will correct all the wrong translations on pushed to master. Now how to make TranslateWiki.net start pushing everything to develop needs to be solved.

@kghbln
Copy link
Contributor

kghbln commented Feb 14, 2018

@Hutchy68 basically a variation of ProfessionalWiki/Maps#411 so @Nikerabbit is the one that should be involved. I personally have the feeling that development is easiest when it happens on master but there are obviously other approaches too.

@Hutchy68
Copy link
Collaborator Author

I wouldn't be against moving it all back to master after v2.1 is released. develop kind of got away from us and became "the branch" where everything was being merged.

My concerns are:

  1. Will the new qqq.json file help eventually fix all the bad i18n files by marking the translations invalid?
  2. Is there a way to check this and see the status?

@Nikerabbit
Copy link

By default we read and write to the master branch. This is configurable (even separately). Generally it is better to use the branch where the development happens for translators to let translate as soon as possible, to maximize the time for translate and to minimize the time for the translations to reach users.

Please clarify what you want :)

@Nikerabbit
Copy link

@Hutchy68 is the current setting working okay?

@Hutchy68
Copy link
Collaborator Author

Should be pushing to develop branch. That is the branch we want PRs against.

@Nikerabbit
Copy link

To confirm:

  • Source: develop (from where we read en.json etc.)
  • Target: develop
  • Method: git push (or pull request?)

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

No branches or pull requests

3 participants