Thread: [Kindle Touch] Localization
View Single Post
Old 01-29-2012, 03:15 PM   #212
ixtab
(offline)
ixtab ought to be getting tired of karma fortunes by now.ixtab ought to be getting tired of karma fortunes by now.ixtab ought to be getting tired of karma fortunes by now.ixtab ought to be getting tired of karma fortunes by now.ixtab ought to be getting tired of karma fortunes by now.ixtab ought to be getting tired of karma fortunes by now.ixtab ought to be getting tired of karma fortunes by now.ixtab ought to be getting tired of karma fortunes by now.ixtab ought to be getting tired of karma fortunes by now.ixtab ought to be getting tired of karma fortunes by now.ixtab ought to be getting tired of karma fortunes by now.
 
ixtab's Avatar
 
Posts: 2,907
Karma: 6736094
Join Date: Dec 2011
Device: K3, K4, K5, KPW, KPW2
Quote:
Originally Posted by eureka View Post
@ixtab, what is a problem? Interspersing of tool changes with translation changes in single commit?

UPD: ah, I see. But adding or changing of files (even untracked) shouldn't a problem for Git. Could you be a bit concrete in Git error messages?

Anyway, I'm sticking with 3. git includes ALL translations. Resources (source and translations) are the main content of Git repo. Tools aren't. (no offence assumed, it's not about quality or unnecessity).
The interspersing of code and translations is one of the issues, but it's more of an "aesthetical" one (and one where the actually relevant information gets buried in a lot of uninteresting changes).
More important is if there are resources which are on transifex, and nobody has pushed them to git yet. So assume a new language "ex_EX" (ex=example) gets registered on transifex.
  1. You are only a user (without git commit rights) and you pull resources from transifex using "tx pull -a". You get ex_EX resources. Everything is fine.
  2. As long as git knows nothing about the ex_EX locale, everything is fine.
  3. Somebody with commit access commits ex_EX resources into git.
  4. The next time you try to "git pull", you get an error from git, because it would try to overwrite a previously untracked file with one from the repository. The only way out is to "git clean -d -f", followed by "git pull", which is not nice at all, because it also deletes other local changes.

This is exactly what happened to my "automatic localization snapshot producer" script last night: it failed because of JustAMan's newly committed files, which had been there already (produced by "tx pull", but outside of git's knowledge). The workaround is indeed to call "git clean", then "tx pull" every time.

So, I'm just saying this. Because of the existing workaround, all of the options work, so I'm fine with any of them.

I'm still in favor of option 2, but of course, option 3 also enables folks which are not using Transifex to use the repository. And looking at the title at github, this actually was the intention
ixtab is offline   Reply With Quote