Fixes to gettext, fix wrong language shown when selecting strings

addons/zylann.translation_editor/tools/locales.gd

@@ -362,6 +362,15 @@ const _locales = [
 	["zu_ZA", "Zulu (South Africa)"]
 ]
 
+
 static func get_all_locales():
 	return _locales
 
+
+static func get_all_locale_ids():
+	var ids = []
+	ids.resize(len(_locales))
+	for i in len(_locales):
+		ids[i] = _locales[i][0]
+	return ids
+

addons/zylann.translation_editor/tools/po_loader.gd

@@ -1,17 +1,25 @@
 tool
 
-static func load_po_translation(folder_path, languages):
+static func load_po_translation(folder_path, valid_locales):
 	var all_strings = {}
 	
+	var languages = get_languages_in_folder(folder_path, valid_locales)
+	
+	if len(languages) == 0:
+		printerr("No .po languages were found in ", folder_path)
+		return all_strings
+	
 	for language in languages:
 		var filepath = folder_path.plus_file(str(language, ".po"))
 		
 		var f = File.new()
-		var err = f.open(filepath)
+		var err = f.open(filepath, File.READ)
 		if err != OK:
 			printerr("Could not open file ", filepath, " for read, error ", err)
 			return null
 		
+		f.store_line("")
+		
 		var comment = ""
 		var msgid = ""
 		var msgstr = ""
@@ -21,23 +29,23 @@ static func load_po_translation(folder_path, languages):
 		var comments = []
 		
 		while not f.eof_reached():
-			var line = f.get_line()
+			var line = f.get_line().strip_edges()
 			
-			if line[0] == "#":
+			if line != "" and line[0] == "#":
-				comment = str(comment, "\n", line.substr(1, len(line) - 1).strip_edges())
+				comment = str(comment, "\n", line.right(1).strip_edges())
 				continue
 			
 			var space_index = line.find(" ")
 			
 			if line.begins_with("msgid"):
-				msgid = _parse_msg(line.substr(space_index), len(line) - space_index)
+				msgid = _parse_msg(line.right(space_index))
 				last_is_msgid = true
 				
-			elif line.begin_with("msgstr"):
+			elif line.begins_with("msgstr"):
-				msgstr = _parse_msg(line.substr(space_index), len(line) - space_index)
+				msgstr = _parse_msg(line.right(space_index))
 				last_is_msgid = false
 				
-			elif line.begin_with('"'):
+			elif line.begins_with('"'):
 				if last_is_msgid:
 					msgid = str(msgid, _parse_msg(line))
 				else:
@@ -51,6 +59,8 @@ static func load_po_translation(folder_path, languages):
 						"comments": ""
 					}
 					all_strings[msgid] = s
+				else:
+					s = all_strings[msgid]
 				s.translations[language] = msgstr
 				if s.comments == "":
 					s.comments = comment
@@ -147,3 +157,23 @@ static func _write_msg(f, msgtype, msg):
 	f.store_line(str(msgtype, " \"", lines[0], "\""))
 	for i in range(1, len(lines)):
 		f.store_line(str(" \"", lines[i], "\""))
+
+
+static func get_languages_in_folder(folder_path, valid_locales):
+	var result = []
+	var d = Directory.new()
+	var err = d.open(folder_path)
+	if err != OK:
+		printerr("Could not open directory ", folder_path, ", error ", err)
+		return result
+	d.list_dir_begin()
+	var fname = d.get_next()
+	while fname != "":
+		if not d.current_is_dir():
+			var ext = fname.get_extension()
+			if ext == "po":
+				var language = fname.get_basename().get_file()
+				if valid_locales.find(language) != -1:
+					result.append(language)
+		fname = d.get_next()
+	return result

addons/zylann.translation_editor/tools/translation_editor.gd

@@ -3,14 +3,19 @@ extends Panel
 
 const CsvLoader = preload("csv_loader.gd")
 const PoLoader = preload("po_loader.gd")
+const Locales = preload("locales.gd")
 const StringEditionDialog = preload("string_edition_dialog.tscn")
 const LanguageSelectionDialog = preload("language_selection_dialog.tscn")
 
 const MENU_FILE_OPEN = 0
 const MENU_FILE_SAVE = 1
