DYN-5733 fix language CLI argument

src/DynamoApplications/StartupUtils.cs

@@ -186,28 +186,59 @@ public static void PreloadShapeManager(ref string geometryFactoryPath, ref strin
             return model;
         }
 
-        /// <summary>
-        /// Use this overload to construct a DynamoModel in CLI context when the location of ASM to use is known, host analytics info is known and you want to set data paths.
-        /// </summary>
-        /// <param name="cmdLineArgs"></param>
-        /// <returns></returns>
-        public static DynamoModel MakeCLIModel(CommandLineArguments cmdLineArgs)
+        private static DynamoModel PrepareModel(
+            string cliLocale,
+            string asmPath,
+            bool noNetworkMode,
+            HostAnalyticsInfo analyticsInfo,
+            bool cliMode = true,
+            string userDataFolder = "",
+            string commonDataFolder = "",
+            bool serviceMode = false)
         {
-            var asmPath = String.IsNullOrEmpty(cmdLineArgs.ASMPath) ? string.Empty : cmdLineArgs.ASMPath;
+            var normalizedCLILocale = string.IsNullOrEmpty(cliLocale) ? null : cliLocale;
             IPathResolver pathResolver = CreatePathResolver(false, string.Empty, string.Empty, string.Empty);
             PathManager.Instance.AssignHostPathAndIPathResolver(string.Empty, pathResolver);
-            DynamoModel.SetUICulture(PreferenceSettings.Instance.Locale);
+            DynamoModel.SetUICulture(normalizedCLILocale ?? PreferenceSettings.Instance.Locale);
             DynamoModel.OnDetectLanguage();
 
             // Preload ASM and display corresponding message on splash screen
             DynamoModel.OnRequestUpdateLoadBarStatus(new SplashScreenLoadEventArgs(Resources.SplashScreenPreLoadingAsm, 10));
             var isASMloaded = PreloadASM(asmPath, out string geometryFactoryPath, out string preloaderLocation);
-            var model = StartDynamoWithDefaultConfig(true, cmdLineArgs.UserDataFolder, cmdLineArgs.CommonDataFolder,
-                geometryFactoryPath, preloaderLocation, cmdLineArgs.NoNetworkMode, cmdLineArgs.AnalyticsInfo, cmdLineArgs.ServiceMode);
+            var model = StartDynamoWithDefaultConfig(
+                CLImode: cliMode,
+                userDataFolder: userDataFolder,
+                commonDataFolder: commonDataFolder,
+                geometryFactoryPath: geometryFactoryPath,
+                preloaderLocation: preloaderLocation,
+                noNetworkMode: noNetworkMode,
+                info: analyticsInfo,
+                isServiceMode: serviceMode,
+                cliLocale: normalizedCLILocale
+            );
             model.IsASMLoaded = isASMloaded;
             return model;
         }
 
+        /// <summary>
+        /// Use this overload to construct a DynamoModel in CLI context when the location of ASM to use is known, host analytics info is known and you want to set data paths.
+        /// </summary>
+        /// <param name="cmdLineArgs"></param>
+        /// <returns></returns>
+        public static DynamoModel MakeCLIModel(CommandLineArguments cmdLineArgs)
+        {
+            var asmPath = string.IsNullOrEmpty(cmdLineArgs.ASMPath) ? string.Empty : cmdLineArgs.ASMPath;
+            var model = PrepareModel(
+                cliLocale: cmdLineArgs.Locale,
+                asmPath: asmPath,
+                noNetworkMode: cmdLineArgs.NoNetworkMode,
+                analyticsInfo: cmdLineArgs.AnalyticsInfo,
+                userDataFolder: cmdLineArgs.UserDataFolder,
+                commonDataFolder: cmdLineArgs.CommonDataFolder,
+                serviceMode: cmdLineArgs.ServiceMode);
+            return model;
+        }
+
         /// <summary>
         /// Use this overload to construct a DynamoModel when the location of ASM to use is known and host name is known.
         /// </summary>
