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

From: Christian Stimming <stimming@tuhh.de>
Date: Jul 22, 2007, 12:24 UTC
Message-ID: <200707221424.20548.stimming@tuhh.de>
In-Reply-To: <20070722074525.GX32566@spearce.org>

Am Sonntag, 22. Juli 2007 09:45 schrieb Shawn O. Pearce:

Show 5 quoted lines

> > Here I marked much more strings than in the previous patch, and as
> > discussed the procedure [mc ...] is used for translation. 
>
> Almost.  I noticed two that you did miss, and its because they are
> totally weird.  We may want to rewrite this block of code first...

Yes, I've noticed those two run-time strings as well; I simply deferred them to be dealt with at a later point in time. As you already say, they will have to be rewritten before they can be translated. Probably an extra layer of [format ...] will do.

Show 19 quoted lines

> > @@ -1682,69 +1682,69 @@ trace add variable current_branch write
> > ".mbar.repository entryconf [.mbar.repos .mbar.repository add separator
> >
> >  .mbar.repository add command \
> > -	-label {Visualize Current Branch's History} \
> > +	-label [mc "Visualize Current Branch's History"] \
> >  	-command {do_gitk $current_branch}
> >  trace add variable current_branch write ".mbar.repository entryconf
> > [.mbar.repository index last] -label \"Visualize \$current_branch's
> > History\" ;#" .mbar.repository add command \
>
> But they are in a double quoted string and will
> be eval'd later by Tcl, so we actually need something like:
>
> - trace add variable current_branch write ".mbar.repository entryconf
> [.mbar.repository index last] -label \"Visualize \$current_branch's
> History\" ;#" + trace add variable current_branch write ".mbar.repository
> entryconf [.mbar.repository index last] -label \[mc \"Visualize
> \$current_branch's History\"\] ;#"

Err... I didn't get the latter one, but as I said, this can be deferred until later.

Show 8 quoted lines

> > -	.mbar.apple add command -label "About [appname]" \
> > +	.mbar.apple add command -label [mc "About %s" appname] \
>
> Bug. This needs to be:
>
> +	.mbar.apple add command -label [mc "About %s" [appname]] \
>
> You lost one level of [] there when you did the replacement.

Oops, sorry, you are right. Also, I didn't test quite thoroughly after the s/_/mc/ replacement, compared to the original _ introduction, where I already caught this one once before.

> I only noticed this during a fast scan through while deleting text.
> I'll have to reread this patch more carefully later, before I apply
> (or merge) it, to make sure we don't have more such cases.

The appname thing was the only occurrence in this file, but it occurs several times.

Christian