-const MENU_FILE_SAVE_AS = 2
+const MENU_FILE_SAVE_AS_CSV = 2
-const MENU_FILE_ADD_LANGUAGE = 3
+const MENU_FILE_SAVE_AS_PO = 3
-const MENU_FILE_REMOVE_LANGUAGE = 4
+const MENU_FILE_ADD_LANGUAGE = 4
+const MENU_FILE_REMOVE_LANGUAGE = 5
+
+const FORMAT_CSV = 0
+const FORMAT_GETTEXT = 1
 
 onready var _file_menu = get_node("VBoxContainer/MenuBar/FileMenu")
 onready var _edit_menu = get_node("VBoxContainer/MenuBar/EditMenu")
@@ -23,14 +28,16 @@ var _string_edit_dialog = null
 var _language_selection_dialog = null
 var _remove_language_confirmation_dialog = null
 var _open_dialog = null
-var _save_dialog = null
+var _save_file_dialog = null
+var _save_folder_dialog = null
 # This is set when integrated as a Godot plugin
 var _base_control = null
 var _translation_edits = {}
 
 var _data = {}
 var _languages = []
-var _current_file = null
+var _current_path = null
+var _current_format = FORMAT_CSV
 var _modified_languages = {}
 
 
@@ -41,7 +48,8 @@ func _ready():
 	
 	_file_menu.get_popup().add_item("Open...", MENU_FILE_OPEN)
 	_file_menu.get_popup().add_item("Save", MENU_FILE_SAVE)
-	_file_menu.get_popup().add_item("Save as...", MENU_FILE_SAVE_AS)
+	_file_menu.get_popup().add_item("Save as CSV...", MENU_FILE_SAVE_AS_CSV)
+	_file_menu.get_popup().add_item("Save as PO...", MENU_FILE_SAVE_AS_PO)
 	_file_menu.get_popup().add_separator()
 	_file_menu.get_popup().add_item("Add language...", MENU_FILE_ADD_LANGUAGE)
 	_file_menu.get_popup().add_item("Remove language", MENU_FILE_REMOVE_LANGUAGE)
@@ -53,7 +61,6 @@ func _ready():
 	var dialogs_parent = self
 	if _base_control != null:
 		dialogs_parent = _base_control
-		self_modulate = Color(0,0,0,0)
 	
 	_open_dialog = FileDialog.new()
 	_open_dialog.window_title = "Open translations"
@@ -63,13 +70,18 @@ func _ready():
 	_open_dialog.connect("file_selected", self, "_on_OpenDialog_file_selected")
 	dialogs_parent.add_child(_open_dialog)
 
-	_save_dialog = FileDialog.new()
+	_save_file_dialog = FileDialog.new()
-	_save_dialog.window_title = "Save translations"
+	_save_file_dialog.window_title = "Save translations as CSV"
-	_save_dialog.add_filter("*.csv ; CSV files")
+	_save_file_dialog.add_filter("*.csv ; CSV files")
-	_save_dialog.add_filter("*.po ; Gettext files")
+	_save_file_dialog.mode = FileDialog.MODE_SAVE_FILE
-	_save_dialog.mode = FileDialog.MODE_SAVE_FILE
+	_save_file_dialog.connect("file_selected", self, "_on_SaveFileDialog_file_selected")
-	_save_dialog.connect("file_selected", self, "_on_SaveDialog_file_selected")
+	dialogs_parent.add_child(_save_file_dialog)
-	dialogs_parent.add_child(_save_dialog)
+
+	_save_folder_dialog = FileDialog.new()
+	_save_folder_dialog.window_title = "Save translations as gettext .po files"
+	_save_folder_dialog.mode = FileDialog.MODE_OPEN_DIR
+	_save_folder_dialog.connect("dir_selected", self, "_on_SaveFolderDialog_dir_selected")
+	dialogs_parent.add_child(_save_folder_dialog)
 	
 	_string_edit_dialog = StringEditionDialog.instance()
 	_string_edit_dialog.set_validator(funcref(self, "_validate_new_string_id"))
@@ -90,6 +102,9 @@ func configure_for_godot_integration(base_control):
 	# You have to call this before adding to the tree
 	assert(not is_inside_tree())
 	_base_control = base_control
+	# Make underlying panel transparent because otherwise it looks bad in the editor
+	# TODO Would be better to not draw the panel background conditionally
+	self_modulate = Color(0, 0, 0, 0)
 
 
 func _on_FileMenu_id_pressed(id):
@@ -100,8 +115,11 @@ func _on_FileMenu_id_pressed(id):
 		MENU_FILE_SAVE:
 			_save()
 		
