DYN-5816 locale splash screen

src/DynamoApplications/StartupUtils.cs

@@ -8,6 +8,8 @@
 using System.Text;
 using System.Threading;
 using CommandLine;
+using Dynamo.Configuration;
+using Dynamo.Core;
 using Dynamo.Interfaces;
 using Dynamo.Models;
 using Dynamo.Scheduler;
@@ -273,10 +275,21 @@ public static DynamoModel MakeModel(bool CLImode, string asmPath = "", string ho
         /// <returns></returns>
         public static DynamoModel MakeModel(bool CLImode, string asmPath = "", HostAnalyticsInfo info = new HostAnalyticsInfo())
         {
+            var pathManagerAndPreference = CreatePathManagerAndPreference();            
+            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(CLImode, string.Empty, string.Empty, geometryFactoryPath, preloaderLocation, info);
+            var model = StartDynamoWithDefaultConfig(CLImode,
+                string.Empty,
+                string.Empty,
+                geometryFactoryPath,
+                preloaderLocation,
+                info,
+                false,
+                pathManagerAndPreference.Item1,
+                pathManagerAndPreference.Item2);
             model.IsASMLoaded = isASMloaded;
             return model;
         }
@@ -360,13 +373,42 @@ private static bool PreloadASM(string asmPath, out string geometryFactoryPath, o
             }
         }
 
+        /// <summary>
+        /// Create a unique instance of a PathManager and PreferenceSettings to apply the locale language and reuse them as part of the DynamoModel ctor
+        /// </summary>
+        /// <returns></returns>
+        private static Tuple<PathManager, PreferenceSettings> CreatePathManagerAndPreference()
+        {
+            IPathResolver pathResolver = CreateIPathResolver(false, "", "", "");
+            PathManager pathManager = new PathManager(new PathManagerParams
+            {
+                CorePath = string.Empty,
+                HostPath = string.Empty,
+                PathResolver = pathResolver
+            });
+
+            PreferenceSettings preferenceSettings = (PreferenceSettings)DynamoModel.CreateOrLoadPreferences(null, false, pathManager.PreferenceFilePath);
+            Thread.CurrentThread.CurrentUICulture = new CultureInfo(preferenceSettings.Locale);
+            Thread.CurrentThread.CurrentCulture = new CultureInfo(preferenceSettings.Locale);
+            return new Tuple<PathManager, PreferenceSettings>(pathManager, preferenceSettings);
+        }
+
+        private static IPathResolver CreateIPathResolver(bool CLImode,string preloaderLocation,string userDataFolder, string commonDataFolder)
+        {
+            IPathResolver pathResolver = CLImode ? new CLIPathResolver(preloaderLocation, userDataFolder, commonDataFolder) as IPathResolver : new SandboxPathResolver(preloaderLocation) as IPathResolver;
+            return pathResolver;
+        }
+
         private static DynamoModel StartDynamoWithDefaultConfig(bool CLImode,
             string userDataFolder,
             string commonDataFolder,
             string geometryFactoryPath,
             string preloaderLocation,
             HostAnalyticsInfo info = new HostAnalyticsInfo(),
-            bool isServiceMode = false)
+            bool isServiceMode = false,
+            PathManager pathManager = null,
+            PreferenceSettings preferences = null
+            )
         {
             var config = new DynamoModel.DefaultStartConfiguration
             {
@@ -377,8 +419,10 @@ private static DynamoModel StartDynamoWithDefaultConfig(bool CLImode,
                 AuthProvider = CLImode ? null : new Core.IDSDKManager(),
                 UpdateManager = CLImode ? null : OSHelper.IsWindows() ? InitializeUpdateManager() : null,
                 StartInTestMode = CLImode,
-                PathResolver = CLImode ? new CLIPathResolver(preloaderLocation, userDataFolder, commonDataFolder) as IPathResolver : new SandboxPathResolver(preloaderLocation) as IPathResolver,
-                IsServiceMode = isServiceMode
+                PathResolver = pathManager == null ? CreateIPathResolver(CLImode, preloaderLocation, userDataFolder, commonDataFolder) : null,
+                IsServiceMode = isServiceMode,
+                PathManager = pathManager,
+                Preferences = preferences
             };
 
             var model = DynamoModel.Start(config);

src/DynamoCore/Configuration/PathManager.cs

@@ -48,7 +48,7 @@ struct PathManagerParams
         internal IPathResolver PathResolver { get; set; }
     }
 
-    class PathManager : IPathManager
+    public class PathManager : IPathManager
     {
         #region Class Private Data Members
 

src/DynamoCore/Models/DynamoModel.cs

@@ -521,6 +521,7 @@ public interface IStartConfiguration
             /// No update checks or analytics collection should be done.
             /// </summary>
             bool IsHeadless { get; set; }
+            IPathManager PathManager { get; set; }
         }
 
         /// <summary>
@@ -587,6 +588,8 @@ public struct DefaultStartConfiguration : IStartConfiguration
             /// CLIMode indicates if we are running in DynamoCLI or DynamoWPFCLI mode.
             /// </summary>
             public bool CLIMode { get; set; }
+
+            public IPathManager PathManager  { get; set; }   
         }
 
         /// <summary>
