diff --git a/src/config.ts b/src/config.ts index 848f9836..0e4fc816 100644 --- a/src/config.ts +++ b/src/config.ts @@ -275,13 +275,21 @@ class Conf { static get translationProvider(): string | undefined { return Deno.env.get('TRANSLATION_PROVIDER'); } - /** Translation provider URL endpoint. */ - static get translationProviderEndpoint(): string | undefined { - return Deno.env.get('TRANSLATION_PROVIDER_ENDPOINT'); + /** DeepL URL endpoint. */ + static get deepLendpoint(): string | undefined { + return Deno.env.get('DEEPL_ENDPOINT'); } - /** Translation provider API KEY. */ - static get translationProviderApiKey(): string | undefined { - return Deno.env.get('TRANSLATION_PROVIDER_API_KEY'); + /** DeepL API KEY. */ + static get deepLapiKey(): string | undefined { + return Deno.env.get('DEEPL_API_KEY'); + } + /** LibreTranslate URL endpoint. */ + static get libreTranslateEndpoint(): string | undefined { + return Deno.env.get('LIBRETRANSLATE_ENDPOINT'); + } + /** LibreTranslate API KEY. */ + static get libreTranslateApiKey(): string | undefined { + return Deno.env.get('LIBRETRANSLATE_API_KEY'); } /** Cache settings. */ static caches = { diff --git a/src/middleware/translatorMiddleware.ts b/src/middleware/translatorMiddleware.ts index 2d3971dd..b8a07686 100644 --- a/src/middleware/translatorMiddleware.ts +++ b/src/middleware/translatorMiddleware.ts @@ -6,24 +6,30 @@ import { LibreTranslateTranslator } from '@/translators/LibreTranslateTranslator /** Set the translator used for translating posts. */ export const translatorMiddleware: AppMiddleware = async (c, next) => { - const endpoint = Conf.translationProviderEndpoint; - const apiKey = Conf.translationProviderApiKey; + const deepLendpoint = Conf.deepLendpoint; + const deepLapiKey = Conf.deepLapiKey; + const libreTranslateEndpoint = Conf.libreTranslateEndpoint; + const libreTranslateApiKey = Conf.libreTranslateApiKey; const translationProvider = Conf.translationProvider; switch (translationProvider) { case 'deepl': - if (apiKey) { + if (deepLapiKey) { c.set( 'translator', - new DeepLTranslator({ endpoint, apiKey, fetch: fetchWorker }), + new DeepLTranslator({ endpoint: deepLendpoint, apiKey: deepLapiKey, fetch: fetchWorker }), ); } break; case 'libretranslate': - if (apiKey) { + if (libreTranslateApiKey) { c.set( 'translator', - new LibreTranslateTranslator({ endpoint, apiKey, fetch: fetchWorker }), + new LibreTranslateTranslator({ + endpoint: libreTranslateEndpoint, + apiKey: libreTranslateApiKey, + fetch: fetchWorker, + }), ); } break; diff --git a/src/translators/DeepLTranslator.test.ts b/src/translators/DeepLTranslator.test.ts index 8335670e..f8a12ede 100644 --- a/src/translators/DeepLTranslator.test.ts +++ b/src/translators/DeepLTranslator.test.ts @@ -4,8 +4,8 @@ import { Conf } from '@/config.ts'; import { DeepLTranslator } from '@/translators/DeepLTranslator.ts'; import { getLanguage } from '@/test.ts'; -const endpoint = Conf.translationProviderEndpoint; -const apiKey = Conf.translationProviderApiKey; +const endpoint = Conf.deepLendpoint; +const apiKey = Conf.deepLapiKey; const translationProvider = Conf.translationProvider; const deepL = 'deepl'; diff --git a/src/translators/LibreTranslateTranslator.test.ts b/src/translators/LibreTranslateTranslator.test.ts index 8d1fc24d..f7e89b30 100644 --- a/src/translators/LibreTranslateTranslator.test.ts +++ b/src/translators/LibreTranslateTranslator.test.ts @@ -4,8 +4,8 @@ import { Conf } from '@/config.ts'; import { LibreTranslateTranslator } from '@/translators/LibreTranslateTranslator.ts'; import { getLanguage } from '@/test.ts'; -const endpoint = Conf.translationProviderEndpoint; -const apiKey = Conf.translationProviderApiKey; +const endpoint = Conf.libreTranslateEndpoint; +const apiKey = Conf.libreTranslateApiKey; const translationProvider = Conf.translationProvider; const libreTranslate = 'libretranslate';