Language -> Language Template in project creation (#345)

haroohie-club · Feb 7, 2024 · 2029b3e · 2029b3e
1 parent 7c1919c
commit 2029b3e
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 3 deletions.
diff --git a/...alLoops.Lib/Defaults/DefaultFlags.en.json → ...oops.Lib/Defaults/DefaultFlags.en-US.json b/...alLoops.Lib/Defaults/DefaultFlags.en.json → ...oops.Lib/Defaults/DefaultFlags.en-US.json
diff --git a/src/SerialLoops.Lib/Project.cs b/src/SerialLoops.Lib/Project.cs
@@ -275,7 +275,12 @@ public LoadProjectResult LoadArchives(ILogger log, IProgressTracker tracker)
             try
             {
                 // Note that the nameplates are not localized by program locale but by selected project language
-                Characters ??= JsonSerializer.Deserialize<Dictionary<int, NameplateProperties>>(File.ReadAllText($"{Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Defaults", "DefaultCharacters")}.{LangCode}.json"), SERIALIZER_OPTIONS);
+                string defaultCharactersJson = $"{Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Defaults", "DefaultCharacters")}.{LangCode}.json";
+                if (!File.Exists(defaultCharactersJson))
+                {
+                    defaultCharactersJson = $"{Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Defaults", "DefaultCharacters")}.en.json";
+                }
+                Characters ??= JsonSerializer.Deserialize<Dictionary<int, NameplateProperties>>(File.ReadAllText(defaultCharactersJson), SERIALIZER_OPTIONS);
             }
             catch (Exception ex)
             {

diff --git a/src/SerialLoops.Lib/SerialLoops.Lib.csproj b/src/SerialLoops.Lib/SerialLoops.Lib.csproj
@@ -44,7 +44,7 @@
     <None Update="DefaultCharacters.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Defaults\DefaultFlags.en.json">
+    <None Update="Defaults\DefaultFlags.en-US.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Update="Defaults\DefaultNames.en-US.json">

diff --git a/src/SerialLoops/Dialogs/ProjectCreationDialog.eto.cs b/src/SerialLoops/Dialogs/ProjectCreationDialog.eto.cs
@@ -89,7 +89,7 @@ void InitializeComponent()
                                     Spacing = 10,
                                     Items =
                                     {
-                                        Application.Instance.Localize(this, "Language"),
+                                        Application.Instance.Localize(this, "Language Template"),
                                         _languageDropDown,
                                     }
                                 }

diff --git a/src/SerialLoops/Strings.Designer.cs b/src/SerialLoops/Strings.Designer.cs
diff --git a/src/SerialLoops/Strings.resx b/src/SerialLoops/Strings.resx
@@ -1217,6 +1217,9 @@
   <data name="Language" xml:space="preserve">
     <value>Language</value>
   </data>
+  <data name="Language Template" xml:space="preserve">
+    <value>Language Template</value>
+  </data>
   <data name="Load Game menu ticker tape" xml:space="preserve">
     <value>Load Game menu ticker tape</value>
   </data>