From a3d8a9ba709262c3a2627ebf8f586a1ec01f812a Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Sun, 31 Jul 2022 02:44:11 +0300 Subject: [PATCH] =?UTF-8?q?fixed=20gtranslate=20+=20added=20reply=E2=80=99?= =?UTF-8?q?s=20translate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/ru/vtosters/lite/dnr/DNRInjector.java | 16 ++++++++++++++-- .../lite/translators/GoogleTranslator.java | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java b/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java index 173615d5a..559e0f6f5 100644 --- a/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java +++ b/app/src/main/java/ru/vtosters/lite/dnr/DNRInjector.java @@ -101,10 +101,22 @@ public class DNRInjector { public static boolean onClickMsg(Context context, MsgAction action, Msg msg) { var text = ((MsgFromUser) msg).f(); + var fullMsg = ((MsgFromUser) msg).j2(); // text + reply + var reply = fullMsg.substring(text.length() + 1); + + var isTextExist = !text.isEmpty() && !text.equals(" "); + var isReplyExist = !reply.isEmpty() && !reply.equals(" "); if (action == MsgAction.valueOf("TRANSLATE")) { - if (text.isEmpty() || text.equals(" ")) sendToast("Невозможно перевести этот текст"); - else Translate.showTranslatedText(context, text); + if (isTextExist && isReplyExist) { + Translate.showTranslatedText(context, text + "\n\nРеплай:\n" + reply); + } else if (isReplyExist) { + Translate.showTranslatedText(context, "Реплай:\n" + reply); + } else if (isTextExist) { + Translate.showTranslatedText(context, text); + } else { + sendToast("Нет текста для перевода"); + } } return false; diff --git a/app/src/main/java/ru/vtosters/lite/translators/GoogleTranslator.java b/app/src/main/java/ru/vtosters/lite/translators/GoogleTranslator.java index 01f84b8e9..9c1f6f46a 100644 --- a/app/src/main/java/ru/vtosters/lite/translators/GoogleTranslator.java +++ b/app/src/main/java/ru/vtosters/lite/translators/GoogleTranslator.java @@ -52,7 +52,7 @@ public class GoogleTranslator extends BaseTranslator { .b("https://translate.googleapis.com/translate_a/single?dj=1" + "&q=" + URLEncoder.encode(text, "UTF-8") + "&sl=auto" + - "&tl=" + Locale.getDefault().getLanguage() + + "&tl=" + getToLanguage() + "&ie=UTF-8&oe=UTF-8&client=at&dt=t&otf=2") .a("User-Agent", "GoogleTranslate/6.28.0.05.421483610 (" + devices[(int) Math.round(Math.random() * (devices.length - 1))] + ")")