From 16fb0290a03fd4081cad3ef67c66b404a70a0074 Mon Sep 17 00:00:00 2001 From: Travis Abendshien <46939827+CyanVoxel@users.noreply.github.com> Date: Wed, 22 Jan 2025 15:58:49 -0800 Subject: [PATCH] fix: don't add default title field, use proper phrasing for adding files (#701) * fix: use correct message when adding macros * fix: no longer add title field to new entries * fix: use `entries` dialog title instead of `macros` --- tagstudio/resources/translations/en.json | 4 +++- tagstudio/src/core/utils/refresh_dir.py | 2 +- tagstudio/src/qt/ts_qt.py | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tagstudio/resources/translations/en.json b/tagstudio/resources/translations/en.json index bed30fe8..921cb671 100644 --- a/tagstudio/resources/translations/en.json +++ b/tagstudio/resources/translations/en.json @@ -20,6 +20,8 @@ "entries.mirror.title": "Mirroring Entries", "entries.mirror.window_title": "Mirror Entries", "entries.mirror": "&Mirror", + "entries.running.dialog.new_entries": "Adding {count}/{total} New File Entries...", + "entries.running.dialog.title": "Adding New File Entries", "entries.tags": "Tags", "entries.unlinked.delete_alt": "De&lete Unlinked Entries", "entries.unlinked.delete.confirm": "Are you sure you want to delete the following {count} entries?", @@ -149,7 +151,7 @@ "library.refresh.scanning.singular": "Scanning Directories for New Files...\n{searched_count} File Searched, {found_count} New Files Found", "library.refresh.title": "Refreshing Directories", "library.scan_library.title": "Scanning Library", - "macros.running.dialog.new_entries": "Running Configured Macros on {count}/{total} New Entries", + "macros.running.dialog.new_entries": "Running Configured Macros on {count}/{total} New File Entries...", "macros.running.dialog.title": "Running Macros on New Entries", "media_player.autoplay": "Autoplay", "menu.edit.ignore_list": "Ignore Files and Folders", diff --git a/tagstudio/src/core/utils/refresh_dir.py b/tagstudio/src/core/utils/refresh_dir.py index 6bd5ba00..4aecc9bc 100644 --- a/tagstudio/src/core/utils/refresh_dir.py +++ b/tagstudio/src/core/utils/refresh_dir.py @@ -44,7 +44,7 @@ class RefreshDirTracker: Entry( path=entry_path, folder=self.library.folder, - fields=self.library.default_fields, + fields=[], ) ] ) diff --git a/tagstudio/src/qt/ts_qt.py b/tagstudio/src/qt/ts_qt.py index 3dfb82a2..f42e5b2d 100644 --- a/tagstudio/src/qt/ts_qt.py +++ b/tagstudio/src/qt/ts_qt.py @@ -832,9 +832,9 @@ class QtDriver(DriverMixin, QObject): minimum=0, maximum=files_count, ) - Translations.translate_with_setter(pw.setWindowTitle, "macros.running.dialog.title") + Translations.translate_with_setter(pw.setWindowTitle, "entries.running.dialog.title") Translations.translate_with_setter( - pw.update_label, "macros.running.dialog.new_entries", count=1, total=files_count + pw.update_label, "entries.running.dialog.new_entries", count=1, total=files_count ) pw.show() @@ -843,7 +843,7 @@ class QtDriver(DriverMixin, QObject): pw.update_progress(x + 1), pw.update_label( Translations.translate_formatted( - "macros.running.dialog.new_entries", count=x + 1, total=files_count + "entries.running.dialog.new_entries", count=x + 1, total=files_count ) ), )