fix: normalize input text by removing newlines to prevent translation glitches (#1210)

2025-05-21 11:26:20 +08:00
parent 14810d6737
commit b6b8b17760
3 changed files with 36 additions and 41 deletions
@@ -76,7 +76,8 @@ const DeepLPopup: React.FC<DeepLPopupProps> = ({
      setTranslation(null);

      try {
-        const result = await translate([text]);
+        const input = text.replaceAll('\n', ' ').trim();
+        const result = await translate([input]);
        const translatedText = result[0];
        const detectedSource = null;

@@ -130,8 +130,11 @@ async function callDeepLAPI(
 ) {
  const isV2Api = apiUrl.endsWith('/v2/translate');

+  // TODO: this should be processed in the client, but for now, we need to do it here
+  // please remove this when most clients are updated
+  const input = text.replaceAll('\n', ' ').trim();
  const requestBody = {
-    text: isV2Api ? [text] : text,
+    text: isV2Api ? [input] : input,
    source_lang: isV2Api ? sourceLang : (LANG_V2_V1_MAP[sourceLang] ?? sourceLang),
    target_lang: isV2Api ? targetLang : (LANG_V2_V1_MAP[targetLang] ?? targetLang),
  };
@@ -12,46 +12,37 @@ export const deeplProvider: TranslationProvider = {
    token?: string | null,
    useCache: boolean = false,
  ): Promise<string[]> => {
-    try {
-      const headers: Record<string, string> = {
-        'Content-Type': 'application/json',
-      };
+    const headers: Record<string, string> = {
+      'Content-Type': 'application/json',
+    };

-      if (token) {
-        headers['Authorization'] = `Bearer ${token}`;
-      }
-
-      const response = await fetch(DEEPL_API_ENDPOINT, {
-        method: 'POST',
-        headers,
-        body: JSON.stringify({
-          text: text,
-          source_lang: sourceLang,
-          target_lang: targetLang,
-          use_cache: useCache,
-        }),
-      });
-
-      if (!response.ok) {
-        throw new Error(`Translation failed with status ${response.status}`);
-      }
-
-      const data = await response.json();
-
-      const result = [...text];
-      let translationIndex = 0;
-
-      for (let i = 0; i < text.length; i++) {
-        if (text[i]!.trim().length > 0) {
-          result[i] = data.translations?.[translationIndex]?.text || text[i];
-          translationIndex++;
-        }
-      }
-
-      return result;
-    } catch (error) {
-      console.error('Translation error:', error);
-      return text;
+    if (token) {
+      headers['Authorization'] = `Bearer ${token}`;
    }
+
+    const body = JSON.stringify({
+      text: text,
+      source_lang: sourceLang,
+      target_lang: targetLang,
+      use_cache: useCache,
+    });
+
+    const response = await fetch(DEEPL_API_ENDPOINT, { method: 'POST', headers, body });
+
+    if (!response.ok) {
+      throw new Error(`Translation failed with status ${response.status}`);
+    }
+
+    const data = await response.json();
+    if (!data || !data.translations) {
+      throw new Error('Invalid response from translation service');
+    }
+
+    return text.map((line, i) => {
+      if (!line?.trim().length) {
+        return line;
+      }
+      return data.translations?.[i]?.text || line;
+    });
  },
 };