Replace all PO/T again but with omitted ctxt strings in POTs

Author: Razoric480

addons/learn_pot_extractor/BBCodeTranslationParser.gd

@@ -31,66 +31,66 @@ func _parse_file(path: String) -> Array[PackedStringArray]:
 		if typeof(current) == TYPE_OBJECT and "tag" in current:
 			match current.tag:
 				BBCodeParserData.Tag.LESSON:
-					ret.append(PackedStringArray([BBCodeUtils.get_lesson_title(current), "lesson.title", "", "", current.line_number]))
+					ret.append(PackedStringArray([BBCodeUtils.get_lesson_title(current), "", "", "", current.line_number]))
 				BBCodeParserData.Tag.PARAGRAPH:
 					var glossary_results := []
 					var raw_string := BBCodeUtils.get_paragraph_text(current)
 					var lines := _get_lines(raw_string)
 					for i in lines.size():
 						var line := lines[i]
 						line = SHARED.fix_glossary_entries(line, glossary_results)
-						ret.append(PackedStringArray([line, "text", "", ('The "term" in [glossary term="<term>"] should NOT be translated here') if glossary_results[0] else "", current.line_number + i]))
+						ret.append(PackedStringArray([line, "", "", ('The "term" in [glossary term="<term>"] should NOT be translated here') if glossary_results[0] else "", current.line_number + i]))
 				BBCodeParserData.Tag.TITLE:
-					ret.append(PackedStringArray([BBCodeUtils.get_paragraph_text(current), "heading", "", "", current.line_number]))
+					ret.append(PackedStringArray([BBCodeUtils.get_paragraph_text(current), "", "", "", current.line_number]))
 				BBCodeParserData.Tag.QUIZ_CHOICE, BBCodeParserData.Tag.QUIZ_INPUT:
 					var data := BBCodeUtils.get_quiz_data(current)
-					ret.append(PackedStringArray([data.question, "quiz.%s.question" % [quiz_idx], "", "", current.line_number]))
+					ret.append(PackedStringArray([data.question, "", "", "", current.line_number]))
 
 					var lines := _get_lines(data.content)
 					var glossary_results := []
 					for line in lines:
 						line = SHARED.fix_glossary_entries(line, glossary_results)
-						ret.append(PackedStringArray([line, "quiz.%s.content" % [quiz_idx], "", 'The "term" in [glossary term="<term>"] should NOT be translated here' if glossary_results[0] else "", current.line_number]))
+						ret.append(PackedStringArray([line, "", "", 'The "term" in [glossary term="<term>"] should NOT be translated here' if glossary_results[0] else "", current.line_number]))
 
 					lines = _get_lines(data.explanation)
 					for line in lines:
 						line = SHARED.fix_glossary_entries(line, glossary_results)
-						ret.append(PackedStringArray([line, "quiz.%s.explanation" % [quiz_idx], "", 'The "term" in [glossary term="<term>"] should NOT be translated here' if glossary_results[0] else "", current.line_number]))
+						ret.append(PackedStringArray([line, "", "", 'The "term" in [glossary term="<term>"] should NOT be translated here' if glossary_results[0] else "", current.line_number]))
 
 					for i in data.answers.size():
-						ret.append(PackedStringArray([data.answers[i], "quiz.%s.answer%s" % [quiz_idx, ".valid" if data.valid_answers.has(data.answers[i]) else ""], "", "", current.line_number]))
+						ret.append(PackedStringArray([data.answers[i], "", "", "", current.line_number]))
 
 					quiz_idx += 1
 				BBCodeParserData.Tag.NOTE:
 					var title := BBCodeUtils.get_note_title(current)
-					ret.append(PackedStringArray([title, "note.title", "", "", current.line_number]))
+					ret.append(PackedStringArray([title, "", "", "", current.line_number]))
 					var contents := BBCodeUtils.get_note_contents(current)
 					var lines := _get_lines(contents)
 					var glossary_results := []
 					for i in lines.size():
 						var line := lines[i]
 						line = SHARED.fix_glossary_entries(line, glossary_results)
-						ret.append(PackedStringArray([line, "note.text", "", 'The "term" in [glossary term="<term>"] should NOT be translated here' if glossary_results[0] else "", current.line_number + i + 1]))
+						ret.append(PackedStringArray([line, "", "", 'The "term" in [glossary term="<term>"] should NOT be translated here' if glossary_results[0] else "", current.line_number + i + 1]))
 				BBCodeParserData.Tag.PRACTICE:
 					var title := BBCodeUtils.get_practice_title(current)
-					ret.append(PackedStringArray([title, "practice.%s.title" % [practice_idx], "", "", current.line_number]))
+					ret.append(PackedStringArray([title, "", "", "", current.line_number]))
 
 					var goal := BBCodeUtils.get_practice_goal(current)
 					var glossary_results := []
 					var lines := _get_lines(goal)
 					for i in lines.size():
 						var line := SHARED.fix_glossary_entries(lines[i], glossary_results)
-						ret.append(PackedStringArray([line, "practice.%s.goal" % [practice_idx], "", 'The "term" in [glossary term="<term>"] should NOT be translated here' if glossary_results[0] else "", current.line_number]))
+						ret.append(PackedStringArray([line, "", "", 'The "term" in [glossary term="<term>"] should NOT be translated here' if glossary_results[0] else "", current.line_number]))
 
 					var description := BBCodeUtils.get_practice_description(current)
 					lines = _get_lines(description)
 					for i in lines.size():
 						var line := SHARED.fix_glossary_entries(lines[i], glossary_results)
