diff --git a/modules/csv.py b/modules/csv.py index 64ee33e..b4de1cc 100644 --- a/modules/csv.py +++ b/modules/csv.py @@ -622,7 +622,4 @@ def translateGPT(text, history, fullPromptFlag): tList[index] = translatedText.replace("Placeholder Text", "") finalList = combineList(tList, text) - if format == "json": - return [finalList, totalTokens] - else: - return [finalList[0], totalTokens] + return [finalList, totalTokens] \ No newline at end of file diff --git a/modules/json.py b/modules/json.py index 618affe..30fbd58 100644 --- a/modules/json.py +++ b/modules/json.py @@ -563,7 +563,4 @@ def translateGPT(text, history, fullPromptFlag): tList[index] = translatedText.replace("Placeholder Text", "") finalList = combineList(tList, text) - if format == "json": - return [finalList, totalTokens] - else: - return [finalList[0], totalTokens] + return [finalList, totalTokens] \ No newline at end of file diff --git a/modules/kirikiri.py b/modules/kirikiri.py index debafb5..5002dd6 100644 --- a/modules/kirikiri.py +++ b/modules/kirikiri.py @@ -606,7 +606,4 @@ def translateGPT(text, history, fullPromptFlag): tList[index] = translatedText.replace("Placeholder Text", "") finalList = combineList(tList, text) - if format == "json": - return [finalList, totalTokens] - else: - return [finalList[0], totalTokens] + return [finalList, totalTokens] diff --git a/modules/regex.py b/modules/regex.py index d64899f..4dee434 100644 --- a/modules/regex.py +++ b/modules/regex.py @@ -198,7 +198,9 @@ def translateRegex(data, translatedList): speaker = response[0] tokens[0] += response[1][0] tokens[1] += response[1][1] - data[i] = data[i].replace(match.group(1), speaker) + + if translatedList: + data[i] = data[i].replace(match.group(1), speaker) else: speaker = None @@ -248,7 +250,6 @@ def translateRegex(data, translatedList): translatedText = re.sub(r"^\[?(.+?)\]?\s?[|:]\s?", "", translatedText) # Escape Quotes - translatedText = re.sub(r'(?