You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2010/01/26 18:30:31 UTC
svn commit: r903331 - /subversion/trunk/subversion/svn/notify.c
Author: stsp
Date: Tue Jan 26 17:30:31 2010
New Revision: 903331
URL: http://svn.apache.org/viewvc?rev=903331&view=rev
Log:
* subversion/svn/notify.c
(notify): Mark svn patch output for translation.
Suggested by: danielsh
Modified:
subversion/trunk/subversion/svn/notify.c
Modified: subversion/trunk/subversion/svn/notify.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/notify.c?rev=903331&r1=903330&r2=903331&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/notify.c (original)
+++ subversion/trunk/subversion/svn/notify.c Tue Jan 26 17:30:31 2010
@@ -313,25 +313,31 @@
{
apr_int64_t off;
const char *s;
+ const char *minus;
if (n->hunk_matched_line > n->hunk_original_start)
{
off = n->hunk_matched_line - n->hunk_original_start;
- s = "";
+ minus = "";
}
else
{
off = n->hunk_original_start - n->hunk_matched_line;
- s = "-";
+ minus = "-";
}
- if ((err = svn_cmdline_printf(pool, "> applied hunk "
- "@@ -%lu,%lu +%lu,%lu @@ "
- "with offset %s%"APR_INT64_T_FMT"\n",
+
+ /* ### APR_INT64_T_FMT isn't translator-friendly */
+ s = _("> applied hunk @@ -%lu,%lu +%lu,%lu @@ "
+ "with offset %s");
+ if ((err = svn_cmdline_printf(pool,
+ apr_pstrcat(pool, s,
+ "%"APR_INT64_T_FMT"\n",
+ NULL),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,
n->hunk_modified_length,
- s, off)))
+ minus, off)))
goto print_error;
}
break;
@@ -339,8 +345,8 @@
case svn_wc_notify_patch_rejected_hunk:
nb->received_some_change = TRUE;
if ((err = svn_cmdline_printf(pool,
- "> rejected hunk "
- "@@ -%lu,%lu +%lu,%lu @@\n",
+ _("> rejected hunk "
+ "@@ -%lu,%lu +%lu,%lu @@\n"),
n->hunk_original_start,
n->hunk_original_length,
n->hunk_modified_start,