From 978beaec77830174fb8f87d000a44dbd4551977d Mon Sep 17 00:00:00 2001 From: sk Date: Mon, 12 Dec 2022 09:09:45 +0100 Subject: [PATCH] use system default language for translation fix #144 --- .../android/fragments/ComposeFragment.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java index 5b8b1f933..e2c39a0a1 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ComposeFragment.java @@ -657,9 +657,10 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr @SuppressLint("ClickableViewAccessibility") private Button buildLanguageSelector() { - languageButton=new Button(getActivity()); TypedValue typedValue = new TypedValue(); getActivity().getTheme().resolveAttribute(android.R.attr.textColorSecondary, typedValue, true); + + languageButton=new Button(getActivity()); languageButton.setTextColor(typedValue.data); languageButton.setBackground(getActivity().getDrawable(R.drawable.bg_text_button)); languageButton.setPadding(V.dp(8), 0, V.dp(8), 0); @@ -667,17 +668,13 @@ public class ComposeFragment extends MastodonToolbarFragment implements OnBackPr languageButton.setCompoundDrawableTintList(languageButton.getTextColors()); languageButton.setCompoundDrawablePadding(V.dp(6)); - Preferences prefs = AccountSessionManager.getInstance().getAccount(accountID).preferences; - String defaultLang = prefs != null ? prefs.postingDefaultLanguage : null; - if (defaultLang != null) updateLanguage(defaultLang); - else updateLanguage(languageResolver.getDefault()); - languagePopup=new PopupMenu(getActivity(), languageButton); languageButton.setOnTouchListener(languagePopup.getDragToOpenListener()); languageButton.setOnClickListener(v->languagePopup.show()); - Menu languageMenu = languagePopup.getMenu(); + updateLanguage(languageResolver.getDefault()); + Menu languageMenu = languagePopup.getMenu(); for (String recentLanguage : Optional.ofNullable(recentLanguages.get(accountID)).orElse(defaultRecentLanguages)) { MastodonLanguage l = languageResolver.from(recentLanguage); languageMenu.add(0, allLanguages.indexOf(l), Menu.NONE, getActivity().getString(R.string.sk_language_name, l.getDefaultName(), l.getLanguageName()));