From 80fba5c0e7468f161f3cc46206607c57e51edf81 Mon Sep 17 00:00:00 2001
From: Gmanon <nonprincipalmail@gmail.com>
Date: Thu, 29 Dec 2022 03:36:36 -0300
Subject: [PATCH] Fixes and shieet

---
 Auto Trans/Translator.py                 |  2 +-
 Translation merger/Translation merger.py | 17 +++++------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/Auto Trans/Translator.py b/Auto Trans/Translator.py
index 2415052..93b1b96 100644
--- a/Auto Trans/Translator.py	
+++ b/Auto Trans/Translator.py	
@@ -85,7 +85,7 @@ with open('original.csv', 'r', encoding='utf-8') as input_file, \
       # Calculate the estimated time remaining to translate the whole file
       time_remaining = avrg(times) * (length - i)
 
-      print(f'{Fore.RED}Original: {Fore.RESET}{row[0]} | {Fore.GREEN}Translation: {Fore.RESET}{translation}{" "*10}\n{Fore.CYAN}Estimated time remaining: {str(time_remaining).split(".")[0]}', end="\r")
+      print(f'{Fore.RED}Original: {Fore.RESET}{row[0]} | {Fore.GREEN}Translation: {Fore.RESET}{translation}{" "*10}\n{Fore.CYAN}Estimated time remaining: {str(time_remaining).split(".")[0]} {Fore.YELLOW}({i}/{length})', end="\r")
       
       writer.writerow([row[0], translation])
 
diff --git a/Translation merger/Translation merger.py b/Translation merger/Translation merger.py
index 749cc51..3e662a1 100644
--- a/Translation merger/Translation merger.py	
+++ b/Translation merger/Translation merger.py	
@@ -13,16 +13,13 @@
 
 from os import listdir
 
-cont = 0
 nextOne = False
-next_One = False
-OUT = "out"
 
 for file in listdir(f"files_old"):
 	if file.endswith(".rpy"):
 		with open(f"files_old/{file}",'r', encoding="utf8") as f:
 			linesOne = f.readlines()
-		with open(f"files_old/{file}",'r', encoding="utf8") as f2:
+		with open(f"files_new/{file}",'r', encoding="utf8") as f2:
 			linesTwo = f2.readlines()
 
 		if len(linesOne) == len(linesTwo):
@@ -31,19 +28,15 @@ for file in listdir(f"files_old"):
 					if nextOne:
 						fp.write(linesOne[number])
 						nextOne = False
-					elif next_One and number % 2 == 0:
-						fp.write(linesOne[number])
-						next_One = False
-						cont = 0
-					elif line.strip().startswith("#") and number != 0:
-						next_One = True
-						cont += 1
-						fp.write(linesTwo[number])
 					elif line.strip().startswith("old"):
 						nextOne = True
 						fp.write(linesTwo[number])
+						print("nuevo",number)
+					elif number % 6 == 0:
+						fp.write(linesOne[number])
 					else:
 						fp.write(linesTwo[number])
+						print("novo",number,linesTwo[number])
 		else:
 			print(f"ERROR processing {file}. There's a discrepancy in the lines. old: {len(linesOne)} - new: {len(linesTwo)}\n\n")
 			continue