Merge remote-tracking branch 'remotes/origin/master' into develop

# Conflicts: # Intento.MT.Plugin.PropertiesForm.Test/Intento.MT.Plugin.PropertiesForm.Test.csproj # Intento.MT.Plugin.PropertiesForm/Intento.MT.Plugin.PropertiesForm.csproj # Intento.MT.Plugin.PropertiesForm/IntentoMTFormOptions.cs # Intento.MT.Plugin.PropertiesForm/Properties/Intento.MT.Plugin.PropertiesForm.nuspec # Intento.MT.Plugin.PropertiesForm/WinForms/IntentoFormOptionsMT.Designer.cs # Intento.MT.Plugin.PropertiesForm/packages.config
intento · Apr 23, 2021 · ac30f52 · ac30f52
2 parents 8bc5ff3 + 061c8a4
commit ac30f52
Show file tree

Hide file tree

Showing 8 changed files with 525 additions and 483 deletions.
diff --git a/Intento.MT.Plugin.PropertiesForm.Test/Intento.MT.Plugin.PropertiesForm.Test.csproj b/Intento.MT.Plugin.PropertiesForm.Test/Intento.MT.Plugin.PropertiesForm.Test.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IntentoSDK" Version="1.5.2" />
+    <PackageReference Include="IntentoSDK" Version="1.5.3" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />

diff --git a/Intento.MT.Plugin.PropertiesForm/Intento.MT.Plugin.PropertiesForm.csproj b/Intento.MT.Plugin.PropertiesForm/Intento.MT.Plugin.PropertiesForm.csproj
@@ -39,8 +39,8 @@
     <AssemblyOriginatorKeyFile>intento_sn.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="IntentoSDK, Version=1.5.2.0, Culture=neutral, PublicKeyToken=7fbf26cf2c5f5508, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\IntentoSDK.1.5.2\lib\net45\IntentoSDK.dll</HintPath>
+    <Reference Include="IntentoSDK, Version=1.5.3.0, Culture=neutral, PublicKeyToken=7fbf26cf2c5f5508, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\IntentoSDK.1.5.3\lib\net45\IntentoSDK.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>

diff --git a/Intento.MT.Plugin.PropertiesForm/IntentoMTFormOptions.cs b/Intento.MT.Plugin.PropertiesForm/IntentoMTFormOptions.cs
@@ -302,6 +302,7 @@ public void Fill(IntentoMTFormOptions res)
 			res.MemoqAdditional = this.MemoqAdditional;
 			res.SaveLocally = this.SaveLocally;
 			res.Routing = this.Routing;
+			res.RoutingDisplayName = this.RoutingDisplayName;
 			res._authDict = _authDict == null ? null : new Dictionary<string, string>(_authDict);
 		}
 

diff --git a/Intento.MT.Plugin.PropertiesForm/Properties/AssemblyInfo.cs b/Intento.MT.Plugin.PropertiesForm/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.2.22.0")]
-[assembly: AssemblyFileVersion("2.2.22.0")]
+[assembly: AssemblyVersion("2.2.23.0")]
+[assembly: AssemblyFileVersion("2.2.23.0")]
 [assembly: IntentoSDK.AssemblyGitHash(Intento.MT.Plugin.PropertiesForm.GitHash.hash)]
diff --git a/Intento.MT.Plugin.PropertiesForm/Properties/Intento.MT.Plugin.PropertiesForm.nuspec b/Intento.MT.Plugin.PropertiesForm/Properties/Intento.MT.Plugin.PropertiesForm.nuspec
@@ -2,14 +2,14 @@
 <package>
   <metadata>
     <id>Intento.MT.Plugin.PropertiesForm</id>
-    <version>2.2.22.0</version>
+    <version>2.2.23.0</version>
     <authors>Intento</authors>
     <owners>Intento</owners>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>A library with a settings form used in Intento momoQ plugin and Intento Trados plugin.</description>    
     <copyright>Copyright © Intento 2018-2021</copyright>
     <dependencies>
-        <dependency id="IntentoSDK" version="1.5.2.0" />    
+        <dependency id="IntentoSDK" version="1.5.3.0" />    
     </dependencies>
   </metadata>
   <files>

diff --git a/Intento.MT.Plugin.PropertiesForm/WinForms/IntentoFormOptionsMT.Designer.cs b/Intento.MT.Plugin.PropertiesForm/WinForms/IntentoFormOptionsMT.Designer.cs
diff --git a/Intento.MT.Plugin.PropertiesForm/WinForms/IntentoFormOptonsMain.cs b/Intento.MT.Plugin.PropertiesForm/WinForms/IntentoFormOptonsMain.cs
@@ -129,6 +129,7 @@ Func<string, string, ProxySettings, IntentoAiTextTranslate> fabric
 					originalOptions.ApiKey = locallyOptions.ApiKey;
 					originalOptions.SmartRouting = locallyOptions.SmartRouting;
 					originalOptions.Routing = locallyOptions.Routing;
+					originalOptions.RoutingDisplayName = locallyOptions.RoutingDisplayName;
 					originalOptions.ProviderId = locallyOptions.ProviderId;
 					originalOptions.CustomAuth = locallyOptions.CustomAuth;
 					originalOptions.CustomModel = locallyOptions.CustomModel;
@@ -314,6 +315,7 @@ public IntentoMTFormOptions GetOptionsSavedLocally()
 						ret.SmartRouting = GetValueFromRegistry("SmartRouting", path) != null
 							&& GetValueFromRegistry("SmartRouting", path) == "1";
 						ret.Routing = GetValueFromRegistry("Routing", path);
+						ret.RoutingDisplayName = GetValueFromRegistry("RoutingDisplayName", path);
 						ret.ProviderId = GetValueFromRegistry("ProviderId", path);
 						ret.CustomAuth = GetValueFromRegistry("CustomAuth", path);
 						ret.CustomModel = GetValueFromRegistry("CustomModel", path);
@@ -335,6 +337,7 @@ public void SaveOptionsToRegistry(IntentoMTFormOptions options)
 			SaveValueToRegistry("ApiKey", options.ApiKey, path);
 			SaveValueToRegistry("SmartRouting", options.SmartRouting, path);
 			SaveValueToRegistry("Routing", options.Routing, path);
+			SaveValueToRegistry("RoutingDisplayName", options.RoutingDisplayName, path);
 			SaveValueToRegistry("ProviderId", options.ProviderId, path);
 			SaveValueToRegistry("CustomAuth", options.CustomAuth, path);
 			SaveValueToRegistry("CustomModel", options.CustomModel, path);

diff --git a/Intento.MT.Plugin.PropertiesForm/packages.config b/Intento.MT.Plugin.PropertiesForm/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="AWSSDK.Core" version="3.3.107.14" targetFramework="net45" />
   <package id="AWSSDK.S3" version="3.3.111.14" targetFramework="net45" />
-  <package id="IntentoSDK" version="1.5.2" targetFramework="net45" />
+  <package id="IntentoSDK" version="1.5.3" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" />
 </packages>