Re: [PATCH 1/5] Internationalization of git-gui

Johannes Schindelin [off-list ref] writes:

...
- Make the current revision my new 'master'.  That branch already exists, 
  and I am on 'christian-new', though.  No problem:

	$ git branch -M christian-new master

  (But if you do that with "-M", which means _force_ rename, make sure 
  twice that this is really what you want.)

- Push it.

	$ git push origin +master
	...
	refs/heads/master: da7b699[...] -> cc2b761b[...]

  The "+" is necessary, since I rebased it...

  If there were more pushers than just me, I'd verify that da7b699 is 
  indeed the old state of my master:

	$ git reflog
	...
	d36cd96... HEAD@{20}: checkout: moving from master to christian-new
	da7b699... HEAD@{21}: commit [...]

  Yep.

Good.  Happy.

Two questions and a half.

 - The above means git-gui-i18n.git's master is rebased.  Is
   that the intention?  IOW, people are supposed to work on it
   with fetch+rebase, not fetch+merge (= pull)?

 - It seems that the tip of 'mob' now is out of sync wrt
   'master'.  What's the plan to update it with framework
   changes made in 'master' (e.g. addition of po/glossary.csv)?

While I think keeping a reference for consistent translation
(within one language's *.po file) is a useful practice,
the po/glossary.csv file on 'master' seems a way suboptimal
solution.  Currently it is:

        $ file po/glossary.csv
        po/glossary.csv: ISO-8859 text

        $ head -n 1 po/glossary.csv
        "English Term"  "de translation"

which implies that other languages will be added at the end
separated with <TAB>?

There are two HUGE problems with that.

 * Supporting many languages means looooong lines in that file.
   Translators for languages later on the line would have hard
   time updating or looking at that file.

 * Mixed encodings.  What if next language wants its strings in
   UTF-8?  How would you have that and ISO-8859 on a same line?

I would suggest having one glossary file per language.

Am Samstag, 21. Juli 2007 21:41 schrieb Junio C Hamano:

While I think keeping a reference for consistent translation
(within one language's *.po file) is a useful practice,
the po/glossary.csv file on 'master' seems a way suboptimal
solution.  Currently it is:

        $ file po/glossary.csv
        po/glossary.csv: ISO-8859 text

Oops. I created it with utf8 locally. Must have turned into latin1 either in 
my mailer or during Johannes' mbox tweaking.

(Also, the de.po was created in utf8 here and must have been messed up during 
transmission. Johannes, for future reference: All i18n files should probably 
be submitted as utf8, and if they have a different encoding, the submitter 
better gave a clear sign this was intentional.)

        $ head -n 1 po/glossary.csv
        "English Term"  "de translation"

which implies that other languages will be added at the end
separated with <TAB>?

There are two HUGE problems with that.

 * Supporting many languages means looooong lines in that file.
   Translators for languages later on the line would have hard
   time updating or looking at that file.

 * Mixed encodings.  What if next language wants its strings in
   UTF-8?  How would you have that and ISO-8859 on a same line?

I would suggest having one glossary file per language.

Agreed. I propose to throw away the "add glossary" patch and I'll resubmit, 
this time in a separate po/glossary/ directory, where each language will get 
a po file for the glossary. 

As I've written in another thread: In the glossary for the gnucash project [1] 
we've actually added an extra 
directory and encourage translators to add an extra po file for their 
glossary translations. However, the glossary of gnucash has more than 150 
terms and many of them require to be defined clearly as well, as translators 
would otherwise be unable to translate them concisely. In git-gui, the 
glossary is 25 terms so far and I think the git documentation already 
contains enough definitions of all of them. Nevertheless, maybe it would make 
a better structure if the translations of the glossary are kept in a separate 
po file for each language. 

Christian

[1] 
http://svn.gnucash.org/trac/browser/gnucash/trunk/po/glossary/gnc-glossary.txt

Hi,

On Sat, 21 Jul 2007, Junio C Hamano wrote:

Johannes Schindelin [off-list ref] writes:

quoted

...
- Make the current revision my new 'master'.  That branch already exists, 
  and I am on 'christian-new', though.  No problem:

	$ git branch -M christian-new master

  (But if you do that with "-M", which means _force_ rename, make sure 
  twice that this is really what you want.)

- Push it.

	$ git push origin +master
	...
	refs/heads/master: da7b699[...] -> cc2b761b[...]

  The "+" is necessary, since I rebased it...

  If there were more pushers than just me, I'd verify that da7b699 is 
  indeed the old state of my master:

	$ git reflog
	...
	d36cd96... HEAD@{20}: checkout: moving from master to christian-new
	da7b699... HEAD@{21}: commit [...]

  Yep.

Good.  Happy.

Two questions and a half.

 - The above means git-gui-i18n.git's master is rebased.  Is
   that the intention?  IOW, people are supposed to work on it
   with fetch+rebase, not fetch+merge (= pull)?

Okay, you have me there.  Usually I am the one saying "rebasing is bad".  
So I'll refrain from that practice.  From now on, 'master' will _not_ be 
rebased.  From time to time I will prepare 'for-shawn' branches, which are 
"master rebased onto git-gui".

In related news, I will push to 'mob' whenever I update 'master'.  I will 
never force a push to 'mob', and neither should anybody else have to.  
(Except in the case that you want to correct one of your pushes.)

 - It seems that the tip of 'mob' now is out of sync wrt
   'master'.  What's the plan to update it with framework
   changes made in 'master' (e.g. addition of po/glossary.csv)?

IMHO the best practice is to keep it up-to-date with 'master', as I 
outlined above.

[Half a question about po/glossary.csv]

This was answered by Christian, I guess.

Ciao,
Dscho

Hi,

On Sat, 21 Jul 2007, Christian Stimming wrote:

Am Samstag, 21. Juli 2007 21:41 schrieb Junio C Hamano:

quoted

While I think keeping a reference for consistent translation
(within one language's *.po file) is a useful practice,
the po/glossary.csv file on 'master' seems a way suboptimal
solution.  Currently it is:

        $ file po/glossary.csv
        po/glossary.csv: ISO-8859 text

Oops. I created it with utf8 locally. Must have turned into latin1 either in 
my mailer or during Johannes' mbox tweaking.

D'oh.  I think it was my tweaking.  But now, with 'mob' in place, there 
are less chances for me to fsck up.

Ciao,
Dscho