-						ret.append(PackedStringArray([line, "practice.%s.description" % [practice_idx], "", 'The "term" in [glossary term="<term>"] should NOT be translated here' if glossary_results[0] else "", current.line_number + i]))
+						ret.append(PackedStringArray([line, "", "", 'The "term" in [glossary term="<term>"] should NOT be translated here' if glossary_results[0] else "", current.line_number + i]))
 
 					var hints := BBCodeUtils.get_practice_hints(current)
 					for i in hints.size():
-						ret.append(PackedStringArray([hints[i], "practice.%s.hint" % [practice_idx], "", "", current.line_number]))
+						ret.append(PackedStringArray([hints[i], "", "", "", current.line_number]))
 
 					practice_idx += 1
 

addons/learn_pot_extractor/LearnCSVExtractor.gd

@@ -64,7 +64,7 @@ func _parse_file(path: String) -> Array[PackedStringArray]:
 			var prefix := ""
 			if extraction_data._prefix_column >= 0:
 				prefix = block[0]
-			ret.push_back(PackedStringArray([block[data._column], "%s%s" % [("%s." % prefix if prefix else ""), data._suffix]]))
+			ret.push_back(PackedStringArray([block[data._column]]))
 
 	return ret
 

addons/learn_pot_extractor/LearnPOTExtractor.gd

@@ -55,6 +55,10 @@ func _generate_all_pot_files() -> void:
 	await _generate_course_pot()
 	await _generate_application_pot()
 	await _generate_supplemantary_pots()
+
+
+# ⚠ Only use if you know what you're doing ⚠
+func _slipstream_and_clean() -> void:
 	await _slipstream_existing_translations()
 	await _wipe_old_translations()
 
@@ -112,42 +116,48 @@ func _build_translated_lessons() -> void:
 
 
 func _slipstream_existing_translations() -> void:
+	var global_base_dir := ProjectSettings.globalize_path("res://i18n")
+	
 	var global_course := ProjectSettings.globalize_path(COURSE_POT_PATH)
 	var global_app := ProjectSettings.globalize_path(APPLICATION_POT_PATH)
 	var global_supp := ProjectSettings.globalize_path(SUPPLEMENTARY_POT_PATH)
 
-	for lang in DirAccess.get_directories_at("res://i18n"):
+	for lang in DirAccess.get_directories_at(global_base_dir):
 		print("Processing %s..." % [lang])
 		await get_tree().process_frame
 		await get_tree().process_frame
 
-		var global_lang_course := ProjectSettings.globalize_path("res://i18n/%s/course.po" % [lang])
-		var global_lang_app := ProjectSettings.globalize_path("res://i18n/%s/n_application.po" % [lang])
-		var global_lang_supp := ProjectSettings.globalize_path("res://i18n/%s/supplementary.po" % [lang])
+		var global_lang_course := "%s/%s/course.po" % [global_base_dir, lang]
+		var global_lang_app := "%s/%s/n_application.po" % [global_base_dir, lang]
+		var global_lang_supp := "%s/%s/supplementary.po" % [global_base_dir, lang]
 
-		var source := global_course
+		var template := global_course
 		var target := global_lang_course
 
-		for file in DirAccess.get_files_at("res://i18n/%s" % [lang]):
-			if file.get_extension() != "po" or not file.begins_with("lesson-"):
-				continue
-			var global_lesson := ProjectSettings.globalize_path("res://i18n/%s/%s" % [lang, file])
-			OS.execute("msgmerge", ["--no-wrap", "-o", target, global_lesson, source])
-			source = global_lang_course
+		var sources := Array(DirAccess.get_files_at("%s/%s" % [global_base_dir, lang])).filter(func(file: String) -> bool:
+			return file.get_extension() == "po" and file.begins_with("lesson-")
+		).map(func(file: String) -> String:
+			return "%s/%s/%s" % [global_base_dir, lang, file]
+		)
 
-		var global_og_lang_app := ProjectSettings.globalize_path("res://i18n/%s/application.po" % [lang])
+		var temp_combined := "%s/%s/combined.po" % [global_base_dir, lang]
+		OS.execute("msgcat", ["--no-wrap", "--use-first"] + sources + ["-o", temp_combined])
+		OS.execute("msgmerge", ["--no-wrap", temp_combined, template, "-o", target])
+		
+		var global_og_lang_app := "%s/%s/application.po" % [global_base_dir, lang]
 		OS.execute("msgmerge", ["--no-wrap", "-o", global_lang_app, global_og_lang_app, global_app])
 
-		var global_og_lang_error := ProjectSettings.globalize_path("res://i18n/%s/error_database.po" % [lang])
-		var global_og_lang_glossary := ProjectSettings.globalize_path("res://i18n/%s/glossary_database.po" % [lang])
-		var global_og_lang_doc := ProjectSettings.globalize_path("res://i18n/%s/classref_database.po" % [lang])
+		var global_og_lang_error := "%s/%s/error_database.po" % [global_base_dir, lang]
+		var global_og_lang_glossary := "%s/%s/glossary_database.po" % [global_base_dir, lang]
+		var global_og_lang_doc := "%s/%s/classref_database.po" % [global_base_dir, lang]
 
-		source = global_supp
+		sources = [global_og_lang_error, global_og_lang_glossary, global_og_lang_doc]
+		template = global_supp
 		target = global_lang_supp
-		for supplementary_file: String in [global_og_lang_error, global_og_lang_glossary, global_og_lang_doc]:
-			OS.execute("msgmerge", ["--no-wrap", "-o", target, supplementary_file, source])
-			source = global_lang_supp
 
+		OS.execute("msgcat", ["--no-wrap", "--use-first"] + sources + ["-o", temp_combined])
+		OS.execute("msgmerge", ["--no-wrap", temp_combined, template, "-o", target])
+	
 	print("Done")