Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-29 05:15:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improved DeepL HTML support

Browse Source
This commit is contained in:
M66B
2022-04-07 12:57:18 +02:00
parent 1dfac120dd
commit ebdecba9db
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/eu/faircode/email/DeepL.java
View File

@@ -49,6 +49,8 @@ import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -216,10 +218,17 @@ public class DeepL {
for (RelativeSizeSpan span : ssb.getSpans(0, ssb.length(), RelativeSizeSpan.class))
if (span.getSizeChange() == HtmlHelper.FONT_SMALL)
ssb.removeSpan(span);
input = HtmlHelper.toHtml(ssb, context);
String h = HtmlHelper.toHtml(ssb, context);
Elements content = JsoupEx.parse(h).body().children();
Element last = (content.size() == 0 ? null : content.get(content.size() - 1));
if (last != null && "br".equals(last.tagName()))
content.remove(last);
input = content.outerHtml();
} else
input = text.toString();
Log.i("DeepL input=" + input.replaceAll("\\r?\\n", "|"));
// https://www.deepl.com/docs-api/translating-text/request/
String request =
"text=" + URLEncoder.encode(input, StandardCharsets.UTF_8.name()) +
@@ -282,12 +291,16 @@ public class DeepL {
String output = jtranslation.getString("text");
Log.i("DeepL output=" + output.replaceAll("\\r?\\n", "|"));
if (html) {
Document document = HtmlHelper.sanitizeCompose(context, output, false);
Document document = JsoupEx.parse(output);
result.translated_text = HtmlHelper.fromDocument(context, document, null, null);
} else
result.translated_text = output;
Log.i("DeepL result=" + result.translated_text.toString().replaceAll("\\r?\\n", "|"));
return result;
} finally {
connection.disconnect();