Merge pull request #58 from HalfOfBilly/master

Adds improvements to localization system
Infiland · Jan 13, 2025 · 500b55a · 500b55a
2 parents 5e1c970 + 0f6ad1a
commit 500b55a
Show file tree

Hide file tree

Showing 18 changed files with 172 additions and 179 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -98,8 +98,8 @@ We particularly welcome contributions in these areas:
 
 ## Localization
 
-To localize GM2Godot into other languages, create a copy of the Template.json file found in the Languages folder in GM2Godot's root directory. Rename the file to the chosen language's ISO-639 (Set 1) code (for example, en for English). Refer to https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes for a list of languages and their corresponding ISO-639 codes.
-More information regarding localization can be found in the README section of the Template.json file.
+To localize GM2Godot into other languages, create a copy of the Template.json file found in the Languages folder in GM2Godot's root directory. Rename the file to the chosen language's ISO-639 (Set 3) code (for example, eng for English). Refer to [Wikipedia](https://en.wikipedia.org/wiki/List_of_ISO_639-3_codes) for a list of languages and their corresponding ISO-639 codes.
+More information regarding localization can be found in the README section of the Template.json file ([GitHub copy](https://raw.githubusercontent.com/Infiland/GM2Godot/refs/heads/main/Languages/template.json))
 
 ## Questions or Issues?
 

diff --git a/Current Language b/Current Language
@@ -1 +1 @@
-en
+eng
diff --git a/Languages/en.json → Languages/eng.json b/Languages/en.json → Languages/eng.json
@@ -10,9 +10,9 @@
 ],
 
 "Language" : "English",
-"Language_Code" : "en",
+"Language_Code" : "eng",
 "Author" : "written by Infiland, structured by HalfofBilly",
-"Version" : "1.0.0",
+"Version" : "0.0.14",
 
 "About_Title" : "About GM2Godot",
 "About_Description" : "GM2Godot is a tool designed to help developers migrate their GameMaker projects to the Godot Engine.\nIt automates the conversion of various project assets and settings, making the transition smoother.",
@@ -47,10 +47,8 @@
 
 "Console_Convertor_Settings" : "Updating project settings...",
 "Console_Convertor_Settings_Error_yypNotFound" : "No .yyp file found in the GameMaker project folder.",
-"Console_Convertor_Settings_Error_GM_FileNotFound" : "{file_path} file not found.",
 "Console_Convertor_Settings_Error_yypNameNotRead" : "Error reading project name from .yyp file: {error}",
-"Console_Convertor_Settings_Error_yypGeneric" : "Error reading {option_name} from {os.path.basename(file_path)}: {error}",
-"Console_Convertor_Settings_Error_GD_NotFound" : "project.godot file not found in the Godot project directory.",
+"Console_Convertor_Settings_Error_yypGeneric" : "Error reading {option_name} from {file_path}: {error}",
 "Console_Convertor_Settings_UpdatedName" : "Updated project name to: {gm_project_name}",
 "Console_Convertor_Settings_Error_Name_GM" : "Could not update project name: GameMaker project name not found.",
 "Console_Convertor_Settings_Error_NameGeneric" : "Error updating project name: {error)}.",
@@ -77,22 +75,22 @@
 
 "Console_Convertor_Tilesets" : "Converting tilesets...",
 "Console_Convertor_Tilesets_Complete" : "Tileset conversion completed.",
-"Console_Convertor_Tilesets_Error_NotFound" : "Tileset folder not found in {self.gm_project_path}",
+"Console_Convertor_Tilesets_Error_NotFound" : "Tileset folder not found in {gm_project_path}",
 
 "Console_Convertor_Sounds" : "Converting sounds...",
 "Console_Convertor_Sounds_Converted" : "Converted: {path} -> sounds/{path}",
 "Console_Convertor_Sounds_Error_NotFound" : "No sound files found in the GameMaker project.",
 "Console_Convertor_Sounds_Complete" : "Sound conversion completed.",
 "Console_Convertor_Sounds_Stopped" : "Sound conversion stopped.",
 
-"Console_Convertor_Shaders_Converted" : "Converted {filename} to {output_path}",
+"Console_Convertor_Shaders_Converted" : "Converted {filename} -> {output_path}",
 
 "Console_Convertor_Notes" : "Converting notes...",
 "Console_Convertor_Notes_Copied" : "Copied note: {note_name}",
 "Console_Convertor_Notes_Stopped" : "Note conversion stopped.",
 "Console_Convertor_Notes_Error_NotFound" : "No notes folder found in GameMaker project.",
 
-"Icon_Error_Photoimage" : "Failed to set icon using PhotoImage: {error}",
+"Icon_Error_PhotoImage" : "Failed to set icon using PhotoImage: {error}",
 "Icon_Error_Linux" : "Failed to set icon on Linux: {error}",
 "Icon_Error_Path" : "Failed to load icon from {icon_path}. The icon will not be displayed.",
 "Icon_Error" : "Failed to load icon from {full_path}: {error}",

diff --git a/Languages/template.json b/Languages/template.json
@@ -47,10 +47,8 @@
 
 "Console_Convertor_Settings" : "Updating project settings...",
 "Console_Convertor_Settings_Error_yypNotFound" : "No .yyp file found in the GameMaker project folder.",
-"Console_Convertor_Settings_Error_GM_FileNotFound" : "{file_path} file not found.",
 "Console_Convertor_Settings_Error_yypNameNotRead" : "Error reading project name from .yyp file: {error}",
-"Console_Convertor_Settings_Error_yypGeneric" : "Error reading {option_name} from {os.path.basename(file_path)}: {error}",
-"Console_Convertor_Settings_Error_GD_NotFound" : "project.godot file not found in the Godot project directory.",
+"Console_Convertor_Settings_Error_yypGeneric" : "Error reading {option_name} from {file_path}: {error}",
 "Console_Convertor_Settings_UpdatedName" : "Updated project name to: {gm_project_name}",
 "Console_Convertor_Settings_Error_Name_GM" : "Could not update project name: GameMaker project name not found.",
 "Console_Convertor_Settings_Error_NameGeneric" : "Error updating project name: {error)}.",
@@ -77,22 +75,22 @@
 
 "Console_Convertor_Tilesets" : "Converting tilesets...",
 "Console_Convertor_Tilesets_Complete" : "Tileset conversion completed.",
-"Console_Convertor_Tilesets_Error_NotFound" : "Tileset folder not found in {self.gm_project_path}",
+"Console_Convertor_Tilesets_Error_NotFound" : "Tileset folder not found in {gm_project_path}",
 
 "Console_Convertor_Sounds" : "Converting sounds...",
 "Console_Convertor_Sounds_Converted" : "Converted: {path} -> sounds/{path}",
 "Console_Convertor_Sounds_Error_NotFound" : "No sound files found in the GameMaker project.",
 "Console_Convertor_Sounds_Complete" : "Sound conversion completed.",
 "Console_Convertor_Sounds_Stopped" : "Sound conversion stopped.",
 
-"Console_Convertor_Shaders_Converted" : "Converted {filename} to {output_path}",
+"Console_Convertor_Shaders_Converted" : "Converted {filename} -> {output_path}",
 
 "Console_Convertor_Notes" : "Converting notes...",
 "Console_Convertor_Notes_Copied" : "Copied note: {note_name}",
 "Console_Convertor_Notes_Stopped" : "Note conversion stopped.",
 "Console_Convertor_Notes_Error_NotFound" : "No notes folder found in GameMaker project.",
 
-"Icon_Error_Photoimage" : "Failed to set icon using PhotoImage: {error}",
+"Icon_Error_PhotoImage" : "Failed to set icon using PhotoImage: {error}",
 "Icon_Error_Linux" : "Failed to set icon on Linux: {error}",
 "Icon_Error_Path" : "Failed to load icon from {icon_path}. The icon will not be displayed.",
 "Icon_Error" : "Failed to load icon from {full_path}: {error}",