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

[PATCH] Re: svn commit: r35033 - in trunk/subversion: include libsvn_fs libsvn_fs_base libsvn_fs_fs libsvn_repos svnadmin tests/libsvn_fs_fs

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: Tue, 06 Jan 2009 10:03:53 -0500

Fabien Coelho wrote:
>> Author: hwright
>> Date: Mon Jan 5 10:04:39 2009
>> New Revision: 35033
>>
>> * subversion/svnadmin/main.c
>
> Gettext is broken on line 1135 :
>
>> + _("Packing shard %" APR_INT64_T_FMT "..."),
>
> You cannot use the *_FMT macros directly in a format, as it is missed by
> the gettext string extractor.
>

Is this the right way to fix this kind of problem?

Index: subversion/svnadmin/main.c
===================================================================
--- subversion/svnadmin/main.c (revision 35038)
+++ subversion/svnadmin/main.c (working copy)
@@ -1131,9 +1131,10 @@
   switch (action)
     {
       case svn_fs_pack_notify_start:
- SVN_ERR(svn_cmdline_printf(pool,
- _("Packing shard %" APR_INT64_T_FMT "..."),
- shard));
+ {
+ const char *shardstr = apr_psprintf(pool, "%" APR_INT64_T_FMT,
shard);
+ SVN_ERR(svn_cmdline_printf(pool, _("Packing shard %s..."),
shardstr));
+ }
         break;

       case svn_fs_pack_notify_end:

-- 
C. Michael Pilato <cmpilato_at_collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1007687

Received on 2009-01-06 16:04:19 CET

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