damus

commit a97532b90d12edf82436c9ec0c735ce436f2f5f6
parent e8ba1ec8065983d620cb3bd8cb07816e37db22f1
Author: Terry Yiu <git@tyiu.xyz>
Date:   Sun, 19 Jan 2025 12:56:40 -0500

Translate notes even if they are in a preferred language but not the current language as that is what users expect

Changelog-Fixed: Translate notes even if they are in a preferred language but not the current language as that is what users expect

Signed-off-by: Terry Yiu <git@tyiu.xyz>

Diffstat:
M
damus/Util/EventCache.swift
 | 
7
+++----
M
damus/Views/SearchHomeView.swift
 | 
5
++---

2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/damus/Util/EventCache.swift b/damus/Util/EventCache.swift
@@ -259,11 +259,10 @@ func should_translate(event: NostrEvent, our_keypair: Keypair, note_lang: String
     }
 
     if let note_lang {
-        let preferredLanguages = Set(Locale.preferredLanguages.map { localeToLanguage($0) })
+        let currentLanguage = localeToLanguage(Locale.current.identifier)
 
-        // Don't translate if its in our preferred languages
-        guard !preferredLanguages.contains(note_lang) else {
-            // if its the same, give up and don't retry
+        // Don't translate if the note is in our current language
+        guard currentLanguage != note_lang else {
             return false
         }
     }
diff --git a/damus/Views/SearchHomeView.swift b/damus/Views/SearchHomeView.swift
@@ -20,8 +20,6 @@ struct SearchHomeView: View {
         return ContentFilters(filters: filters).filter
     }
 
-    let preferredLanguages = Set(Locale.preferredLanguages.map { localeToLanguage($0) })
-    
     var SearchInput: some View {
         HStack {
             HStack{
@@ -74,7 +72,8 @@ struct SearchHomeView: View {
                     return true
                 }
 
-                return preferredLanguages.contains(note_lang)
+                let currentLanguage = localeToLanguage(Locale.current.identifier)
+                return currentLanguage == note_lang
             },
             content: {
                 AnyView(VStack {