From 13fd341c18c011588ec317265c6d8ca5450e45b3 Mon Sep 17 00:00:00 2001 From: Goffi Date: Tue, 28 Sep 2010 15:45:28 +0800 Subject: [PATCH] Fixed yet another utf-8 encoding issue + added a space on progress bar before percentage --- gcp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcp b/gcp index e283a55..87a5f91 100755 --- a/gcp +++ b/gcp @@ -267,7 +267,7 @@ class GCP(): assert(filename) dest_file = self.__filename_fix(os.path.join(dest_path,filename),options) if os.path.exists(dest_file) and not options.force: - warning (_("File [%s] already exists, skipping it !") % dest_file) + warning (_("File [%s] already exists, skipping it !") % dest_file.decode('utf-8','replace')) return True try: dest_fd = open(dest_file, 'wb') @@ -404,7 +404,7 @@ class GCP(): if not self.bytes_total: #No progress bar if the files have a null size return - self.pbar = ProgressBar(self.bytes_total,[_("Copying %s") % self.__get_string_size(self.bytes_total),Percentage()," ",Bar()," ",FileTransferSpeed()," ",ETA()]) + self.pbar = ProgressBar(self.bytes_total,[_("Copying %s") % self.__get_string_size(self.bytes_total)," ",Percentage()," ",Bar()," ",FileTransferSpeed()," ",ETA()]) self.pbar.start() self.pbar.update(self.bytes_copied)