From b50467a9993235a4764afff67a14bffefc05fd6a Mon Sep 17 00:00:00 2001 From: Dazed Date: Mon, 8 Jan 2024 00:30:54 -0600 Subject: [PATCH] Update kansen and rpgmakermv tl function --- modules/kansen.py | 9 +++------ modules/rpgmakermvmz.py | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/kansen.py b/modules/kansen.py index 6cced34..a06534a 100644 --- a/modules/kansen.py +++ b/modules/kansen.py @@ -569,13 +569,10 @@ def cleanTranslatedText(translatedText, varResponse): translatedText = translatedText.replace(target, replacement) translatedText = resubVars(translatedText, varResponse[1]) - if '\n' in translatedText: - return [line for line in translatedText.split('\n') if line] - else: - return [line for line in translatedText.split('\\n') if line] + return [line for line in translatedText.replace('\\n', '\n').split('\n') if line] def extractTranslation(translatedTextList, is_list): - pattern = r'[\\]*`?(.*?)[\\]*?`?' + pattern = r'`?[\\]*(.*?)[\\]*?<\/?Line\d+>`?' # If it's a batch (i.e., list), extract with tags; otherwise, return the single item. if is_list: return [re.findall(pattern, line)[0][1] for line in translatedTextList if re.search(pattern, line)] @@ -619,7 +616,7 @@ def translateGPT(text, history, fullPromptFlag): for index, tItem in enumerate(tList): # Before sending to translation, if we have a list of items, add the formatting if isinstance(tItem, list): - payload = '\n'.join([f'`{item}`' for i, item in enumerate(tItem)]) + payload = '\n'.join([f'`{item}`' for i, item in enumerate(tItem)]) payload = payload.replace('``', '`Placeholder Text`') varResponse = subVars(payload) subbedT = varResponse[0] diff --git a/modules/rpgmakermvmz.py b/modules/rpgmakermvmz.py index aa77f45..3a8d585 100644 --- a/modules/rpgmakermvmz.py +++ b/modules/rpgmakermvmz.py @@ -1973,7 +1973,7 @@ def cleanTranslatedText(translatedText, varResponse): translatedText = translatedText.replace(target, replacement) translatedText = resubVars(translatedText, varResponse[1]) - return [line for line in translatedText.split('\n') if line] + return [line for line in translatedText.replace('\\n', '\n').split('\n') if line] def extractTranslation(translatedTextList, is_list): pattern = r'`?[\\]*(.*?)[\\]*?<\/?Line\d+>`?'