Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
5 changes: 3 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ See full changelog at https://github.com/sillsdev/flexbridge/blob/develop/CHANGE
<ChangelogFile>../../CHANGELOG.md</ChangelogFile>
<UseFullSemVerForNuGet>false</UseFullSemVerForNuGet>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<ChorusVersion>6.0.0-beta0061</ChorusVersion>
<ChorusVersion>6.0.0-beta0063</ChorusVersion>
<LCModelVersion>11.0.0-beta*</LCModelVersion>
</PropertyGroup>
<ItemGroup>
<!-- The only reason we depend directly on L10NSharp is because our dependencies can't agree which one they want -->
<PackageReference Include="L10NSharp" Version="8.0.0-beta0005" />
<PackageReference Include="L10NSharp" Version="9.0.0-beta0001" />
<PackageReference Include="L10NSharp.Windows.Forms" Version="9.0.0-beta0001" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
using Chorus;
using Chorus.sync;
using L10NSharp;
using L10NSharp.Windows.Forms;
using LibTriboroughBridgeChorusPlugin;
using SIL.IO;
using SIL.Reporting;
Expand Down Expand Up @@ -101,7 +102,7 @@ internal static Dictionary<string, ILocalizationManager> 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);
Expand All @@ -111,13 +112,13 @@ internal static Dictionary<string, ILocalizationManager> 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);
}
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.