mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Show recognized language

This commit is contained in:
M66B 2020-06-27 15:11:13 +02:00
parent 1689f0c84c
commit 1cb0b80e1a
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -3581,9 +3581,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
Locale.getDefault().getLanguage(), Locale.getDefault().getLanguage(),
new FragmentDialogTranslate.ITranslate() { new FragmentDialogTranslate.ITranslate() {
@Override @Override
public void onTranslated(String text) { public void onTranslated(String language, String text) {
new AlertDialog.Builder(context) new AlertDialog.Builder(context)
.setTitle(R.string.title_translate) .setTitle(new Locale(language).getDisplayLanguage())
.setMessage(text) .setMessage(text)
.show(); .show();
} }

2
app/src/stub/java/eu/faircode/email/FragmentDialogTranslate.java
View File

@ -21,7 +21,7 @@ public class FragmentDialogTranslate extends FragmentDialogBase {
} }
interface ITranslate { interface ITranslate {
void onTranslated(String text); void onTranslated(String language, String text);
void onError(Throwable ex); void onError(Throwable ex);
} }

15
app/src/xlat/java/eu/faircode/email/FragmentDialogTranslate.java
View File

@ -46,7 +46,7 @@ public class FragmentDialogTranslate extends FragmentDialogBase {
Translate(text, targetLanguage, new ITranslate() { Translate(text, targetLanguage, new ITranslate() {
@Override @Override
public void onTranslated(String text) { public void onTranslated(String language, String text) {
getArguments().putString("translated", text); getArguments().putString("translated", text);
sendResult(RESULT_OK); sendResult(RESULT_OK);
} }
@ -74,13 +74,12 @@ public class FragmentDialogTranslate extends FragmentDialogBase {
.addOnSuccessListener( .addOnSuccessListener(
new OnSuccessListener<String>() { new OnSuccessListener<String>() {
@Override @Override
public void onSuccess(@Nullable String sourceLanguage) { public void onSuccess(@Nullable String language) {
Log.i("Translate source=" + sourceLanguage); Log.i("Translate source=" + language);
if (sourceLanguage.equals("und")) final String sourceLanguage = (language.equals("und") ? TranslateLanguage.ENGLISH : language);
sourceLanguage = TranslateLanguage.ENGLISH;
if (sourceLanguage.equals(targetLanguage)) { if (sourceLanguage.equals(targetLanguage)) {
intf.onTranslated(text); intf.onTranslated(sourceLanguage, text);
return; return;
} }
@ -102,7 +101,7 @@ public class FragmentDialogTranslate extends FragmentDialogBase {
new OnSuccessListener<String>() { new OnSuccessListener<String>() {
@Override @Override
public void onSuccess(@NonNull String translatedText) { public void onSuccess(@NonNull String translatedText) {
intf.onTranslated(translatedText); intf.onTranslated(sourceLanguage, translatedText);
} }
}) })
.addOnFailureListener( .addOnFailureListener(
@ -133,7 +132,7 @@ public class FragmentDialogTranslate extends FragmentDialogBase {
} }
interface ITranslate { interface ITranslate {
void onTranslated(String text); void onTranslated(String language, String text);
void onError(Throwable ex); void onError(Throwable ex);
} }