From 1afb09e60495477425373203bb7f3cf3662b6b71 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 20 Feb 2025 10:39:31 -0600 Subject: [PATCH] DittoTranslator: source_lang -> sourceLang --- packages/ditto/controllers/api/translate.ts | 2 +- packages/translators/DeepLTranslator.test.ts | 4 ++-- packages/translators/DeepLTranslator.ts | 4 ++-- packages/translators/DittoTranslator.ts | 2 +- packages/translators/LibreTranslateTranslator.test.ts | 4 ++-- packages/translators/LibreTranslateTranslator.ts | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/ditto/controllers/api/translate.ts b/packages/ditto/controllers/api/translate.ts index 8a99edde..de183e23 100644 --- a/packages/ditto/controllers/api/translate.ts +++ b/packages/ditto/controllers/api/translate.ts @@ -132,7 +132,7 @@ const translateController: AppController = async (c) => { } } - mastodonTranslation.detected_source_language = data.source_lang; + mastodonTranslation.detected_source_language = data.sourceLang; translationCache.set(cacheKey, mastodonTranslation); cachedTranslationsSizeGauge.set(translationCache.size); diff --git a/packages/translators/DeepLTranslator.test.ts b/packages/translators/DeepLTranslator.test.ts index 8e37e44b..a688f135 100644 --- a/packages/translators/DeepLTranslator.test.ts +++ b/packages/translators/DeepLTranslator.test.ts @@ -26,7 +26,7 @@ Deno.test('DeepL translation with source language omitted', async () => { 'en', ); - assertEquals(data.source_lang, 'pt'); + assertEquals(data.sourceLang, 'pt'); assertEquals(detectLanguage(data.results[0], 0), 'en'); assertEquals(detectLanguage(data.results[1], 0), 'en'); assertEquals(detectLanguage(data.results[2], 0), 'en'); @@ -55,7 +55,7 @@ Deno.test('DeepL translation with source language set', async () => { 'en', ); - assertEquals(data.source_lang, 'pt'); + assertEquals(data.sourceLang, 'pt'); assertEquals(detectLanguage(data.results[0], 0), 'en'); assertEquals(detectLanguage(data.results[1], 0), 'en'); assertEquals(detectLanguage(data.results[2], 0), 'en'); diff --git a/packages/translators/DeepLTranslator.ts b/packages/translators/DeepLTranslator.ts index 93da8ad7..673c6e07 100644 --- a/packages/translators/DeepLTranslator.ts +++ b/packages/translators/DeepLTranslator.ts @@ -32,12 +32,12 @@ export class DeepLTranslator implements DittoTranslator { source: LanguageCode | undefined, dest: LanguageCode, opts?: { signal?: AbortSignal }, - ): Promise<{ results: string[]; source_lang: LanguageCode }> { + ): Promise<{ results: string[]; sourceLang: LanguageCode }> { const { translations } = await this.translateMany(texts, source, dest, opts); return { results: translations.map((value) => value.text), - source_lang: translations[0]?.detected_source_language, + sourceLang: translations[0]?.detected_source_language, }; } diff --git a/packages/translators/DittoTranslator.ts b/packages/translators/DittoTranslator.ts index 7e5e1d50..2a9fb7db 100644 --- a/packages/translators/DittoTranslator.ts +++ b/packages/translators/DittoTranslator.ts @@ -14,5 +14,5 @@ export interface DittoTranslator { targetLanguage: LanguageCode, /** Custom options. */ opts?: { signal?: AbortSignal }, - ): Promise<{ results: string[]; source_lang: LanguageCode }>; + ): Promise<{ results: string[]; sourceLang: LanguageCode }>; } diff --git a/packages/translators/LibreTranslateTranslator.test.ts b/packages/translators/LibreTranslateTranslator.test.ts index fc6c0a55..ca8c1d79 100644 --- a/packages/translators/LibreTranslateTranslator.test.ts +++ b/packages/translators/LibreTranslateTranslator.test.ts @@ -27,7 +27,7 @@ Deno.test('LibreTranslate translation with source language omitted', { 'ca', ); - assertEquals(data.source_lang, 'pt'); + assertEquals(data.sourceLang, 'pt'); assertEquals(detectLanguage(data.results[0], 0), 'ca'); assertEquals(detectLanguage(data.results[1], 0), 'ca'); assertEquals(detectLanguage(data.results[2], 0), 'ca'); @@ -48,7 +48,7 @@ Deno.test('LibreTranslate translation with source language set', { 'ca', ); - assertEquals(data.source_lang, 'pt'); + assertEquals(data.sourceLang, 'pt'); assertEquals(detectLanguage(data.results[0], 0), 'ca'); assertEquals(detectLanguage(data.results[1], 0), 'ca'); assertEquals(detectLanguage(data.results[2], 0), 'ca'); diff --git a/packages/translators/LibreTranslateTranslator.ts b/packages/translators/LibreTranslateTranslator.ts index b75f9b54..a8145223 100644 --- a/packages/translators/LibreTranslateTranslator.ts +++ b/packages/translators/LibreTranslateTranslator.ts @@ -32,14 +32,14 @@ export class LibreTranslateTranslator implements DittoTranslator { source: LanguageCode | undefined, dest: LanguageCode, opts?: { signal?: AbortSignal }, - ): Promise<{ results: string[]; source_lang: LanguageCode }> { + ): Promise<{ results: string[]; sourceLang: LanguageCode }> { const translations = await Promise.all( texts.map((text) => this.translateOne(text, source, dest, 'html', { signal: opts?.signal })), ); return { results: translations.map((value) => value.translatedText), - source_lang: (translations[0]?.detectedLanguage?.language ?? source) as LanguageCode, // cast is ok + sourceLang: (translations[0]?.detectedLanguage?.language ?? source) as LanguageCode, // cast is ok }; }