subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From matti...@apache.org
Subject svn commit: r1468565 - /subversion/trunk/subversion/svn/notify.c
Date Tue, 16 Apr 2013 19:10:40 GMT
Author: mattiase
Date: Tue Apr 16 19:10:40 2013
New Revision: 1468565

URL: http://svn.apache.org/r1468565
Log:
Use correct grammatical number localisation for conflict summary messages.

* subversion/svn/notify.c
  (resolved_str, remaining_str): New.
  (svn_cl__notifier_print_conflict_stats):
   Call resolved_str and remaining_str for number-aware
   localisation of messages.

Approved by: cmpilato

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=1468565&r1=1468564&r2=1468565&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/notify.c (original)
+++ subversion/trunk/subversion/svn/notify.c Tue Apr 16 19:10:40 2013
@@ -89,6 +89,24 @@ svn_cl__notifier_reset_conflict_stats(vo
   return SVN_NO_ERROR;
 }
 
+static const char *
+remaining_str(apr_pool_t *pool, int n_remaining)
+{
+  return apr_psprintf(pool, Q_("%d remaining", 
+                               "%d remaining",
+                               n_remaining),
+                      n_remaining);
+}
+
+static const char *
+resolved_str(apr_pool_t *pool, int n_resolved)
+{
+  return apr_psprintf(pool, Q_("and %d already resolved",
+                               "and %d already resolved",
+                               n_resolved),
+                      n_resolved);
+}
+
 svn_error_t *
 svn_cl__notifier_print_conflict_stats(void *baton, apr_pool_t *scratch_pool)
 {
@@ -126,16 +144,19 @@ svn_cl__notifier_print_conflict_stats(vo
     {
       if (n_text > 0 || n_text_r > 0)
         SVN_ERR(svn_cmdline_printf(scratch_pool,
-          _("  Text conflicts: %d remaining (and %d already resolved)\n"),
-          n_text, n_text_r));
+                                   _("  Text conflicts: %s (%s)\n"),
+                                   remaining_str(scratch_pool, n_text),
+                                   resolved_str(scratch_pool, n_text_r)));
       if (n_prop > 0 || n_prop_r > 0)
         SVN_ERR(svn_cmdline_printf(scratch_pool,
-          _("  Property conflicts: %d remaining (and %d already resolved)\n"),
-          n_prop, n_prop_r));
+                                   _("  Property conflicts: %s (%s)\n"),
+                                   remaining_str(scratch_pool, n_prop),
+                                   resolved_str(scratch_pool, n_prop_r)));
       if (n_tree > 0 || n_tree_r > 0)
         SVN_ERR(svn_cmdline_printf(scratch_pool,
-          _("  Tree conflicts: %d remaining (and %d already resolved)\n"),
-          n_tree, n_tree_r));
+                                   _("  Tree conflicts: %s (%s)\n"),
+                                   remaining_str(scratch_pool, n_tree),
+                                   resolved_str(scratch_pool, n_tree_r)));
     }
   if (nb->skipped_paths > 0)
     SVN_ERR(svn_cmdline_printf(scratch_pool,



Mime
View raw message