@@ -668,12 +671,21 @@ protected DynamoModel(IStartConfiguration config)
 
             ClipBoard = new ObservableCollection<ModelBase>();
 
-            pathManager = new PathManager(new PathManagerParams
+            #region [ Dealing with the PathManager]
+            if (config.PathManager != null)
             {
-                CorePath = config.DynamoCorePath,
-                HostPath = config.DynamoHostPath,
-                PathResolver = config.PathResolver
-            });
+                pathManager = (PathManager)config.PathManager;
+            }
+            else if (config.PathResolver != null)
+            {
+                pathManager = new PathManager(new PathManagerParams
+                {
+                    CorePath = config.DynamoCorePath,
+                    HostPath = config.DynamoHostPath,
+                    PathResolver = config.PathResolver
+                });
+            }
+            #endregion
 
             // Ensure we have all directories in place.
             var exceptions = new List<Exception>();
@@ -707,16 +719,31 @@ protected DynamoModel(IStartConfiguration config)
 
             OnRequestUpdateLoadBarStatus(new SplashScreenLoadEventArgs(Resources.SplashScreenInitPreferencesSettings, 30));
 
-            IPreferences preferences = CreateOrLoadPreferences(config.Preferences);
-            if (preferences is PreferenceSettings settings)
+
+            #region [ Dealing with the Preferences ]
+            if (config.Preferences != null)
             {
-                PreferenceSettings = settings;
-                // Setting the new locale for Dynamo after Preferences loaded
-                Thread.CurrentThread.CurrentUICulture = new CultureInfo(PreferenceSettings.Locale);
-                Thread.CurrentThread.CurrentCulture = new CultureInfo(PreferenceSettings.Locale);
-                PreferenceSettings.PropertyChanged += PreferenceSettings_PropertyChanged;
-                PreferenceSettings.MessageLogged += LogMessage;
+                if (config.Preferences is PreferenceSettings settings)
+                {
+                    PreferenceSettings = settings;
+                    PreferenceSettings.PropertyChanged += PreferenceSettings_PropertyChanged;
+                    PreferenceSettings.MessageLogged += LogMessage;
+                }
+            }
+            else
+            {
+                IPreferences preferences = CreateOrLoadPreferences(config.Preferences,IsServiceMode, pathManager.PreferenceFilePath);
+                if (preferences is PreferenceSettings settings)
+                {
+                    PreferenceSettings = settings;
+                    // Setting the new locale for Dynamo after Preferences loaded
+                    Thread.CurrentThread.CurrentUICulture = new CultureInfo(PreferenceSettings.Locale);
+                    Thread.CurrentThread.CurrentCulture = new CultureInfo(PreferenceSettings.Locale);
+                    PreferenceSettings.PropertyChanged += PreferenceSettings_PropertyChanged;
+                    PreferenceSettings.MessageLogged += LogMessage;
+                }
             }
+            #endregion            
 
             if (config is DefaultStartConfiguration defaultStartConfiguration)
             {
@@ -1727,13 +1754,13 @@ private void LoadNodeModels(List<TypeLoadData> nodes, bool isPackageMember)
             }
         }
 
