From fd930922db720c195bfba4e9e2867fd44767e4af Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sun, 1 May 2022 10:39:38 -0700 Subject: [PATCH] get rid of hardcoded text --- jrnl/messages.py | 6 ++++-- jrnl/upgrade.py | 4 ---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/jrnl/messages.py b/jrnl/messages.py index f8ea47f4..95c96f54 100644 --- a/jrnl/messages.py +++ b/jrnl/messages.py @@ -161,7 +161,7 @@ class MsgText(Enum): ImportAborted = "Entries were NOT imported" JournalsToUpgrade = """ - The following {journal_type} journals will be upgraded to jrnl {version}: + The following journals will be upgraded to jrnl {version}: """ @@ -171,7 +171,7 @@ class MsgText(Enum): """ UpgradingJournal = """ - Upgrading {journal_type} '{journal_name}' journal stored in {path}... + Upgrading '{journal_name}' journal stored in {path}... """ UpgradingConfig = "Upgrading config..." @@ -209,6 +209,8 @@ class MsgText(Enum): YAML export must be to a directory, not a single file """ + JournalExportedTo = "Journal exported to {path}" + # --- Import --- # ImportSummary = """ {count} imported to {journal_name} journal diff --git a/jrnl/upgrade.py b/jrnl/upgrade.py index 00afc3cb..d811f841 100644 --- a/jrnl/upgrade.py +++ b/jrnl/upgrade.py @@ -92,7 +92,6 @@ def upgrade_jrnl(config_path): header=Message( MsgText.JournalsToUpgrade, params={ - "journal_type": "encrypted", "version": __version__, }, ), @@ -104,7 +103,6 @@ def upgrade_jrnl(config_path): header=Message( MsgText.JournalsToUpgrade, params={ - "journal_type": "plain text", "version": __version__, }, ), @@ -126,7 +124,6 @@ def upgrade_jrnl(config_path): Message( MsgText.UpgradingJournal, params={ - "journal_type": "encrypted", "journal_name": journal_name, "path": path, }, @@ -144,7 +141,6 @@ def upgrade_jrnl(config_path): Message( MsgText.UpgradingJournal, params={ - "journal_type": "plain text", "journal_name": journal_name, "path": path, },