diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index e2fcd03..3c87fc2 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -89,6 +89,12 @@ "deeplAuthKeyCaptionLabel": { "message": "Enter the authentication key for the DeepL API." }, + "sonaveebApiLabel": { + "message": "Sõnaveeb API" + }, + "sonaveebApiCaptionLabel": { + "message": "Use Sõnaveeb API. No registration is required." + }, "targetLangCaptionLabel": { "message": "Select the default target language." }, @@ -446,6 +452,9 @@ "deeplAuthError": { "message": "Error: Authentication of DeepL API failed. Please set the authentication key and plan correctly on the settings page." }, + "sonaveebWordIdNotFound": { + "message": "Sõnaveeb word id not found" + }, "unknownError": { "message": "Error: Unknown error" }, @@ -806,4 +815,4 @@ "lang_zh": { "message": "Chinese" } -} \ No newline at end of file +} diff --git a/src/common/generateLangOptions.js b/src/common/generateLangOptions.js index b758e21..03359d7 100644 --- a/src/common/generateLangOptions.js +++ b/src/common/generateLangOptions.js @@ -3,9 +3,15 @@ const alphabeticallySort = (a, b) => a.name.localeCompare(b.name); const langListGoogle = ["af", "sq", "am", "ar", "hy", "az", "eu", "be", "bn", "bs", "bg", "ca", "ceb", "zh-CN", "zh-TW", "co", "hr", "cs", "da", "nl", "en", "eo", "et", "fi", "fr", "fy", "gl", "ka", "de", "el", "gu", "ht", "ha", "haw", "he", "hi", "hmn", "hu", "is", "ig", "id", "ga", "it", "ja", "jv", "kn", "kk", "km", "rw", "ko", "ku", "ky", "lo", "lv", "lt", "lb", "mk", "mg", "ms", "ml", "mt", "mi", "mr", "mn", "my", "ne", "no", "ny", "or", "ps", "fa", "pl", "pt", "pa", "ro", "ru", "sm", "gd", "sr", "st", "sn", "sd", "si", "sk", "sl", "so", "es", "su", "sw", "sv", "tl", "tg", "ta", "tt", "te", "th", "tr", "tk", "uk", "ur", "ug", "uz", "vi", "cy", "xh", "yi", "yo", "zu"]; const langListDeepl = ["bg", "cs", "da", "de", "el", "en-GB", "en-US", "es", "et", "fi", "fr", "hu", "id", "it", "ja", "ko", "lt", "lv", "nb", "nl", "pl", "pt-PT", "pt-BR", "ro", "ru", "sk", "sl", "sv", "tr", "uk", "zh"]; +const langListSonaveeb = ["et"]; export default (translationApi) => { - const langList = translationApi === "google" ? langListGoogle : langListDeepl; + const langList = translationApi === "google" + ? langListGoogle + : (translationApi === "deepl" + ? langListDeepl + : langListSonaveeb + ); const langOptions = langList.map(lang => ({ value: lang, name: browser.i18n.getMessage("lang_" + lang.replace("-", "_")) diff --git a/src/common/translate.js b/src/common/translate.js index de8ac5b..c2facb0 100644 --- a/src/common/translate.js +++ b/src/common/translate.js @@ -37,6 +37,7 @@ const sendRequestToGoogle = async (word, sourceLang, targetLang) => { const resultData = { resultText: "", + rawHTML: false, candidateText: "", sourceLanguage: "", percentage: 0, @@ -81,6 +82,7 @@ const sendRequestToDeepL = async (word, sourceLang, targetLang) => { const resultData = { resultText: "", + rawHTML: false, candidateText: "", sourceLanguage: "", percentage: 0, @@ -107,6 +109,75 @@ const sendRequestToDeepL = async (word, sourceLang, targetLang) => { return resultData; }; +const sendRequestToSonaveeb = async (word) => { + const resultData = { + resultText: "", + rawHTML: true, + candidateText: "", + sourceLanguage: "", + percentage: 0, + isError: false, + errorMessage: "" + }; + const domParser = new DOMParser(); + + const mainPage = await _sendRequestToSonaveeb(`https://sonaveeb.ee/search/unif/dlall/dsall/${word}/1`, resultData); + if (resultData.isError) { + return resultData; + } + + const mainDocument = domParser.parseFromString(mainPage.data, "text/html"); + const wordIdElement = mainDocument.querySelector('input[name="word-id"]'); + if (!wordIdElement) { + resultData.isError = true; + resultData.errorMessage = `${browser.i18n.getMessage("sonaveebWordIdNotFound")}`; + return resultData; + } + const wordId = wordIdElement.getAttribute("value"); + + const wordDetailsPage = await _sendRequestToSonaveeb(`https://sonaveeb.ee/worddetails/unif/${wordId}`, resultData); + if (resultData.isError) { + return resultData; + } + + resultData.resultText = wordDetailsPage.data; + + const wordDetailsDocument = domParser.parseFromString(wordDetailsPage.data, "text/html"); + const morphoModalElement = wordDetailsDocument.querySelector('#morpho-modal-0'); + if (morphoModalElement) { + const paradigmId = morphoModalElement.getAttribute("data-paradigm-id"); + + const morphoPage = await _sendRequestToSonaveeb(`https://sonaveeb.ee/morpho/unif/${paradigmId}/est`, resultData); + if (!resultData.isError) { + resultData.resultText += morphoPage.data; + } else { + resultData.isError = false; + resultData.errorMessage = ""; + } + } + + resultData.sourceLanguage = "et"; + resultData.percentage = 1; + + log.log(logDir, "sendRequestToSonaveeb()", resultData); + return resultData; +}; + +const _sendRequestToSonaveeb = async (url, resultData) => { + const result = await axios.get(url).catch(error => error.response); + + if (!result || result?.status !== 200) { + resultData.isError = true; + + if (!result || result.status === 0) resultData.errorMessage = browser.i18n.getMessage("networkError"); + else resultData.errorMessage = `${browser.i18n.getMessage("unknownError")} [${result?.status} ${result?.statusText}] ${result?.data.message}`; + + log.error(logDir, "sendRequestToSonaveeb()", result); + } + + return result; +}; + export default async (sourceWord, sourceLang = "auto", targetLang, translationApi) => { log.log(logDir, "tranlate()", sourceWord, targetLang, translationApi); @@ -123,9 +194,12 @@ export default async (sourceWord, sourceLang = "auto", targetLang, translationAp const history = getHistory(sourceWord, sourceLang, targetLang); if (history) return history.result; - const result = getSettings("translationApi") === "google" ? - await sendRequestToGoogle(sourceWord, sourceLang, targetLang) : - await sendRequestToDeepL(sourceWord, sourceLang, targetLang); + const result = translationApi === "google" + ? await sendRequestToGoogle(sourceWord, sourceLang, targetLang) + : (translationApi === "deepl" + ? await sendRequestToDeepL(sourceWord, sourceLang, targetLang) + : await sendRequestToSonaveeb(sourceWord) + ); setHistory(sourceWord, sourceLang, targetLang, translationApi, result); return result; }; diff --git a/src/content/components/TranslatePanel.js b/src/content/components/TranslatePanel.js index 3fd7997..11b6e87 100644 --- a/src/content/components/TranslatePanel.js +++ b/src/content/components/TranslatePanel.js @@ -206,15 +206,17 @@ export default class TranslatePanel extends Component {

{errorMessage}
- - {translationApi === "google" ? - browser.i18n.getMessage("openInGoogleLabel") : - browser.i18n.getMessage("openInDeeplLabel")} - + {(translationApi === "google" || translationApi === "deepl") && ( + + {translationApi === "google" ? + browser.i18n.getMessage("openInGoogleLabel") : + browser.i18n.getMessage("openInDeeplLabel")} + + )}

)} diff --git a/src/popup/components/PopupPage.js b/src/popup/components/PopupPage.js index bf45f5c..4929f7e 100644 --- a/src/popup/components/PopupPage.js +++ b/src/popup/components/PopupPage.js @@ -45,10 +45,12 @@ export default class PopupPage extends Component { targetLang: "", inputText: "", resultText: "", + rawHTML: false, candidateText: "", sourceLang: "", isError: false, errorMessage: "", + translationApi: "google", langList: [], tabUrl: "", isConnected: true, @@ -73,10 +75,12 @@ export default class PopupPage extends Component { langHistory = [targetLang, secondLang]; setSettings("langHistory", langHistory); } + const translationApi = getSettings("translationApi"); this.setState({ targetLang: targetLang, langHistory: langHistory, - langList: generateLangOptions(getSettings("translationApi")) + translationApi: translationApi, + langList: generateLangOptions(translationApi) }); const tabInfo = await getTabInfo(); @@ -123,6 +127,7 @@ export default class PopupPage extends Component { const result = await translate(text, "auto", targetLang); this.setState({ resultText: result.resultText, + rawHTML: result.rawHTML, candidateText: result.candidateText, sourceLang: result.sourceLanguage, isError: result.isError, @@ -172,6 +177,7 @@ export default class PopupPage extends Component { render() { return (
+ {this.state.translationApi === "sonaveeb" && ( )}
{ }; export default props => { - const { resultText, candidateText, isError, errorMessage, targetLang } = props; + const { resultText, rawHTML, candidateText, isError, errorMessage, targetLang } = props; const shouldShowCandidate = getSettings("ifShowCandidate"); const translationApi = getSettings("translationApi"); @@ -28,10 +28,13 @@ export default props => { return (