@@ -217,10 +248,12 @@ public static DynamoModel MakeCLIModel(CommandLineArguments cmdLineArgs)
         /// <returns></returns>
         public static DynamoModel MakeModel(bool CLImode, string asmPath = "", string hostName ="")
         {
-            var isASMloaded = PreloadASM(asmPath, out string geometryFactoryPath, out string preloaderLocation);
-            var model = StartDynamoWithDefaultConfig(CLImode, string.Empty, string.Empty,
-                geometryFactoryPath, preloaderLocation, false, new HostAnalyticsInfo() { HostName = hostName });
-            model.IsASMLoaded = isASMloaded;
+            var model = PrepareModel(
+                cliLocale: string.Empty,
+                asmPath: asmPath,
+                noNetworkMode: false,
+                analyticsInfo: new HostAnalyticsInfo() { HostName = hostName },
+                cliMode: CLImode);
             return model;
         }
 
@@ -234,17 +267,32 @@ public static DynamoModel MakeModel(bool CLImode, string asmPath = "", string ho
         /// <returns></returns>
         public static DynamoModel MakeModel(bool CLImode, bool noNetworkMode, string asmPath = "", HostAnalyticsInfo info = new HostAnalyticsInfo())
         {
-            IPathResolver pathResolver = CreatePathResolver(false, string.Empty, string.Empty, string.Empty);
-            PathManager.Instance.AssignHostPathAndIPathResolver(string.Empty, pathResolver);
-            DynamoModel.SetUICulture(PreferenceSettings.Instance.Locale);
-            DynamoModel.OnDetectLanguage();
+            var model = PrepareModel(
+                cliLocale: string.Empty,
+                asmPath: asmPath,
+                noNetworkMode: noNetworkMode,
+                analyticsInfo: info,
+                cliMode: CLImode);
+            return model;
+        }
 
-            // Preload ASM and display corresponding message on splash screen
-            DynamoModel.OnRequestUpdateLoadBarStatus(new SplashScreenLoadEventArgs(Resources.SplashScreenPreLoadingAsm, 10));
-            var isASMloaded = PreloadASM(asmPath, out string geometryFactoryPath, out string preloaderLocation);
-            var model = StartDynamoWithDefaultConfig(CLImode, string.Empty, string.Empty, geometryFactoryPath,
-                preloaderLocation, noNetworkMode, info);
-            model.IsASMLoaded = isASMloaded;
+        /// <summary>
+        /// Use this overload to construct a DynamoModel when the location of ASM to use is known and host analytics info is known.
+        /// </summary>
+        /// <param name="CLImode">CLI mode starts the model in test mode and uses a separate path resolver.</param>
+        /// <param name="CLIlocale">CLI argument to force dynamo locale</param>
+        /// <param name="noNetworkMode">Option to initialize Dynamo in no-network mode</param>
+        /// <param name="asmPath">Path to directory containing geometry library binaries</param>
+        /// <param name="info">Host analytics info specifying Dynamo launching host related information.</param>
+        /// <returns></returns>
+        public static DynamoModel MakeModel(bool CLImode, string CLIlocale, bool noNetworkMode, string asmPath = "", HostAnalyticsInfo info = new HostAnalyticsInfo())
+        {
+            var model = PrepareModel(
+                cliLocale: CLIlocale,
+                asmPath: asmPath,
+                noNetworkMode: noNetworkMode,
+                analyticsInfo: info,
+                cliMode: CLImode);
             return model;
         }
 
@@ -322,7 +370,8 @@ private static DynamoModel StartDynamoWithDefaultConfig(bool CLImode,
             string preloaderLocation,
             bool noNetworkMode,
             HostAnalyticsInfo info = new HostAnalyticsInfo(),
-            bool isServiceMode = false)
+            bool isServiceMode = false,
+            string cliLocale = null)
         {
 
             var config = new DynamoModel.DefaultStartConfiguration
@@ -337,6 +386,7 @@ private static DynamoModel StartDynamoWithDefaultConfig(bool CLImode,
                 IsServiceMode = isServiceMode,
                 Preferences = PreferenceSettings.Instance,
                 NoNetworkMode = noNetworkMode,
+                CLILocale = cliLocale,
                 //Breaks all Lucene calls. TI enable this would require a lot of refactoring around Lucene usage in Dynamo.
                 //IsHeadless = CLImode
             };

src/DynamoCore/Models/DynamoModel.cs

@@ -241,6 +241,11 @@ public static string Version
         /// </summary>
         internal bool NoNetworkMode { get; }
 
+        /// <summary>
+        /// Locale forced by cli arguments
+        /// </summary>
+        internal string CLILocale { get; set; }
+
         /// <summary>
         ///     The path manager that configures path information required for
         ///     Dynamo to function properly. See IPathManager interface for more
@@ -589,6 +594,7 @@ public struct DefaultStartConfiguration : IStartConfiguration
             /// CLIMode indicates if we are running in DynamoCLI or DynamoWPFCLI mode.
             /// </summary>
             public bool CLIMode { get; set; }
+            public string CLILocale { get; set; }
         }
 
         /// <summary>
