From e6bf6a6b8a635a09b56ce7aca18d5fa7cd2144de Mon Sep 17 00:00:00 2001 From: Terry Yiu <963907+tyiu@users.noreply.github.com> Date: Tue, 2 May 2023 14:25:09 -0400 Subject: [PATCH] Fix auto-translations bug where languages in preferred language still gets translated Changelog-Fixed: Fix auto-translations bug where languages in preferred language still gets translated --- damus/Util/EventCache.swift | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/damus/Util/EventCache.swift b/damus/Util/EventCache.swift index 3766c7c0..19b6ec1f 100644 --- a/damus/Util/EventCache.swift +++ b/damus/Util/EventCache.swift @@ -319,8 +319,11 @@ func get_preload_plan(cache: EventData, ev: NostrEvent, our_keypair: Keypair, se if load_artifacts { cache.artifacts_model.state = .loading } - - let load_translations = should_preload_translation(event: ev, our_keypair: our_keypair, current_status: cache.translations, settings: settings, note_lang: cache.translations_model.note_language) + + // Cached event might not have the note language determined yet, so determine the language here before figuring out if translations should be preloaded. + let note_lang = cache.translations_model.note_language ?? ev.note_language(our_keypair.privkey) ?? current_language() + + let load_translations = should_preload_translation(event: ev, our_keypair: our_keypair, current_status: cache.translations, settings: settings, note_lang: note_lang) if load_translations { cache.translations_model.state = .translating }