From a16287255bff7b46101d32820771b0c3f5b9bdb3 Mon Sep 17 00:00:00 2001 From: GitGitro <108683123+GitGitro@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:50:40 +0200 Subject: [PATCH 1/4] fix: mozhi engine error 500 when source or target lang has more than 2 chars --- .idea/compiler.xml | 2 +- .idea/migrations.xml | 10 ++++++++++ .idea/misc.xml | 2 +- .../java/com/bnyro/translate/api/mh/MhEngine.kt | 14 ++++++++++++-- 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 .idea/migrations.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index b86273d94..b589d56e9 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml new file mode 100644 index 000000000..f8051a6f9 --- /dev/null +++ b/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 7a0da4f82..3b2b56919 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,7 +22,7 @@ - + diff --git a/app/src/main/java/com/bnyro/translate/api/mh/MhEngine.kt b/app/src/main/java/com/bnyro/translate/api/mh/MhEngine.kt index 0283084c1..6499f210e 100644 --- a/app/src/main/java/com/bnyro/translate/api/mh/MhEngine.kt +++ b/app/src/main/java/com/bnyro/translate/api/mh/MhEngine.kt @@ -17,8 +17,10 @@ package com.bnyro.translate.api.mh +import android.util.Log import com.bnyro.translate.const.ApiKeyState import com.bnyro.translate.db.obj.Language +import com.bnyro.translate.ext.concatenate import com.bnyro.translate.obj.Translation import com.bnyro.translate.util.RetrofitHelper import com.bnyro.translate.util.TranslationEngine @@ -59,9 +61,17 @@ class MhEngine : TranslationEngine( override suspend fun translate(query: String, source: String, target: String): Translation { val response = api.translate( engine = getSelectedEngine(), - source = sourceOrAuto(source), + source = (if(sourceOrAuto(source).length==3){ + sourceOrAuto(source).dropLast(1) + } else { + sourceOrAuto(source) + }).toString(), query = query, - target = target + target = (if(target.length==3){ + target.dropLast(1) + } else { + target + }).toString() ) return Translation( translatedText = response.translatedText, From 2533bd1d6be35fc6ed02d1843ccc65b8fbe8d9a5 Mon Sep 17 00:00:00 2001 From: GitGitro <108683123+GitGitro@users.noreply.github.com> Date: Tue, 22 Oct 2024 18:56:38 +0200 Subject: [PATCH 2/4] fix: remove files and unused imports --- .idea/compiler.xml | 2 +- .idea/migrations.xml | 10 ---------- .idea/misc.xml | 2 +- .../main/java/com/bnyro/translate/api/mh/MhEngine.kt | 2 -- 4 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 .idea/migrations.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml index b589d56e9..b86273d94 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/migrations.xml b/.idea/migrations.xml deleted file mode 100644 index f8051a6f9..000000000 --- a/.idea/migrations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 3b2b56919..7a0da4f82 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -22,7 +22,7 @@ - + diff --git a/app/src/main/java/com/bnyro/translate/api/mh/MhEngine.kt b/app/src/main/java/com/bnyro/translate/api/mh/MhEngine.kt index 6499f210e..0a2223ad6 100644 --- a/app/src/main/java/com/bnyro/translate/api/mh/MhEngine.kt +++ b/app/src/main/java/com/bnyro/translate/api/mh/MhEngine.kt @@ -17,10 +17,8 @@ package com.bnyro.translate.api.mh -import android.util.Log import com.bnyro.translate.const.ApiKeyState import com.bnyro.translate.db.obj.Language -import com.bnyro.translate.ext.concatenate import com.bnyro.translate.obj.Translation import com.bnyro.translate.util.RetrofitHelper import com.bnyro.translate.util.TranslationEngine From 69578f434cd8232c8bd6719e29e7e03241dfa3cf Mon Sep 17 00:00:00 2001 From: Gitro <108683123+GitGitro@users.noreply.github.com> Date: Tue, 29 Oct 2024 17:34:43 +0100 Subject: [PATCH 3/4] Apply suggestion Co-authored-by: Bnyro --- app/src/main/java/com/bnyro/translate/api/mh/MhEngine.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/main/java/com/bnyro/translate/api/mh/MhEngine.kt b/app/src/main/java/com/bnyro/translate/api/mh/MhEngine.kt index 0a2223ad6..64d9609ae 100644 --- a/app/src/main/java/com/bnyro/translate/api/mh/MhEngine.kt +++ b/app/src/main/java/com/bnyro/translate/api/mh/MhEngine.kt @@ -59,11 +59,7 @@ class MhEngine : TranslationEngine( override suspend fun translate(query: String, source: String, target: String): Translation { val response = api.translate( engine = getSelectedEngine(), - source = (if(sourceOrAuto(source).length==3){ - sourceOrAuto(source).dropLast(1) - } else { - sourceOrAuto(source) - }).toString(), + source = sourceOrAuto(source.substring(0, 2)), query = query, target = (if(target.length==3){ target.dropLast(1) From 8c8f46fe8e60e577bca65f6b4b653d2b9a752a4e Mon Sep 17 00:00:00 2001 From: GitGitro <108683123+GitGitro@users.noreply.github.com.> Date: Tue, 14 Jan 2025 14:56:28 +0100 Subject: [PATCH 4/4] apply suggestion --- app/src/main/java/com/bnyro/translate/api/mh/MhEngine.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/main/java/com/bnyro/translate/api/mh/MhEngine.kt b/app/src/main/java/com/bnyro/translate/api/mh/MhEngine.kt index 64d9609ae..cb57004e9 100644 --- a/app/src/main/java/com/bnyro/translate/api/mh/MhEngine.kt +++ b/app/src/main/java/com/bnyro/translate/api/mh/MhEngine.kt @@ -61,11 +61,7 @@ class MhEngine : TranslationEngine( engine = getSelectedEngine(), source = sourceOrAuto(source.substring(0, 2)), query = query, - target = (if(target.length==3){ - target.dropLast(1) - } else { - target - }).toString() + target = target.substring(0, 2), ) return Translation( translatedText = response.translatedText,