Commit 4b8563fe authored by Thomas's avatar Thomas
Browse files

working

parent 4eb4c6ee

app/src/main/java/app/fedilab/android/mastodon/helper/TranslateHelper.java

+5 −1
Original line number Diff line number Diff line
@@ -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"));

app/src/main/java/app/fedilab/android/mastodon/ui/fragment/settings/FragmentTimelinesSettings.java

+7 −1
Original line number Diff line number Diff line
@@ -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);

app/src/main/res/layouts/mastodon/values/strings.xml

0 → 100644
+4 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<resources>

    <string name="translator_domain">Translator domain</string>

</resources>
 
 No newline at end of file

app/src/main/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -796,6 +796,7 @@ 


    <string-array name="set_translator_values" translatable="false">

        <item>Fedilab</item>

        <item>Lingva</item>

        <item>DeepL</item>

    </string-array>

    <string-array name="set_translator_version_values">
@@ -805,6 +806,7 @@ 


    <string-array name="SET_TRANSLATOR_VALUES" translatable="false">

        <item>FEDILAB</item>

        <item>LINGVA</item>

        <item>DEEPL</item>

    </string-array>
@@ -1097,6 +1099,8 @@ 
    <string name="SET_POST_FORMAT" translatable="false">SET_POST_FORMAT</string>

    <string name="SET_COMPOSE_LOCAL_ONLY" translatable="false">SET_COMPOSE_LOCAL_ONLY</string>



    <string name="SET_TRANSLATOR_HOST_LINGVA" translatable="false">lingva.ml</string>

    <string name="SET_TRANSLATOR_DOMAIN" translatable="false">SET_TRANSLATOR_DOMAIN</string>

    <string name="SET_TRANSLATOR" translatable="false">SET_TRANSLATOR</string>

    <string name="SET_TRANSLATOR_VERSION" translatable="false">SET_TRANSLATOR_VERSION</string>

app/src/main/res/xml/pref_timelines.xml

+7 −0
Original line number Diff line number Diff line
@@ -93,6 +93,13 @@ 
        app:key="@string/SET_TRANSLATOR_API_KEY"

        app:title="@string/api_key"

        app:useSimpleSummaryProvider="true" />

    <EditTextPreference

        app:defaultValue="lingva.ml"

        app:dependency="@string/SET_TRANSLATOR"

        app:iconSpaceReserved="false"

        app:key="@string/SET_TRANSLATOR_DOMAIN"

        app:title="@string/translator_domain"

        app:useSimpleSummaryProvider="true" />

    <ListPreference

        app:defaultValue="PRO"

        app:dialogTitle="@string/version"