From 8fbaf525e47a6ea0f5dd4b110a28a0079c4b5318 Mon Sep 17 00:00:00 2001 From: "Aaron (Qilong)" Date: Mon, 16 Oct 2023 15:24:02 -0400 Subject: [PATCH] Update --- src/DynamoCore/Models/DynamoModel.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/DynamoCore/Models/DynamoModel.cs b/src/DynamoCore/Models/DynamoModel.cs index ce5c2060ce9..e05d3e69c90 100644 --- a/src/DynamoCore/Models/DynamoModel.cs +++ b/src/DynamoCore/Models/DynamoModel.cs @@ -681,10 +681,11 @@ protected DynamoModel(IStartConfiguration config) PreferenceSettings = (PreferenceSettings)CreateOrLoadPreferences(config.Preferences); if (PreferenceSettings != null) { - // In a integration case, respect default setting to use the host locale - if (!PreferenceSettings.Locale.Equals(Configuration.Configurations.SupportedLocaleList.First()) && HostAnalyticsInfo.HostName != string.Empty) + // Setting the locale for Dynamo from loaded Preferences only when + // In a non-in-process integration case (when HostAnalyticsInfo.HostName is unspecified) + // Language is specified, otherwise Default setting means following host locale + if (string.IsNullOrEmpty(HostAnalyticsInfo.HostName) || !PreferenceSettings.Locale.Equals(Configuration.Configurations.SupportedLocaleList.First())) { - // Setting the locale for Dynamo from loaded Preferences SetUICulture(PreferenceSettings.Locale); } PreferenceSettings.PropertyChanged += PreferenceSettings_PropertyChanged;