Skip to content

Commit 99c82c2

Browse files
committed
Update dependencies for chorus and L10NSharp
1 parent 4564ae0 commit 99c82c2

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1919
### Added
2020

2121
- Command to clone a specific project
22+
- Add L10NSharp.Windows.Forms dependency for version 9.0.0-beta0001
2223

2324
### Removed
2425

@@ -34,6 +35,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
3435

3536
- Reorganise Chorus Internet Server Settings control, add a help button to the Get from Internet dialog (LT-21209)
3637
- Increase the audio and picture file size limit from 1 MB to 10 MB
38+
- Update Chorus dependency from 6.0.0-beta0061 to 6.0.0-beta0063
39+
- Update L10NSharp dependency from 8.0.0-beta0005 to 9.0.0-beta0001
3740

3841
## [3.7.1] - 2022-08-09
3942

Directory.Build.props

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ See full changelog at https://github.com/sillsdev/flexbridge/blob/develop/CHANGE
2323
<ChangelogFile>../../CHANGELOG.md</ChangelogFile>
2424
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
2525
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
26-
<ChorusVersion>6.0.0-beta0061</ChorusVersion>
26+
<ChorusVersion>6.0.0-beta0063</ChorusVersion>
2727
<LCModelVersion>11.0.0-beta*</LCModelVersion>
2828
</PropertyGroup>
2929
<ItemGroup>
3030
<!-- The only reason we depend directly on L10NSharp is because our dependencies can't agree which one they want -->
31-
<PackageReference Include="L10NSharp" Version="8.0.0-beta0005" />
31+
<PackageReference Include="L10NSharp" Version="9.0.0-beta0001" />
32+
<PackageReference Include="L10NSharp.Windows.Forms" Version="9.0.0-beta0001" />
3233
</ItemGroup>
3334
</Project>

src/TriboroughBridge-ChorusPlugin/TriboroughBridgeUtilities.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using Chorus;
1212
using Chorus.sync;
1313
using L10NSharp;
14+
using L10NSharp.Windows.Forms;
1415
using LibTriboroughBridgeChorusPlugin;
1516
using SIL.IO;
1617
using SIL.Reporting;
@@ -101,7 +102,7 @@ internal static Dictionary<string, ILocalizationManager> SetupLocalization(Dicti
101102
var versionObj = Assembly.GetExecutingAssembly().GetName().Version;
102103
// 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`?
103104
var version = $"{versionObj.Major}.{versionObj.Minor}.{versionObj.Build}";
104-
var flexBridgeLocMan = LocalizationManager.Create(desiredUiLangId, FlexBridge, Application.ProductName,
105+
var flexBridgeLocMan = LocalizationManagerWinforms.Create(desiredUiLangId, FlexBridge, Application.ProductName,
105106
version, installedL10nBaseDir, userL10nBaseDir, CommonResources.chorus,
106107
FlexLocalizationEmailAddress, new [] { FlexBridge, "TriboroughBridge_ChorusPlugin", "FLEx_ChorusPlugin", "SIL.LiftBridge" });
107108
results.Add("FlexBridge", flexBridgeLocMan);
@@ -111,13 +112,13 @@ internal static Dictionary<string, ILocalizationManager> SetupLocalization(Dicti
111112

112113
versionObj = Assembly.GetAssembly(typeof(ChorusSystem)).GetName().Version;
113114
version = "" + versionObj.Major + "." + versionObj.Minor + "." + versionObj.Build;
114-
var chorusLocMan = LocalizationManager.Create(desiredUiLangId, "Chorus", "Chorus",
115+
var chorusLocMan = LocalizationManagerWinforms.Create(desiredUiLangId, "Chorus", "Chorus",
115116
version, installedL10nBaseDir, userL10nBaseDir, CommonResources.chorus, FlexLocalizationEmailAddress, new []{ "Chorus" });
116117
results.Add("Chorus", chorusLocMan);
117118

118119
versionObj = Assembly.GetAssembly(typeof(ErrorReport)).GetName().Version;
119120
version = "" + versionObj.Major + "." + versionObj.Minor + "." + versionObj.Build;
120-
var palasoLocMan = LocalizationManager.Create(desiredUiLangId, "Palaso", "Palaso",
121+
var palasoLocMan = LocalizationManagerWinforms.Create(desiredUiLangId, "Palaso", "Palaso",
121122
version, installedL10nBaseDir, userL10nBaseDir, CommonResources.chorus, FlexLocalizationEmailAddress, new []{ "SIL" });
122123
results.Add("Palaso", palasoLocMan);
123124
}

src/TriboroughBridge-ChorusPlugin/View/BridgeConflictView.Designer.cs

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)