-		MENU_FILE_SAVE_AS:
+		MENU_FILE_SAVE_AS_CSV:
-			_save_dialog.popup_centered_ratio()
+			_save_file_dialog.popup_centered_ratio()
+
+		MENU_FILE_SAVE_AS_PO:
+			_save_folder_dialog.popup_centered_ratio()
 		
 		MENU_FILE_ADD_LANGUAGE:
 			_language_selection_dialog.configure(_languages)
@@ -121,8 +139,12 @@ func _on_OpenDialog_file_selected(filepath):
 	load_file(filepath)
 
 
-func _on_SaveDialog_file_selected(filepath):
+func _on_SaveFileDialog_file_selected(filepath):
-	save_file(filepath)
+	save_file(filepath, FORMAT_CSV)
+
+
+func _on_SaveFolderDialog_dir_selected(filepath):
+	save_file(filepath, FORMAT_GETTEXT)
 
 
 func _on_SaveButton_pressed():
@@ -134,18 +156,25 @@ func _on_LanguageSelectionDialog_language_selected(language):
 
 
 func _save():
-	if _current_file == null:
+	if _current_path == null:
-		_save_dialog.popup_centered_ratio()
+		# Have to default to CSV for now...
+		_save_file_dialog.popup_centered_ratio()
 	else:
-		save_file(_current_file)
+		save_file(_current_path, _current_format)
 
 
 func load_file(filepath):
 	var ext = filepath.get_extension()
+	
 	if ext == "po":
-		_data = PoLoader.load_po_translation(filepath)
+		var valid_locales = Locales.get_all_locale_ids()
+		_data = PoLoader.load_po_translation(filepath.get_base_dir(), valid_locales)
+		_current_format = FORMAT_GETTEXT
+		
 	elif ext == "csv":
 		_data = CsvLoader.load_csv_translation(filepath)
+		_current_format = FORMAT_CSV
+		
 	else:
 		printerr("Unknown file format, cannot load ", filepath)
 		return
@@ -168,7 +197,7 @@ func load_file(filepath):
 		_create_translation_edit(language)
 		
 	refresh_list()
-	_current_file = filepath
+	_current_path = filepath
 	_modified_languages.clear()
 
 
@@ -232,9 +261,10 @@ func _set_language_tab_title(language, title):
 	var page = _translation_edits[language]
 	for i in _translation_tab_container.get_child_count():
 		if _translation_tab_container.get_child(i) == page:
-			# TODO There seem to be a Godot bug, tab titles don't always update unless you click on them Oo
-			print("Set tab title ", title)
 			_translation_tab_container.set_tab_title(i, title)
+			# TODO There seem to be a Godot bug, tab titles don't update unless you click on them Oo
+			# See https://github.com/godotengine/godot/issues/23696
+			_translation_tab_container.update()
 			return
 	# Something bad happened
 	assert(false)
@@ -250,22 +280,28 @@ func get_current_language():
 	return null
 
 
-func save_file(filepath):
+func save_file(path, format):
-	var ext = filepath.get_extension()
 	var saved_languages = []
 	
-	if ext == "po":
+	if format == FORMAT_GETTEXT:
-		var languages_to_save = _modified_languages.keys()
+		var languages_to_save
-		saved_languages = PoLoader.save_po_translations(filepath.get_base_dir(), _data, languages_to_save)
+		if _current_format != FORMAT_GETTEXT:
-	elif ext == "csv":
+			languages_to_save = _languages
-		saved_languages = CsvLoader.save_csv_translation(filepath, _data)
 		else:
-		printerr("Unknown file format, cannot save ", filepath)
+			languages_to_save = _modified_languages.keys()
+		saved_languages = PoLoader.save_po_translations(path, _data, languages_to_save)
+		
+	elif format == "csv":
+		saved_languages = CsvLoader.save_csv_translation(path, _data)
+		
+	else:
+		printerr("Unknown file format, cannot save ", path)
 
 	for language in saved_languages:
 		_set_language_unmodified(language)
 	
-	_current_file = filepath
+	_current_format = format
+	_current_path = path
 
 
 func refresh_list():
@@ -282,7 +318,7 @@ func _on_StringList_item_selected(index):
 	var s = _data[str_id]
 	for language in _languages:
 		var e = _translation_edits[language]
-		e.show()
+		#e.show()
 		if s.translations.has(language):
 			e.text = s.translations[language]
 		else: