[nautilus] file-operations: fix duplication status string



commit 374718f38e954ab5945fa79bee249d5c3d55efab
Author: Ernestas Kulik <ernestask src gnome org>
Date:   Tue Aug 16 18:51:01 2016 +0300

    file-operations: fix duplication status string
    
    There are a couple of problems with the status string during file
    duplication:
      1. The status string is constructed by calling ngettext()
      with the index of the file plus one.
      2. nautilus_progress_info_take_status() is called with the total count
      of files plus one.
    
    These two combined result in funky status strings (e.g. “duplicating 3
    file in X”).
    
    This commit fixes both of those problems.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=769997

 src/nautilus-file-operations.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/nautilus-file-operations.c b/src/nautilus-file-operations.c
index 26d0704..cc2a54e 100644
--- a/src/nautilus-file-operations.c
+++ b/src/nautilus-file-operations.c
@@ -3221,10 +3221,10 @@ report_copy_progress (CopyMoveJob *copy_job,
                                 if (files_left > 0) {
                                         status = ngettext ("Duplicating %'d file in “%B”",
                                                            "Duplicating %'d files in “%B”",
-                                                           transfer_info->num_files + 1);
+                                                           source_info->num_files);
                                        nautilus_progress_info_take_status (job->progress,
                                                                            f (status,
-                                                                              source_info->num_files + 1,
+                                                                              source_info->num_files,
                                                                               parent));
                                 } else {
                                         status = ngettext ("Duplicated %'d file in “%B”",


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]