Extract locale name util

tuskyapp · Mar 3, 2024 · abbd30a · abbd30a
1 parent 0e13cef
commit abbd30a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
@@ -57,6 +57,7 @@
 import com.keylesspalace.tusky.util.CustomEmojiHelper;
 import com.keylesspalace.tusky.util.ImageLoadingHelper;
 import com.keylesspalace.tusky.util.LinkHelper;
+import com.keylesspalace.tusky.util.LocaleUtilsKt;
 import com.keylesspalace.tusky.util.NumberUtils;
 import com.keylesspalace.tusky.util.StatusDisplayOptions;
 import com.keylesspalace.tusky.util.TimestampUtils;
@@ -845,9 +846,8 @@ private void setTranslationStatus(StatusViewData.Concrete status, StatusActionLi
             if (translationViewData instanceof TranslationViewData.Loaded) {
                 Translation translation = ((TranslationViewData.Loaded) translationViewData).getData();
                 translationStatusView.setVisibility(View.VISIBLE);
-                // FIXME error handling
-                var locale = new Locale(translation.getDetectedSourceLanguage());
-                translationStatusView.setText(translationStatusView.getContext().getString(R.string.label_translated, locale.getDisplayName(), translation.getProvider()));
+                var langName = LocaleUtilsKt.localeNameForUntrustedISO639LangCode(translation.getDetectedSourceLanguage());
+                translationStatusView.setText(translationStatusView.getContext().getString(R.string.label_translated, langName, translation.getProvider()));
                 untranslateButton.setVisibility(View.VISIBLE);
                 untranslateButton.setOnClickListener((v) -> listener.onUntranslate(getBindingAdapterPosition()));
             } else {
@@ -943,14 +943,14 @@ private String getTranslatedDescription(Context context, TranslationViewData tra
             return context.getString(R.string.label_translating);
         } else {
             Translation translation = ((TranslationViewData.Loaded) translationViewData).getData();
-            // FIXME error handling
-            var locale = new Locale(translation.getDetectedSourceLanguage());
-            return context.getString(R.string.label_translated, locale.getDisplayName(), translation.getProvider());
+            var langName = LocaleUtilsKt.localeNameForUntrustedISO639LangCode(translation.getDetectedSourceLanguage());
+            return context.getString(R.string.label_translated, langName, translation.getProvider());
         }
     }
 
     private static CharSequence getReblogDescription(Context context,
                                                      @NonNull StatusViewData.Concrete status) {
+        @Nullable
         Status reblog = status.getRebloggingStatus();
         if (reblog != null) {
             return context

diff --git a/app/src/main/java/com/keylesspalace/tusky/util/LocaleUtils.kt b/app/src/main/java/com/keylesspalace/tusky/util/LocaleUtils.kt
@@ -80,3 +80,8 @@ fun getLocaleList(initialLanguages: List<String>): List<Locale> {
     ensureLanguagesAreFirst(locales, initialLanguages)
     return locales
 }
+
+fun localeNameForUntrustedISO639LangCode(code: String): String {
+    // It seems like it never throws?
+    return Locale(code).displayName
+}