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

Re: svn commit: r12171 - trunk/subversion/libsvn_subr

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2004-12-06 23:12:52 CET

"Peter N. Lundblad" <peter@famlundblad.se> writes:

> On Sun, 5 Dec 2004 philip@tigris.org wrote:
>
>> Modified: trunk/subversion/libsvn_subr/path.c
>> Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_subr/path.c?view=diff&rev=12171&p1=trunk/subversion/libsvn_subr/path.c&r1=12170&p2=trunk/subversion/libsvn_subr/path.c&r2=12171
>> ==============================================================================
>> --- trunk/subversion/libsvn_subr/path.c (original)
>> +++ trunk/subversion/libsvn_subr/path.c Sun Dec 5 17:06:29 2004
>> @@ -1061,7 +1061,7 @@
>>
>> if (apr_err)
>> return svn_error_createf(SVN_ERR_BAD_FILENAME, NULL,
>> - "Couldn't determine absolute path of '%s'",
>> + _("Couldn't determine absolute path of '%s'"),
>> svn_path_local_style (relative, pool));
>> }
>>
>> @@ -1100,7 +1100,7 @@
>> else
>> {
>> return svn_error_createf(SVN_ERR_BAD_FILENAME, NULL,
>> - "'%s' is neither a file nor a directory name",
>> + _("'%s' is neither a file nor a directory name"),
>> svn_path_local_style(path, pool));
>> }
>>
>> @@ -1206,7 +1206,7 @@
>> apr_err = apr_filepath_encoding (&encoding_style, pool);
>> if (apr_err)
>> return svn_error_wrap_apr (apr_err,
>> - "Can't determine the native path encoding");
>> + _("Can't determine the native path encoding"));
>>
>> /* ### What to do about APR_FILEPATH_ENCODING_UNKNOWN?
>> Well, for now we'll just punt to the svn_utf_ functions;
>>
>> Modified: trunk/subversion/libsvn_subr/utf.c
>> Url: http://svn.collab.net/viewcvs/svn/trunk/subversion/libsvn_subr/utf.c?view=diff&rev=12171&p1=trunk/subversion/libsvn_subr/utf.c&r1=12170&p2=trunk/subversion/libsvn_subr/utf.c&r2=12171
>> ==============================================================================
>> --- trunk/subversion/libsvn_subr/utf.c (original)
>> +++ trunk/subversion/libsvn_subr/utf.c Sun Dec 5 17:06:29 2004
>> @@ -443,7 +442,7 @@
>> (unsigned char)last[i-valid]),
>> NULL);
>> msg = apr_pstrcat (pool, msg,
>> - ")\nfollowed by invalid UTF-8 sequence\n(hex:", NULL);
>> + _(")\nfollowed by invalid UTF-8 sequence\n(hex:"), NULL);
>>
>> /* 4 invalid octets will guarantee that the faulty octet is displayed */
>> invalid = data + len - last;
>> @@ -452,7 +451,7 @@
>> for (i = 0; i < invalid; ++i)
>> msg = apr_pstrcat (pool, msg, apr_psprintf (pool, " %02x",
>> (unsigned char)last[i]), NULL);
>> - msg = apr_pstrcat (pool, msg, ")", NULL);
>> + msg = apr_pstrcat (pool, msg, _(")"), NULL);
>>
>
> Ooops, how wold you translate that string? In cases like this, you need to
> keep the translated string together, by preparing the replacable part
> first in a separate string.

Which string?

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Dec 6 23:14:08 2004

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.