-        private IPreferences CreateOrLoadPreferences(IPreferences preferences)
+        public static IPreferences CreateOrLoadPreferences(IPreferences preferences, bool isServiceMode, string preferenceFilePath)
         {
             if (preferences != null) // If there is preference settings provided...
                 return preferences;
 
             //Skip file handling and trust location in service mode.
-            if (IsServiceMode)
+            if (isServiceMode)
             {
                 var setting = new PreferenceSettings();
                 setting.SetTrustWarningsDisabled(true);
@@ -1747,7 +1774,7 @@ private IPreferences CreateOrLoadPreferences(IPreferences preferences)
             //
             var xmlFilePath = PreferenceSettings.DynamoTestPath;
             if (string.IsNullOrEmpty(xmlFilePath))
-                xmlFilePath = pathManager.PreferenceFilePath;
+                xmlFilePath = preferenceFilePath;
 
             if (File.Exists(xmlFilePath))
             {

src/DynamoCore/Models/DynamoModelDelegates.cs

@@ -47,4 +47,8 @@ namespace Dynamo.Models
     /// <param name="args"></param>
     internal delegate void SplashScreenLoadingHandler(SplashScreenLoadEventArgs args);
 
+    /// <summary>
+    /// This delegate is used to notify the detected language to the Splash Screen.
+    /// </summary>
+    internal delegate void SplashScreenLanguageDetected();
 }

src/DynamoCore/Models/DynamoModelEvents.cs

@@ -73,6 +73,15 @@ internal static void OnRequestUpdateLoadBarStatus(SplashScreenLoadEventArgs args
             RequestUpdateLoadBarStatus?.Invoke(args);
         }
 
+        /// <summary>
+        /// Event to throw for Splash Screen to display the content in the proper language
+        /// </summary>
+        internal static event SplashScreenLanguageDetected LanguageDetected;
+        internal static void OnDetectLanguage()
+        {
+            LanguageDetected?.Invoke();
+        }
+
         /// <summary>
         /// Occurs when changes in data may affect UI and UI needs to be refreshed
         /// </summary>

src/DynamoCoreWpf/Views/SplashScreen/SplashScreen.xaml.cs

@@ -130,16 +130,21 @@ public SplashScreen()
             // Bind event handlers
             webView.NavigationCompleted += WebView_NavigationCompleted;
             DynamoModel.RequestUpdateLoadBarStatus += DynamoModel_RequestUpdateLoadBarStatus;
+            DynamoModel.LanguageDetected += DynamoModel_LanguageDetected;
             StaticSplashScreenReady += OnStaticScreenReady;
             RequestLaunchDynamo = LaunchDynamo;
             RequestImportSettings = ImportSettings;
             RequestSignIn = SignIn;
             RequestSignOut = SignOut;
         }
 
-        private void WebView_NavigationCompleted(object sender, CoreWebView2NavigationCompletedEventArgs e)
+        private void DynamoModel_LanguageDetected()
         {
             SetLabels();
+        }
+
+        private void WebView_NavigationCompleted(object sender, CoreWebView2NavigationCompletedEventArgs e)
+        {            
             if (webView != null)
             {
                 webView.NavigationCompleted -= WebView_NavigationCompleted;
@@ -276,7 +281,7 @@ protected override async void OnContentRendered(EventArgs e)
             webView.CoreWebView2.Settings.IsZoomControlEnabled = false;
 
             var assembly = Assembly.GetExecutingAssembly();
-           
+
             using (Stream stream = assembly.GetManifestResourceStream(htmlEmbeddedFile))
             using (StreamReader reader = new StreamReader(stream))
             {
@@ -296,6 +301,7 @@ protected override async void OnContentRendered(EventArgs e)
                 jsonString = jsonString.Replace("#base64BackgroundImage", $"data:image/{imageFileExtension};base64,{resourceBase64}");
             }
 
+            jsonString = jsonString.Replace("Welcome to Dynamo!", "");
             htmlString = htmlString.Replace("mainJs", jsonString);
 
             webView.NavigateToString(htmlString);
@@ -474,6 +480,7 @@ protected override void OnClosed(EventArgs e)
             base.OnClosed(e);
 
             DynamoModel.RequestUpdateLoadBarStatus -= DynamoModel_RequestUpdateLoadBarStatus;
+            DynamoModel.LanguageDetected -= DynamoModel_LanguageDetected;
             webView.Dispose();
             webView = null;