Fix issues with translations menu button

- it is not inflated for user's own posts but we didn't check for that - some servers return language codes in uppercase and it wasn't matching Java's lowercase code when it should have
tuskyapp · Mar 9, 2024 · a9e54b9 · a9e54b9
1 parent ef86899
commit a9e54b9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/...c/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt b/...c/main/java/com/keylesspalace/tusky/components/search/fragments/SearchStatusesFragment.kt
@@ -328,10 +328,13 @@ class SearchStatusesFragment : SearchFragment<StatusViewData.Concrete>(), Status
             )
         }
 
-        val translateItem = popup.menu.findItem(R.id.status_translate)
-        translateItem.isVisible =
-            status.language != Locale.getDefault().language && viewModel.supportsTranslation()
-        translateItem.setTitle(if (statusViewData.translation != null) R.string.action_show_original else R.string.action_translate)
+        // translation not there for your own posts
+        popup.menu.findItem(R.id.status_translate)?.let { translateItem ->
+            translateItem.isVisible =
+                !status.language.equals(Locale.getDefault().language, ignoreCase = true)
+                    && viewModel.supportsTranslation()
+            translateItem.setTitle(if (statusViewData.translation != null) R.string.action_show_original else R.string.action_translate)
+        }
 
         popup.setOnMenuItemClickListener { item ->
             when (item.itemId) {

diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.kt
@@ -223,10 +223,13 @@ abstract class SFragment : Fragment(), Injectable {
             )
         }
 
-        val translateItem = menu.findItem(R.id.status_translate)
-        translateItem.isVisible =
-            onMoreTranslate != null && status.language != Locale.getDefault().language && instanceInfoRepository.cachedInstanceInfoOrFallback.translationEnabled == true
-        translateItem.setTitle(if (translation != null) R.string.action_show_original else R.string.action_translate)
+        // translation not there for your own posts
+        menu.findItem(R.id.status_translate)?.let { translateItem ->
+            translateItem.isVisible = onMoreTranslate != null
+                && !status.language.equals(Locale.getDefault().language, ignoreCase = true)
+                && instanceInfoRepository.cachedInstanceInfoOrFallback.translationEnabled == true
+            translateItem.setTitle(if (translation != null) R.string.action_show_original else R.string.action_translate)
+        }
 
         popup.setOnMenuItemClickListener { item: MenuItem ->
             when (item.itemId) {
@@ -271,8 +274,8 @@ abstract class SFragment : Fragment(), Injectable {
                             Context.CLIPBOARD_SERVICE
                         ) as ClipboardManager
                         ).apply {
-                        setPrimaryClip(ClipData.newPlainText(null, statusUrl))
-                    }
+                            setPrimaryClip(ClipData.newPlainText(null, statusUrl))
+                        }
                     return@setOnMenuItemClickListener true
                 }