@@ -635,6 +641,7 @@ protected DynamoModel(IStartConfiguration config)
                 DefaultPythonEngine = defaultStartConfig.DefaultPythonEngine;
                 CLIMode = defaultStartConfig.CLIMode;
                 IsServiceMode = defaultStartConfig.IsServiceMode;
+                CLILocale = defaultStartConfig.CLILocale;
             }
 
             if (config is IStartConfigCrashReporter cerConfig)
@@ -685,7 +692,7 @@ protected DynamoModel(IStartConfiguration config)
 
             if (PreferenceSettings != null)
             {
-                SetUICulture(PreferenceSettings.Locale);
+                SetUICulture(CLILocale ?? PreferenceSettings.Locale);
                 PreferenceSettings.PropertyChanged += PreferenceSettings_PropertyChanged;
                 PreferenceSettings.MessageLogged += LogMessage;
             }

src/DynamoCore/PublicAPI.Unshipped.txt

@@ -1813,6 +1813,8 @@ Dynamo.Models.DynamoModel.CurrentWorkspace.set -> void
 Dynamo.Models.DynamoModel.DefaultStartConfiguration
 Dynamo.Models.DynamoModel.DefaultStartConfiguration.AuthProvider.get -> Greg.IAuthProvider
 Dynamo.Models.DynamoModel.DefaultStartConfiguration.AuthProvider.set -> void
+Dynamo.Models.DynamoModel.DefaultStartConfiguration.CLILocale.get -> string
+Dynamo.Models.DynamoModel.DefaultStartConfiguration.CLILocale.set -> void
 Dynamo.Models.DynamoModel.DefaultStartConfiguration.CLIMode.get -> bool
 Dynamo.Models.DynamoModel.DefaultStartConfiguration.CLIMode.set -> void
 Dynamo.Models.DynamoModel.DefaultStartConfiguration.Context.get -> string

src/DynamoSandbox/DynamoCoreSetup.cs

@@ -24,6 +24,7 @@ class DynamoCoreSetup
         private readonly string ASMPath;
         private readonly HostAnalyticsInfo analyticsInfo;
         private readonly bool noNetworkMode;
+        private readonly string CLILocale;
         private const string sandboxWikiPage = @"https://github.com/DynamoDS/Dynamo/wiki/How-to-Utilize-Dynamo-Builds";
         private DynamoViewModel viewModel = null;
 
@@ -59,6 +60,7 @@ public DynamoCoreSetup(string[] args)
             //    HostVersion = new Version(3, 3, 0),
             //};
             noNetworkMode = cmdLineArgs.NoNetworkMode;
+            CLILocale = cmdLineArgs.Locale;
         }
 
         public void RunApplication(Application app)
@@ -140,7 +142,7 @@ public void RunApplication(Application app)
         private void LoadDynamoView()
         {
             DynamoModel model;
-            model = StartupUtils.MakeModel(false, noNetworkMode, ASMPath ?? string.Empty, analyticsInfo);
+            model = StartupUtils.MakeModel(false, CLILocale, noNetworkMode, ASMPath ?? string.Empty, analyticsInfo);
             model.CERLocation = CERLocation;
 
             viewModel = DynamoViewModel.Start(