=
commited on
Commit
·
1809958
1
Parent(s):
8593ca0
added lang check to mymemory
Browse files- deep_translator/google_trans.py +5 -5
- deep_translator/linguee.py +5 -5
- deep_translator/mymemory.py +25 -3
- deep_translator/pons.py +5 -6
deep_translator/google_trans.py
CHANGED
|
@@ -43,17 +43,17 @@ class GoogleTranslator(BaseTranslator):
|
|
| 43 |
@return: mapped value of the language or raise an exception if the language is not supported
|
| 44 |
"""
|
| 45 |
for language in languages:
|
| 46 |
-
if language in
|
| 47 |
yield language
|
| 48 |
-
elif language in
|
| 49 |
-
yield
|
| 50 |
else:
|
| 51 |
raise LanguageNotSupportedException(language)
|
| 52 |
|
| 53 |
def is_language_supported(self, *languages):
|
| 54 |
for lang in languages:
|
| 55 |
-
if lang != 'auto' and lang not in
|
| 56 |
-
if lang != 'auto' and lang not in
|
| 57 |
raise LanguageNotSupportedException(lang)
|
| 58 |
return True
|
| 59 |
|
|
|
|
| 43 |
@return: mapped value of the language or raise an exception if the language is not supported
|
| 44 |
"""
|
| 45 |
for language in languages:
|
| 46 |
+
if language in self._languages.values() or language == 'auto':
|
| 47 |
yield language
|
| 48 |
+
elif language in self._languages.keys():
|
| 49 |
+
yield self._languages[language]
|
| 50 |
else:
|
| 51 |
raise LanguageNotSupportedException(language)
|
| 52 |
|
| 53 |
def is_language_supported(self, *languages):
|
| 54 |
for lang in languages:
|
| 55 |
+
if lang != 'auto' and lang not in self._languages.keys():
|
| 56 |
+
if lang != 'auto' and lang not in self._languages.values():
|
| 57 |
raise LanguageNotSupportedException(lang)
|
| 58 |
return True
|
| 59 |
|
deep_translator/linguee.py
CHANGED
|
@@ -38,17 +38,17 @@ class LingueeTranslator(BaseTranslator):
|
|
| 38 |
@return: mapped value of the language or raise an exception if the language is not supported
|
| 39 |
"""
|
| 40 |
for language in languages:
|
| 41 |
-
if language in
|
| 42 |
-
yield
|
| 43 |
-
elif language in
|
| 44 |
yield language
|
| 45 |
else:
|
| 46 |
raise LanguageNotSupportedException(language)
|
| 47 |
|
| 48 |
def is_language_supported(self, *languages, **kwargs):
|
| 49 |
for lang in languages:
|
| 50 |
-
if lang not in
|
| 51 |
-
if lang not in
|
| 52 |
raise LanguageNotSupportedException(lang)
|
| 53 |
return True
|
| 54 |
|
|
|
|
| 38 |
@return: mapped value of the language or raise an exception if the language is not supported
|
| 39 |
"""
|
| 40 |
for language in languages:
|
| 41 |
+
if language in self._languages.values():
|
| 42 |
+
yield self._languages[language]
|
| 43 |
+
elif language in self._languages.keys():
|
| 44 |
yield language
|
| 45 |
else:
|
| 46 |
raise LanguageNotSupportedException(language)
|
| 47 |
|
| 48 |
def is_language_supported(self, *languages, **kwargs):
|
| 49 |
for lang in languages:
|
| 50 |
+
if lang not in self._languages.keys():
|
| 51 |
+
if lang not in self._languages.values():
|
| 52 |
raise LanguageNotSupportedException(lang)
|
| 53 |
return True
|
| 54 |
|
deep_translator/mymemory.py
CHANGED
|
@@ -1,6 +1,6 @@
|
|
| 1 |
|
| 2 |
from deep_translator.constants import BASE_URLS, GOOGLE_LANGUAGES_TO_CODES
|
| 3 |
-
from deep_translator.exceptions import NotValidPayload, TranslationNotFound
|
| 4 |
from deep_translator.parent import BaseTranslator
|
| 5 |
import requests
|
| 6 |
|
|
@@ -32,10 +32,32 @@ class MyMemoryTranslator(BaseTranslator):
|
|
| 32 |
def get_supported_languages(as_dict=False):
|
| 33 |
return MyMemoryTranslator.supported_languages if not as_dict else MyMemoryTranslator._languages
|
| 34 |
|
| 35 |
-
def
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 36 |
"""
|
| 37 |
main function that uses google translate to translate a text
|
| 38 |
@param text: desired text to translate
|
|
|
|
| 39 |
@return: str: translated text
|
| 40 |
"""
|
| 41 |
|
|
@@ -62,7 +84,7 @@ class MyMemoryTranslator(BaseTranslator):
|
|
| 62 |
all_matches = data.get('matches')
|
| 63 |
matches = (match['translation'] for match in all_matches)
|
| 64 |
next_match = next(matches)
|
| 65 |
-
return next_match if not
|
| 66 |
|
| 67 |
def translate_sentences(self, sentences=None, **kwargs):
|
| 68 |
"""
|
|
|
|
| 1 |
|
| 2 |
from deep_translator.constants import BASE_URLS, GOOGLE_LANGUAGES_TO_CODES
|
| 3 |
+
from deep_translator.exceptions import NotValidPayload, TranslationNotFound, LanguageNotSupportedException
|
| 4 |
from deep_translator.parent import BaseTranslator
|
| 5 |
import requests
|
| 6 |
|
|
|
|
| 32 |
def get_supported_languages(as_dict=False):
|
| 33 |
return MyMemoryTranslator.supported_languages if not as_dict else MyMemoryTranslator._languages
|
| 34 |
|
| 35 |
+
def _map_language_to_code(self, *languages):
|
| 36 |
+
"""
|
| 37 |
+
|
| 38 |
+
@param language: type of language
|
| 39 |
+
@return: mapped value of the language or raise an exception if the language is not supported
|
| 40 |
+
"""
|
| 41 |
+
for language in languages:
|
| 42 |
+
if language in self._languages.values() or language == 'auto':
|
| 43 |
+
yield language
|
| 44 |
+
elif language in self._languages.keys():
|
| 45 |
+
yield self._languages[language]
|
| 46 |
+
else:
|
| 47 |
+
raise LanguageNotSupportedException(language)
|
| 48 |
+
|
| 49 |
+
def is_language_supported(self, *languages):
|
| 50 |
+
for lang in languages:
|
| 51 |
+
if lang != 'auto' and lang not in self._languages.keys():
|
| 52 |
+
if lang != 'auto' and lang not in self._languages.values():
|
| 53 |
+
raise LanguageNotSupportedException(lang)
|
| 54 |
+
return True
|
| 55 |
+
|
| 56 |
+
def translate(self, text, return_all=False, **kwargs):
|
| 57 |
"""
|
| 58 |
main function that uses google translate to translate a text
|
| 59 |
@param text: desired text to translate
|
| 60 |
+
@param return_all: set True to return all synonyms
|
| 61 |
@return: str: translated text
|
| 62 |
"""
|
| 63 |
|
|
|
|
| 84 |
all_matches = data.get('matches')
|
| 85 |
matches = (match['translation'] for match in all_matches)
|
| 86 |
next_match = next(matches)
|
| 87 |
+
return next_match if not return_all else list(all_matches)
|
| 88 |
|
| 89 |
def translate_sentences(self, sentences=None, **kwargs):
|
| 90 |
"""
|
deep_translator/pons.py
CHANGED
|
@@ -38,22 +38,21 @@ class PonsTranslator(BaseTranslator):
|
|
| 38 |
|
| 39 |
def _map_language_to_code(self, *languages, **kwargs):
|
| 40 |
"""
|
| 41 |
-
|
| 42 |
@param language: type of language
|
| 43 |
@return: mapped value of the language or raise an exception if the language is not supported
|
| 44 |
"""
|
| 45 |
for language in languages:
|
| 46 |
-
if language in
|
| 47 |
-
yield
|
| 48 |
-
elif language in
|
| 49 |
yield language
|
| 50 |
else:
|
| 51 |
raise LanguageNotSupportedException(language)
|
| 52 |
|
| 53 |
def is_language_supported(self, *languages, **kwargs):
|
| 54 |
for lang in languages:
|
| 55 |
-
if lang not in
|
| 56 |
-
if lang not in
|
| 57 |
raise LanguageNotSupportedException(lang)
|
| 58 |
return True
|
| 59 |
|
|
|
|
| 38 |
|
| 39 |
def _map_language_to_code(self, *languages, **kwargs):
|
| 40 |
"""
|
|
|
|
| 41 |
@param language: type of language
|
| 42 |
@return: mapped value of the language or raise an exception if the language is not supported
|
| 43 |
"""
|
| 44 |
for language in languages:
|
| 45 |
+
if language in self._languages.values():
|
| 46 |
+
yield self._languages[language]
|
| 47 |
+
elif language in self._languages.keys():
|
| 48 |
yield language
|
| 49 |
else:
|
| 50 |
raise LanguageNotSupportedException(language)
|
| 51 |
|
| 52 |
def is_language_supported(self, *languages, **kwargs):
|
| 53 |
for lang in languages:
|
| 54 |
+
if lang not in self._languages.keys():
|
| 55 |
+
if lang not in self._languages.values():
|
| 56 |
raise LanguageNotSupportedException(lang)
|
| 57 |
return True
|
| 58 |
|