2 files changed, 12 insertions, 2 deletions
diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/TranslateHelper.java b/app/src/main/java/app/fedilab/android/mastodon/helper/TranslateHelper.java
index 1d514ba9b..3e7e0da8c 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/helper/TranslateHelper.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/helper/TranslateHelper.java
@@ -63,7 +63,11 @@ public class TranslateHelper {
         if (translator.compareToIgnoreCase("FEDILAB") == 0) {
             myTransL.setLibretranslateDomain("translate.fedilab.app");
         } else if (translator.compareToIgnoreCase("LINGVA") == 0) {
-            myTransL.setLibretranslateDomain("lingva.ml");
+            String host = sharedpreferences.getString(context.getString(R.string.SET_TRANSLATOR_DOMAIN), context.getString(R.string.SET_TRANSLATOR_HOST_LINGVA));
+            if (host == null || host.trim().isEmpty()) {
+                host = context.getString(R.string.SET_TRANSLATOR_HOST_LINGVA);
+            }
+            myTransL.setLingvaDomain(host);
         } else {
             String translatorVersion = sharedpreferences.getString(context.getString(R.string.SET_TRANSLATOR_VERSION), "PRO");
             params.setPro(translatorVersion.equals("PRO"));
diff --git a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentTimelinesSettings.java b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentTimelinesSettings.java
index e9d5228da..059494ab7 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentTimelinesSettings.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentTimelinesSettings.java
@@ -47,7 +47,8 @@ public class FragmentTimelinesSettings extends PreferenceFragmentCompat implemen
         ListPreference SET_TRANSLATOR_VERSION = findPreference(getString(R.string.SET_TRANSLATOR_VERSION));
 
         EditTextPreference SET_TRANSLATOR_API_KEY = findPreference(getString(R.string.SET_TRANSLATOR_API_KEY));
-        if (SET_TRANSLATOR != null && SET_TRANSLATOR.getValue().equals("FEDILAB")) {
+        EditTextPreference SET_TRANSLATOR_DOMAIN = findPreference(getString(R.string.SET_TRANSLATOR_DOMAIN));
+        if (SET_TRANSLATOR != null && !SET_TRANSLATOR.getValue().equals("DEEPL")) {
             if (SET_TRANSLATOR_API_KEY != null) {
                 preferenceScreen.removePreferenceRecursively("SET_TRANSLATOR_API_KEY");
             }
@@ -55,6 +56,11 @@ public class FragmentTimelinesSettings extends PreferenceFragmentCompat implemen
                 preferenceScreen.removePreferenceRecursively("SET_TRANSLATOR_VERSION");
             }
         }
+        if (SET_TRANSLATOR != null && !SET_TRANSLATOR.getValue().equals("LINGVA")) {
+            if (SET_TRANSLATOR_DOMAIN != null) {
+                preferenceScreen.removePreferenceRecursively("SET_TRANSLATOR_DOMAIN");
+            }
+        }
         SwitchPreferenceCompat SET_DISPLAY_BOOKMARK = findPreference(getString(R.string.SET_DISPLAY_BOOKMARK));
         if (SET_DISPLAY_BOOKMARK != null) {
             boolean checked = sharedpreferences.getBoolean(getString(R.string.SET_DISPLAY_BOOKMARK) + MainActivity.currentUserID + MainActivity.currentInstance, true);