From e2c6a3673b47e745388f967047d29aa324f0285c Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 17 May 2021 22:12:22 +0200 Subject: [PATCH] DeepL: texts --- app/src/main/java/eu/faircode/email/FragmentCompose.java | 2 +- app/src/main/java/eu/faircode/email/Helper.java | 6 +++++- app/src/main/res/values/strings.xml | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 08fdd1005c..4aa22b33cb 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -6700,7 +6700,7 @@ public class FragmentCompose extends FragmentBase { ibInfo.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Helper.viewFAQ(v.getContext(), 167); + Helper.viewFAQ(v.getContext(), 167, true); } }); diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 48f17db0c6..4231633fbf 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -749,6 +749,10 @@ public class Helper { } static void viewFAQ(Context context, int question) { + viewFAQ(context, question, false); + } + + static void viewFAQ(Context context, int question, boolean english) { // Redirection is done to prevent text editors from opening the link // https://email.faircode.eu/faq -> https://github.com/M66B/FairEmail/blob/master/FAQ.md // https://email.faircode.eu/docs -> https://github.com/M66B/FairEmail/tree/master/docs @@ -756,7 +760,7 @@ public class Helper { // https://github.com/M66B/FairEmail/blob/master/docs/FAQ-de-rDE.md#user-content-faq1 String base; - String locale = getFAQLocale(); + String locale = (english ? null : getFAQLocale()); if (locale == null) base = "https://email.faircode.eu/faq"; else diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2b4c4b7e36..470348f00d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1107,8 +1107,8 @@ Insert contact group Insert template Create template - Translate - Enter key + Translate + Enter key Edit as plain text Edit as reformatted text Select public key