From d669659e88534363dd26ab49bb5abd971f937643 Mon Sep 17 00:00:00 2001 From: Aqueminivan Date: Fri, 18 Oct 2019 03:51:54 -0400 Subject: [PATCH 1/4] Added file counts when deleting media --- aqt/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aqt/main.py b/aqt/main.py index ce89258ff..52c14187a 100644 --- a/aqt/main.py +++ b/aqt/main.py @@ -1107,7 +1107,7 @@ will be lost. Continue?""")) if report: report += "\n\n\n" report += _( - "In media folder but not used by any cards:") + str(len(unused)) + " files found in media folder not used by any cards:") report += "\n" + "\n".join(unused) if nohave: if report: @@ -1159,11 +1159,11 @@ will be lost. Continue?""")) now = time.time() if now - lastProgress >= 0.3: lastProgress = now - label = _("Deleted %s files...") % (c+1) + label = _("%d files remaining...") % (len(unused) - (c+1)) self.progress.update(label) finally: self.progress.finish() - tooltip(_("Deleted.")) + tooltip(_("Deleted %d files.") % c) diag.close() def onStudyDeck(self): From 01f2fda214745eb67e01b04de5d08a027d5df5ad Mon Sep 17 00:00:00 2001 From: Aqueminivan Date: Sat, 19 Oct 2019 18:03:59 -0400 Subject: [PATCH 2/4] Fixed translation issues for media counts --- aqt/main.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/aqt/main.py b/aqt/main.py index 52c14187a..2ee0e3375 100644 --- a/aqt/main.py +++ b/aqt/main.py @@ -1104,10 +1104,11 @@ will be lost. Continue?""")) if warnings: report += "\n".join(warnings) + "\n" if unused: + numberOfUnusedFilesLabel = str(len(unused)) if report: report += "\n\n\n" - report += _( - str(len(unused)) + " files found in media folder not used by any cards:") + report += numberOfUnusedFilesLabel + " " + report += ngettext("file found in media folder not used by any cards:", "files found in media folder not used by any cards:", int(numberOfUnusedFilesLabel)) report += "\n" + "\n".join(unused) if nohave: if report: @@ -1158,12 +1159,14 @@ will be lost. Continue?""")) now = time.time() if now - lastProgress >= 0.3: + numberOfRemainingFilesToBeDeleted = len(unused) - c lastProgress = now - label = _("%d files remaining...") % (len(unused) - (c+1)) + label = ngettext("%d file remaining...", "%d files remaining...", numberOfRemainingFilesToBeDeleted) % numberOfRemainingFilesToBeDeleted self.progress.update(label) finally: self.progress.finish() - tooltip(_("Deleted %d files.") % c) + numberOfFilesDeleted = c + 1 + tooltip(ngettext("Deleted %d file.", "Deleted %d files.", numberOfFilesDeleted) % numberOfFilesDeleted) diag.close() def onStudyDeck(self): From 2b2afe899af5f32411fc75c11154ba70210d835e Mon Sep 17 00:00:00 2001 From: Aqueminivan Date: Sat, 19 Oct 2019 18:10:59 -0400 Subject: [PATCH 3/4] Fixed code style issue (column width) --- aqt/main.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/aqt/main.py b/aqt/main.py index 2ee0e3375..822d9e708 100644 --- a/aqt/main.py +++ b/aqt/main.py @@ -1108,7 +1108,10 @@ will be lost. Continue?""")) if report: report += "\n\n\n" report += numberOfUnusedFilesLabel + " " - report += ngettext("file found in media folder not used by any cards:", "files found in media folder not used by any cards:", int(numberOfUnusedFilesLabel)) + report += ngettext( + "file found in media folder not used by any cards:", + "files found in media folder not used by any cards:", + int(numberOfUnusedFilesLabel)) report += "\n" + "\n".join(unused) if nohave: if report: @@ -1161,12 +1164,16 @@ will be lost. Continue?""")) if now - lastProgress >= 0.3: numberOfRemainingFilesToBeDeleted = len(unused) - c lastProgress = now - label = ngettext("%d file remaining...", "%d files remaining...", numberOfRemainingFilesToBeDeleted) % numberOfRemainingFilesToBeDeleted + label = ngettext("%d file remaining...", + "%d files remaining...", + numberOfRemainingFilesToBeDeleted) % numberOfRemainingFilesToBeDeleted self.progress.update(label) finally: self.progress.finish() numberOfFilesDeleted = c + 1 - tooltip(ngettext("Deleted %d file.", "Deleted %d files.", numberOfFilesDeleted) % numberOfFilesDeleted) + tooltip(ngettext("Deleted %d file.", + "Deleted %d files.", + numberOfFilesDeleted) % numberOfFilesDeleted) diag.close() def onStudyDeck(self): From cba7c8a57b2611032f2ab93a7ab865163dd4469c Mon Sep 17 00:00:00 2001 From: Aqueminivan Date: Sat, 19 Oct 2019 19:39:43 -0400 Subject: [PATCH 4/4] Moved number inside ngettext() --- aqt/main.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/aqt/main.py b/aqt/main.py index 822d9e708..63e97c6dc 100644 --- a/aqt/main.py +++ b/aqt/main.py @@ -1104,14 +1104,12 @@ will be lost. Continue?""")) if warnings: report += "\n".join(warnings) + "\n" if unused: - numberOfUnusedFilesLabel = str(len(unused)) + numberOfUnusedFilesLabel = len(unused) if report: report += "\n\n\n" - report += numberOfUnusedFilesLabel + " " - report += ngettext( - "file found in media folder not used by any cards:", - "files found in media folder not used by any cards:", - int(numberOfUnusedFilesLabel)) + report += ngettext("%d file found in media folder not used by any cards:", + "%d files found in media folder not used by any cards:", + numberOfUnusedFilesLabel) % numberOfUnusedFilesLabel report += "\n" + "\n".join(unused) if nohave: if report: