[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] proper indentation in merge conflict menu (Was: Re: svn commit: r31600 - branches/1.5.x/subversion/po)

From: Jens Seidel <jensseidel_at_users.sourceforge.net>
Date: Thu, 5 Jun 2008 22:28:32 +0200

On Thu, Jun 05, 2008 at 07:28:47PM +0200, Jens Seidel wrote:
> On Thu, Jun 05, 2008 at 12:23:17PM -0400, Karl Fogel wrote:
> > jensseidel_at_tigris.org writes:
> > > Log:
> > > On the '1.5.x' branch:
> > >
> > > Workaround for fixed (language independent) indentation in German translation.
> > >
> > > * subversion/po/de.po:
> > > The code in svn_cl__conflict_handler doesn't respect that translations of
> > > "Select: " could have another length than 8 (the English one).
> > > That's why the indentation of "(h) help " was wrongly aligned in the
> > > conflict resolution menu.
> >
> > Just so I understand correctly:
> >
> > This is a change that applies only to the 1.5.x branch, because of
> > something specific about that branch? (Otherwise, I'd suggest it enter
> > on trunk and be merged over... But that's a familiar conversation, so I
> > assume you did it this way for a reason.)
>
> That's right. The code changed in trunk and I didn't found this issue
> there.

OK, there is indeed similar code in trunk and I prepared a patch which
fixes the indentation (but should not be backported so r31600 is fine) from:

Auswahl: (p) zurückstellen, (df) voller Diff, (e) editieren,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options:

to

Auswahl: (p) zurückstellen, (df) voller Diff, (e) editieren,
         (mc) mine-conflict, (tc) theirs-conflict,
         (s) show all options:

Nevertheless I need help as I'm really not comfortable with apr. I did
not even find good documentation (only
http://apr.apache.org/docs/apr/1.3, nothing about pool usage ...).

How can I count the number of characters in a string? strlen would
return a too large value because of multi-byte characters.

See the attached patch for details.

Jens

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org

Received on 2008-06-05 22:32:37 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.