godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Try and match MSBuild and Godot UI languages

Browse Source
This commit is contained in:
Paul Joannon
2023-01-25 18:12:26 +01:00
parent 9bf2a0bcda
commit c70c82b0fb
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
modules/mono/editor/GodotTools/GodotTools/Build/BuildSystem.cs
View File

@@ -23,9 +23,11 @@ namespace GodotTools.Build
if (dotnetPath == null) if (dotnetPath == null)
throw new FileNotFoundException("Cannot find the dotnet executable."); throw new FileNotFoundException("Cannot find the dotnet executable.");
var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings();
var startInfo = new ProcessStartInfo(dotnetPath); var startInfo = new ProcessStartInfo(dotnetPath);
BuildArguments(buildInfo, startInfo.ArgumentList); BuildArguments(buildInfo, startInfo.ArgumentList, editorSettings);
string launchMessage = startInfo.GetCommandLineDisplay(new StringBuilder("Running: ")).ToString(); string launchMessage = startInfo.GetCommandLineDisplay(new StringBuilder("Running: ")).ToString();
stdOutHandler?.Invoke(launchMessage); stdOutHandler?.Invoke(launchMessage);
@@ -36,6 +38,8 @@ namespace GodotTools.Build
startInfo.RedirectStandardError = true; startInfo.RedirectStandardError = true;
startInfo.UseShellExecute = false; startInfo.UseShellExecute = false;
startInfo.CreateNoWindow = true; startInfo.CreateNoWindow = true;
startInfo.EnvironmentVariables["DOTNET_CLI_UI_LANGUAGE"]
= ((string)editorSettings.GetSetting("interface/editor/editor_language")).Replace('_', '-');
// Needed when running from Developer Command Prompt for VS // Needed when running from Developer Command Prompt for VS
RemovePlatformVariable(startInfo.EnvironmentVariables); RemovePlatformVariable(startInfo.EnvironmentVariables);
@@ -84,9 +88,11 @@ namespace GodotTools.Build
if (dotnetPath == null) if (dotnetPath == null)
throw new FileNotFoundException("Cannot find the dotnet executable."); throw new FileNotFoundException("Cannot find the dotnet executable.");
var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings();
var startInfo = new ProcessStartInfo(dotnetPath); var startInfo = new ProcessStartInfo(dotnetPath);
BuildPublishArguments(buildInfo, startInfo.ArgumentList); BuildPublishArguments(buildInfo, startInfo.ArgumentList, editorSettings);
string launchMessage = startInfo.GetCommandLineDisplay(new StringBuilder("Running: ")).ToString(); string launchMessage = startInfo.GetCommandLineDisplay(new StringBuilder("Running: ")).ToString();
stdOutHandler?.Invoke(launchMessage); stdOutHandler?.Invoke(launchMessage);
@@ -96,6 +102,8 @@ namespace GodotTools.Build
startInfo.RedirectStandardOutput = true; startInfo.RedirectStandardOutput = true;
startInfo.RedirectStandardError = true; startInfo.RedirectStandardError = true;
startInfo.UseShellExecute = false; startInfo.UseShellExecute = false;
startInfo.EnvironmentVariables["DOTNET_CLI_UI_LANGUAGE"]
= ((string)editorSettings.GetSetting("interface/editor/editor_language")).Replace('_', '-');
// Needed when running from Developer Command Prompt for VS // Needed when running from Developer Command Prompt for VS
RemovePlatformVariable(startInfo.EnvironmentVariables); RemovePlatformVariable(startInfo.EnvironmentVariables);
@@ -125,10 +133,9 @@ namespace GodotTools.Build
} }
} }
private static void BuildArguments(BuildInfo buildInfo, Collection<string> arguments) private static void BuildArguments(BuildInfo buildInfo, Collection<string> arguments,
EditorSettings editorSettings)
{ {
var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings();
// `dotnet clean` / `dotnet build` commands // `dotnet clean` / `dotnet build` commands
arguments.Add(buildInfo.OnlyClean ? "clean" : "build"); arguments.Add(buildInfo.OnlyClean ? "clean" : "build");
@@ -168,10 +175,9 @@ namespace GodotTools.Build
} }
} }
private static void BuildPublishArguments(BuildInfo buildInfo, Collection<string> arguments) private static void BuildPublishArguments(BuildInfo buildInfo, Collection<string> arguments,
EditorSettings editorSettings)
{ {
var editorSettings = GodotSharpEditor.Instance.GetEditorInterface().GetEditorSettings();
arguments.Add("publish"); // `dotnet publish` command arguments.Add("publish"); // `dotnet publish` command
// Solution // Solution