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

Re: [PATCH] Split long strings into paragraphs to ease translation

From: Mattias Engdegård <mattiase_at_acm.org>
Date: Wed, 14 Mar 2018 12:31:25 +0100

13 mars 2018 kl. 10.30 skrev Julian Foad <julianfoad_at_apache.org>:
>
>> * The split into separate messages was done at empty line boundaries throughout, but for very short paragraphs (1-2 lines), it would have been more helpful to bunch a few of them together in order to get better context.
>> * Conversely, some strings are still on the longish side. "svn propset" and "svn status" come to mind.
>
> For these issues of paragraph length, I invite you to edit the source text directly and make it nice.

I'll postpone that for later if you don't mind.

>> * I found a paragraph that I had previously forgot to translate! Buried deep in the svn merge help, of course.
>> * stats() in shelf-cmd.c isn't very translator-friendly:
>> info_str = apr_psprintf(scratch_pool,
>> _("%s, %s ago%s\n"),
>> version_str, age_str, paths_str);
>> which is hard to translate well in several languages. At the very least, sink the "ago" part into age_str ("%d hours ago" etc). Speaking of which, the generation of age_str would benefit from using gettext plurals. That's what it's there for!
>
> OK, done throughout 'shelve-cmd.c' in http://svn.apache.org/r1826614 and 'auth-cmd.c' in http://svn.apache.org/r1826617 . I invite you to do the same in other files.

Thank you. These were the ones I could find right away:

[[[
Index: subversion/libsvn_client/conflicts.c
===================================================================
--- subversion/libsvn_client/conflicts.c (revision 1826702)
+++ subversion/libsvn_client/conflicts.c (arbetskopia)
@@ -5944,8 +5944,11 @@
             {
               if (i == edits->nelts - (max_revs_to_display / 2))
                   s = apr_psprintf(result_pool,
- _("%s\n [%d revisions omitted for "
- "brevity],\n"),
+ Q_("%s\n [%d revision omitted for "
+ "brevity],\n",
+ "%s\n [%d revisions omitted for "
+ "brevity],\n",
+ num_revs_to_skip),
                                    s, num_revs_to_skip);
 
               s = apr_psprintf(result_pool, _("%s r%ld by %s%s"), s,
Index: subversion/libsvn_client/patch.c
===================================================================
--- subversion/libsvn_client/patch.c (revision 1826702)
+++ subversion/libsvn_client/patch.c (arbetskopia)
@@ -343,7 +343,9 @@
   components = svn_path_decompose(path, scratch_pool);
   if (strip_count > components->nelts)
     return svn_error_createf(SVN_ERR_CLIENT_PATCH_BAD_STRIP_COUNT, NULL,
- _("Cannot strip %u components from '%s'"),
+ Q_("Cannot strip %u component from '%s'",
+ "Cannot strip %u components from '%s'",
+ strip_count),
                              strip_count,
                              svn_dirent_local_style(path, scratch_pool));
 
Index: subversion/libsvn_wc/props.c
===================================================================
--- subversion/libsvn_wc/props.c (revision 1826702)
+++ subversion/libsvn_wc/props.c (arbetskopia)
@@ -2236,7 +2236,9 @@
               if (duplicate_targets->nelts > 1)
                 {
                   more_str = apr_psprintf(/*scratch_*/pool,
- _(" (%d more duplicate targets found)"),
+ Q_(" (%d more duplicate target found)",
+ " (%d more duplicate targets found)",
+ duplicate_targets->nelts - 1),
                                duplicate_targets->nelts - 1);
                 }
               return svn_error_createf(
]]]
Received on 2018-03-14 12:31:27 CET

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.