diff --git a/jrnl/cli.py b/jrnl/cli.py index 59829ae8..df8808fc 100644 --- a/jrnl/cli.py +++ b/jrnl/cli.py @@ -242,6 +242,7 @@ def guess_mode(args, config): def encrypt(journal, filename=None): """ Encrypt into new file. If filename is not set, we encrypt the journal file itself. """ from .EncryptedJournal import EncryptedJournal + journal.config["encrypt"] = True new_journal = EncryptedJournal.from_journal(journal) diff --git a/jrnl/install.py b/jrnl/install.py index 2f033f85..b1b9f059 100644 --- a/jrnl/install.py +++ b/jrnl/install.py @@ -98,6 +98,7 @@ def load_or_install_jrnl(): if util.is_old_version(config_path): from . import upgrade + try: upgrade.upgrade_jrnl_if_necessary(config_path) except upgrade.UpgradeValidationException: diff --git a/jrnl/time.py b/jrnl/time.py index 4c94bdc2..25fba0d7 100644 --- a/jrnl/time.py +++ b/jrnl/time.py @@ -1,11 +1,11 @@ from datetime import datetime - FAKE_YEAR = 9999 DEFAULT_FUTURE = datetime(FAKE_YEAR, 12, 31, 23, 59, 59) DEFAULT_PAST = datetime(FAKE_YEAR, 1, 1, 0, 0) + def __get_pdt_calendar(): try: import parsedatetime.parsedatetime_consts as pdt