targetLocaleへの変更に伴い、翻訳関連の関数の引数名を更新

ttizze · Feb 19, 2025 · 6e3b986 · 6e3b986
1 parent 51b9f38
commit 6e3b986
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 20 deletions.
diff --git a/next/src/features/translate/lib/io-deps.ts b/next/src/features/translate/lib/io-deps.ts
@@ -6,7 +6,7 @@ import type { NumberedElement } from "../types";
 export async function saveTranslationsForPage(
 	extractedTranslations: NumberedElement[],
 	pageSegments: { id: number; number: number }[],
-	locale: string,
+	targetLocale: string,
 	aiModel: string,
 ) {
 	const systemUserId = await getOrCreateAIUser(aiModel);
@@ -23,7 +23,7 @@ export async function saveTranslationsForPage(
 				return null;
 			}
 			return {
-				locale,
+				locale: targetLocale,
 				text: translation.text,
 				pageSegmentId,
 				userId: systemUserId,
@@ -41,7 +41,7 @@ export async function saveTranslationsForPage(
 export async function saveTranslationsForComment(
 	extractedTranslations: NumberedElement[],
 	pageCommentSegments: { id: number; number: number }[],
-	locale: string,
+	targetLocale: string,
 	aiModel: string,
 ) {
 	const systemUserId = await getOrCreateAIUser(aiModel);
@@ -59,7 +59,7 @@ export async function saveTranslationsForComment(
 				return null;
 			}
 			return {
-				locale,
+				locale: targetLocale,
 				text: translation.text,
 				pageCommentSegmentId,
 				userId: systemUserId,
@@ -78,7 +78,7 @@ export async function getTranslatedText(
 	geminiApiKey: string,
 	aiModel: string,
 	numberedElements: NumberedElement[],
-	locale: string,
+	targetLocale: string,
 	title: string,
 ) {
 	const source_text = numberedElements
@@ -89,6 +89,6 @@ export async function getTranslatedText(
 		aiModel,
 		title,
 		source_text,
-		locale,
+		targetLocale,
 	);
 }
diff --git a/next/src/features/translate/lib/translate.server.ts b/next/src/features/translate/lib/translate.server.ts
@@ -63,7 +63,7 @@ async function translateChunk(
 	geminiApiKey: string,
 	aiModel: string,
 	numberedElements: NumberedElement[],
-	locale: string,
+	targetLocale: string,
 	pageId: number,
 	title: string,
 	translateTarget: TranslateTarget,
@@ -82,7 +82,7 @@ async function translateChunk(
 			geminiApiKey,
 			aiModel,
 			pendingElements,
-			locale,
+			targetLocale,
 			title,
 		);
 
@@ -97,7 +97,7 @@ async function translateChunk(
 				await saveTranslationsForPage(
 					partialTranslations,
 					pageSegments,
-					locale,
+					targetLocale,
 					aiModel,
 				);
 			} else {
@@ -110,7 +110,7 @@ async function translateChunk(
 				await saveTranslationsForComment(
 					partialTranslations,
 					pageCommentSegments,
-					locale,
+					targetLocale,
 					aiModel,
 				);
 			}
@@ -138,20 +138,21 @@ async function getTranslatedText(
 	geminiApiKey: string,
 	aiModel: string,
 	numberedElements: NumberedElement[],
-	locale: string,
+	targetLocale: string,
 	title: string,
 ) {
 	const source_text = numberedElements
 		.map((el) => JSON.stringify(el))
 		.join("\n");
-	const localeName =
-		supportedLocaleOptions.find((sl) => sl.code === locale)?.name || locale;
+	const targetLocaleName =
+		supportedLocaleOptions.find((sl) => sl.code === targetLocale)?.name ||
+		targetLocale;
 	const result = await getGeminiModelResponse(
 		geminiApiKey,
 		aiModel,
 		title,
 		source_text,
-		localeName,
+		targetLocaleName,
 	);
 	return result;
 }
diff --git a/next/src/features/translate/services/gemini.ts b/next/src/features/translate/services/gemini.ts
@@ -13,7 +13,7 @@ export async function getGeminiModelResponse(
 	model: string,
 	title: string,
 	source_text: string,
-	target_language: string,
+	target_locale: string,
 ) {
 	const decryptedApiKey = decrypt(geminiApiKey);
 	const genAI = new GoogleGenerativeAI(decryptedApiKey);
@@ -62,7 +62,7 @@ export async function getGeminiModelResponse(
 	for (let retryCount = 0; retryCount < MAX_RETRIES; retryCount++) {
 		try {
 			const result = await modelConfig.generateContent(
-				generateSystemMessage(title, source_text, target_language),
+				generateSystemMessage(title, source_text, target_locale),
 			);
 			return result.response.text();
 		} catch (error: unknown) {

diff --git a/next/src/features/translate/services/generate-gemini-message.ts b/next/src/features/translate/services/generate-gemini-message.ts
@@ -1,7 +1,7 @@
 export function generateSystemMessage(
 	title: string,
 	source_text: string,
-	target_language: string,
+	target_locale: string,
 ): string {
 	return `
   You are a skilled translator. Your task is to accurately translate the given text into beautiful and natural sentences in the target language. Please follow these guidelines:
@@ -13,7 +13,7 @@ export function generateSystemMessage(
   
   Document title: ${title}
   
-  Translate the following array of English texts into ${target_language}.
+  Translate the following array of English texts into ${target_locale}.
   
   Important instructions:
   - Do not explain your process or self-reference.
@@ -47,7 +47,7 @@ export function generateSystemMessage(
   Input text:
   ${source_text}
   
-  Translate to ${target_language} and output in the following format:
+  Translate to ${target_locale} and output in the following format:
   [
     {
       "number": 1,

diff --git a/next/src/features/translate/translate-user-queue.ts b/next/src/features/translate/translate-user-queue.ts
@@ -2,7 +2,7 @@ import { Queue } from "@/lib/queue.server";
 import type { Job } from "bullmq";
 import { translate } from "./lib/translate.server";
 import type { TranslateJobParams } from "./types";
-const QUEUE_VERSION = 13;
+const QUEUE_VERSION = 14;
 
 export const getTranslateUserQueue = (userId: string) => {
 	return Queue<TranslateJobParams>(