Compare commits
2 commits
master
...
upstream/f
Author | SHA1 | Date | |
---|---|---|---|
![]() |
fdff407514 | ||
![]() |
422c3c3809 |
1 changed files with 5 additions and 2 deletions
|
@ -16,6 +16,7 @@ import android.widget.TextView;
|
||||||
|
|
||||||
import org.joinmastodon.android.GlobalUserPreferences;
|
import org.joinmastodon.android.GlobalUserPreferences;
|
||||||
import org.joinmastodon.android.R;
|
import org.joinmastodon.android.R;
|
||||||
|
import org.joinmastodon.android.api.session.AccountSessionManager;
|
||||||
import org.joinmastodon.android.fragments.BaseStatusListFragment;
|
import org.joinmastodon.android.fragments.BaseStatusListFragment;
|
||||||
import org.joinmastodon.android.model.Status;
|
import org.joinmastodon.android.model.Status;
|
||||||
import org.joinmastodon.android.model.Translation;
|
import org.joinmastodon.android.model.Translation;
|
||||||
|
@ -206,8 +207,10 @@ public class TextStatusDisplayItem extends StatusDisplayItem{
|
||||||
translationFooter.setVisibility(translateEnabled ? View.VISIBLE : View.GONE);
|
translationFooter.setVisibility(translateEnabled ? View.VISIBLE : View.GONE);
|
||||||
translationProgress.setVisibility(View.GONE);
|
translationProgress.setVisibility(View.GONE);
|
||||||
Translation existingTrans=item.status.getContentStatus().translation;
|
Translation existingTrans=item.status.getContentStatus().translation;
|
||||||
String lang=existingTrans!=null ? existingTrans.detectedSourceLanguage : null;
|
String existingTransLang=existingTrans!=null ? existingTrans.detectedSourceLanguage : null;
|
||||||
String displayLang=Locale.forLanguageTag(lang!=null ? lang : item.status.getContentStatus().language).getDisplayLanguage();
|
String lang=existingTransLang!=null ? existingTransLang : item.status.getContentStatus().language;
|
||||||
|
String displayLang=Locale.forLanguageTag(lang != null ? lang
|
||||||
|
: AccountSessionManager.get(item.parentFragment.getAccountID()).preferences.postingDefaultLanguage).getDisplayLanguage();
|
||||||
translationButton.setText(item.parentFragment.getString(R.string.translate_post, !displayLang.isBlank() ? displayLang : lang));
|
translationButton.setText(item.parentFragment.getString(R.string.translate_post, !displayLang.isBlank() ? displayLang : lang));
|
||||||
translationButton.setEnabled(true);
|
translationButton.setEnabled(true);
|
||||||
translationButton.setAlpha(1);
|
translationButton.setAlpha(1);
|
||||||
|
|
Loading…
Add table
Reference in a new issue