Skip to content

Commit

Permalink
Update dependencies and make L10nSharp API change
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonleenaylor committed Nov 27, 2024
1 parent 6cd82bd commit 4d87b23
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ 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-beta*</ChorusVersion>
<LCModelVersion>10.2.0-beta*</LCModelVersion>
<ChorusVersion>6.0.0-beta0059</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="6.0.0" />
<PackageReference Include="L10NSharp" Version="8.0.0-beta0005" />
</ItemGroup>
</Project>
12 changes: 6 additions & 6 deletions src/TriboroughBridge-ChorusPlugin/TriboroughBridgeUtilities.cs
Original file line number Diff line number Diff line change
Expand Up @@ -101,24 +101,24 @@ 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(TranslationMemory.XLiff, desiredUiLangId, FlexBridge, Application.ProductName,
var flexBridgeLocMan = LocalizationManager.Create(desiredUiLangId, FlexBridge, Application.ProductName,
version, installedL10nBaseDir, userL10nBaseDir, CommonResources.chorus,
FlexLocalizationEmailAddress, FlexBridge, "TriboroughBridge_ChorusPlugin", "FLEx_ChorusPlugin", "SIL.LiftBridge");
FlexLocalizationEmailAddress, new [] { FlexBridge, "TriboroughBridge_ChorusPlugin", "FLEx_ChorusPlugin", "SIL.LiftBridge" });
results.Add("FlexBridge", flexBridgeLocMan);

// In case the UI language was unavailable, change it, so we don't frustrate the user with three dialogs.
desiredUiLangId = LocalizationManager.UILanguageId;

versionObj = Assembly.GetAssembly(typeof(ChorusSystem)).GetName().Version;
version = "" + versionObj.Major + "." + versionObj.Minor + "." + versionObj.Build;
var chorusLocMan = LocalizationManager.Create(TranslationMemory.XLiff, desiredUiLangId, "Chorus", "Chorus",
version, installedL10nBaseDir, userL10nBaseDir, CommonResources.chorus, FlexLocalizationEmailAddress, "Chorus");
var chorusLocMan = LocalizationManager.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(TranslationMemory.XLiff, desiredUiLangId, "Palaso", "Palaso",
version, installedL10nBaseDir, userL10nBaseDir, CommonResources.chorus, FlexLocalizationEmailAddress, "SIL");
var palasoLocMan = LocalizationManager.Create(desiredUiLangId, "Palaso", "Palaso",
version, installedL10nBaseDir, userL10nBaseDir, CommonResources.chorus, FlexLocalizationEmailAddress, new []{ "SIL" });
results.Add("Palaso", palasoLocMan);
}
catch (Exception e)
Expand Down

0 comments on commit 4d87b23

Please sign in to comment.