Re: [PATCH] Broken translation strings since r28979

2008-01-24 22:25:07 Karl Fogel napisał(a):
> Arfrever Frehtes Taifersar Arahesis <arfrever.fta_at_gmail.com> writes:
> > I'm attaching a patch to fix this bug.
>
> Thanks! Did you build/test it? I haven't yet, but I just noticed
> something reading the patch...
>
> > --- subversion/libsvn_fs_fs/dag.c (wersja 29007)
> > +++ subversion/libsvn_fs_fs/dag.c (kopia robocza)
> > @@ -527,8 +527,10 @@
> > svn_string_t *idstr = svn_fs_fs__id_unparse(node->id, pool);
> > return svn_error_createf
> > (SVN_ERR_FS_CORRUPT, NULL,
> > - _("Can't increment mergeinfo count on node-revision %s to negative "
> > - "value %" APR_INT64_T_FMT),
> > + apr_psprintf(pool,
> > + _("Can't increment mergeinfo count on node-revision %s "
> > + "to negative value %%%s"),
> > + APR_INT64_T_FMT),
> > idstr->data, noderev->mergeinfo_count);
> > }
> > if (noderev->mergeinfo_count > 1 && noderev->kind == svn_node_file)
> > @@ -536,8 +538,10 @@
> > svn_string_t *idstr = svn_fs_fs__id_unparse(node->id, pool);
> > return svn_error_createf
> > (SVN_ERR_FS_CORRUPT, NULL,
> > - _("Can't increment mergeinfo count on *file* node-revision %s to "
> > - "%" APR_INT64_T_FMT " (> 1)"),
> > + apr_psprintf(pool,
> > + _("Can't increment mergeinfo count on *file* "
> > + "node-revision %s to %%%s (> 1)"),
> > + APR_INT64_T_FMT),
> > idstr->data, noderev->mergeinfo_count);
> > }
>
> ...in both of these cases, shouldn't the first "%s" be "%%s"?

You're right.
I'm attaching the updated patch.

[[[
* subversion/libsvn_fs_base/dag.c
  (svn_fs_base__dag_set_mergeinfo_count,
   svn_fs_base__dag_adjust_mergeinfo_count):
* subversion/libsvn_fs_fs/dag.c
  (svn_fs_fs__dag_increment_mergeinfo_count):
   Pass translatable strings to apr_psprintf() function to create intermediate
   strings with appropriate format specifier.

Found by: fabien

Patch by: arfrever

Review by: kfogel
]]]

-- 
Arfrever Frehtes Taifersar Arahesis