mirror of
https://github.com/LibreTranslate/LibreTranslate.git
synced 2024-12-18 08:27:03 +02:00
Merge pull request #229 from K-Francis-H/translate-auto-show-langs
include language detected, confidence for /translate calls with auto detect
This commit is contained in:
commit
6b2ef99f78
49
app/app.py
49
app/app.py
@ -446,18 +446,18 @@ def create_app(args):
|
|||||||
else:
|
else:
|
||||||
# Unable to accurately detect languages for short texts
|
# Unable to accurately detect languages for short texts
|
||||||
candidate_langs = overall_candidates
|
candidate_langs = overall_candidates
|
||||||
source_langs.append(candidate_langs[0]["language"])
|
source_langs.append(candidate_langs[0])
|
||||||
|
|
||||||
if args.debug:
|
if args.debug:
|
||||||
print(text_to_check, candidate_langs)
|
print(text_to_check, candidate_langs)
|
||||||
print("Auto detected: %s" % candidate_langs[0]["language"])
|
print("Auto detected: %s" % candidate_langs[0]["language"])
|
||||||
else:
|
else:
|
||||||
if batch:
|
if batch:
|
||||||
source_langs = [source_lang for text in q]
|
source_langs = [ {"confidence": 100.0, "language": source_lang} for text in q]
|
||||||
else:
|
else:
|
||||||
source_langs = [source_lang]
|
source_langs = [ {"confidence": 100.0, "language": source_lang} ]
|
||||||
|
|
||||||
src_langs = [next(iter([l for l in languages if l.code == source_lang]), None) for source_lang in source_langs]
|
src_langs = [next(iter([l for l in languages if l.code == source_lang["language"]]), None) for source_lang in source_langs]
|
||||||
|
|
||||||
for idx, lang in enumerate(src_langs):
|
for idx, lang in enumerate(src_langs):
|
||||||
if lang is None:
|
if lang is None:
|
||||||
@ -483,26 +483,43 @@ def create_app(args):
|
|||||||
if text_format == "html":
|
if text_format == "html":
|
||||||
translated_text = str(translate_html(translator, text))
|
translated_text = str(translate_html(translator, text))
|
||||||
else:
|
else:
|
||||||
translated_text = translator.translate(transliterate(text, target_lang=source_langs[idx]))
|
translated_text = translator.translate(transliterate(text, target_lang=source_langs[idx]["language"]))
|
||||||
|
|
||||||
results.append(unescape(translated_text))
|
results.append(unescape(translated_text))
|
||||||
return jsonify(
|
if source_lang == "auto":
|
||||||
{
|
return jsonify(
|
||||||
"translatedText": results
|
{
|
||||||
}
|
"translatedText": results,
|
||||||
)
|
"detectedLanguage": source_langs
|
||||||
|
}
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
return jsonify(
|
||||||
|
{
|
||||||
|
"translatedText": results
|
||||||
|
}
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
translator = src_langs[0].get_translation(tgt_lang)
|
translator = src_langs[0].get_translation(tgt_lang)
|
||||||
|
|
||||||
if text_format == "html":
|
if text_format == "html":
|
||||||
translated_text = str(translate_html(translator, q))
|
translated_text = str(translate_html(translator, q))
|
||||||
else:
|
else:
|
||||||
translated_text = translator.translate(transliterate(q, target_lang=source_langs[0]))
|
translated_text = translator.translate(transliterate(q, target_lang=source_langs[0]["language"]))
|
||||||
return jsonify(
|
|
||||||
{
|
if source_lang == "auto":
|
||||||
"translatedText": unescape(translated_text)
|
return jsonify(
|
||||||
}
|
{
|
||||||
)
|
"translatedText": unescape(translated_text),
|
||||||
|
"detectedLanguage": source_langs[0]
|
||||||
|
}
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
return jsonify(
|
||||||
|
{
|
||||||
|
"translatedText": unescape(translated_text)
|
||||||
|
}
|
||||||
|
)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
abort(500, description="Cannot translate text: %s" % str(e))
|
abort(500, description="Cannot translate text: %s" % str(e))
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user