diff --git a/CHANGELOG.md b/CHANGELOG.md index 7650b19a0..0c70718c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Added - Command to clone a specific project +- Add L10NSharp.Windows.Forms dependency for version 9.0.0-beta0001 ### Removed @@ -34,6 +35,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - Reorganise Chorus Internet Server Settings control, add a help button to the Get from Internet dialog (LT-21209) - Increase the audio and picture file size limit from 1 MB to 10 MB +- Update Chorus dependency from 6.0.0-beta0061 to 6.0.0-beta0063 +- Update L10NSharp dependency from 8.0.0-beta0005 to 9.0.0-beta0001 ## [3.7.1] - 2022-08-09 diff --git a/Directory.Build.props b/Directory.Build.props index 73633ba6e..2914f3926 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -23,11 +23,12 @@ See full changelog at https://github.com/sillsdev/flexbridge/blob/develop/CHANGE ../../CHANGELOG.md false true - 6.0.0-beta0061 + 6.0.0-beta0063 11.0.0-beta* - + + diff --git a/src/TriboroughBridge-ChorusPlugin/TriboroughBridgeUtilities.cs b/src/TriboroughBridge-ChorusPlugin/TriboroughBridgeUtilities.cs index 92b40cd23..8b1e1f336 100644 --- a/src/TriboroughBridge-ChorusPlugin/TriboroughBridgeUtilities.cs +++ b/src/TriboroughBridge-ChorusPlugin/TriboroughBridgeUtilities.cs @@ -11,6 +11,7 @@ using Chorus; using Chorus.sync; using L10NSharp; +using L10NSharp.Windows.Forms; using LibTriboroughBridgeChorusPlugin; using SIL.IO; using SIL.Reporting; @@ -101,7 +102,7 @@ internal static Dictionary SetupLocalization(Dicti var versionObj = Assembly.GetExecutingAssembly().GetName().Version; // We don't need to reload strings for every "revision" (that might be every time we build). REVIEW (Hasso) 2021.08: then why do we have `build`? var version = $"{versionObj.Major}.{versionObj.Minor}.{versionObj.Build}"; - var flexBridgeLocMan = LocalizationManager.Create(desiredUiLangId, FlexBridge, Application.ProductName, + var flexBridgeLocMan = LocalizationManagerWinforms.Create(desiredUiLangId, FlexBridge, Application.ProductName, version, installedL10nBaseDir, userL10nBaseDir, CommonResources.chorus, FlexLocalizationEmailAddress, new [] { FlexBridge, "TriboroughBridge_ChorusPlugin", "FLEx_ChorusPlugin", "SIL.LiftBridge" }); results.Add("FlexBridge", flexBridgeLocMan); @@ -111,13 +112,13 @@ internal static Dictionary SetupLocalization(Dicti versionObj = Assembly.GetAssembly(typeof(ChorusSystem)).GetName().Version; version = "" + versionObj.Major + "." + versionObj.Minor + "." + versionObj.Build; - var chorusLocMan = LocalizationManager.Create(desiredUiLangId, "Chorus", "Chorus", + var chorusLocMan = LocalizationManagerWinforms.Create(desiredUiLangId, "Chorus", "Chorus", version, installedL10nBaseDir, userL10nBaseDir, CommonResources.chorus, FlexLocalizationEmailAddress, new []{ "Chorus" }); results.Add("Chorus", chorusLocMan); versionObj = Assembly.GetAssembly(typeof(ErrorReport)).GetName().Version; version = "" + versionObj.Major + "." + versionObj.Minor + "." + versionObj.Build; - var palasoLocMan = LocalizationManager.Create(desiredUiLangId, "Palaso", "Palaso", + var palasoLocMan = LocalizationManagerWinforms.Create(desiredUiLangId, "Palaso", "Palaso", version, installedL10nBaseDir, userL10nBaseDir, CommonResources.chorus, FlexLocalizationEmailAddress, new []{ "SIL" }); results.Add("Palaso", palasoLocMan); } diff --git a/src/TriboroughBridge-ChorusPlugin/View/BridgeConflictView.Designer.cs b/src/TriboroughBridge-ChorusPlugin/View/BridgeConflictView.Designer.cs index dbaf1b435..1bc169906 100644 --- a/src/TriboroughBridge-ChorusPlugin/View/BridgeConflictView.Designer.cs +++ b/src/TriboroughBridge-ChorusPlugin/View/BridgeConflictView.Designer.cs @@ -1,4 +1,4 @@ -// -------------------------------------------------------------------------------------------- +// -------------------------------------------------------------------------------------------- // Copyright (C) 2010-2013 SIL International. All rights reserved. // // Distributable under the terms of the MIT License. @@ -39,7 +39,7 @@ private void InitializeComponent() this.label1 = new System.Windows.Forms.Label(); this._warninglabel1 = new System.Windows.Forms.Label(); this._label1 = new System.Windows.Forms.Label(); - this.l10NSharpExtender1 = new L10NSharp.UI.L10NSharpExtender(this.components); + this.l10NSharpExtender1 = new L10NSharp.Windows.Forms.L10NSharpExtender(this.components); ((System.ComponentModel.ISupportInitialize)(this._splitContainer)).BeginInit(); this._splitContainer.Panel1.SuspendLayout(); this._splitContainer.SuspendLayout(); @@ -134,7 +134,7 @@ private void InitializeComponent() private System.Windows.Forms.Label _label1; private System.Windows.Forms.Label _warninglabel1; private System.Windows.Forms.Label label1; - private L10NSharp.UI.L10NSharpExtender l10NSharpExtender1; + private L10NSharp.Windows.Forms.L10NSharpExtender l10NSharpExtender1; } }