From 4d87b239638031477aa7f3ebbf54da5387a4d503 Mon Sep 17 00:00:00 2001 From: Jason Naylor Date: Wed, 27 Nov 2024 14:27:47 -0800 Subject: [PATCH] Update dependencies and make L10nSharp API change --- Directory.Build.props | 6 +++--- .../TriboroughBridgeUtilities.cs | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 76c41f66..30e1b2fc 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -25,11 +25,11 @@ See full changelog at https://github.com/sillsdev/flexbridge/blob/develop/CHANGE ../../CHANGELOG.md false true - 6.0.0-beta* - 10.2.0-beta* + 6.0.0-beta0059 + 11.0.0-beta* - + diff --git a/src/TriboroughBridge-ChorusPlugin/TriboroughBridgeUtilities.cs b/src/TriboroughBridge-ChorusPlugin/TriboroughBridgeUtilities.cs index 019d847e..92b40cd2 100644 --- a/src/TriboroughBridge-ChorusPlugin/TriboroughBridgeUtilities.cs +++ b/src/TriboroughBridge-ChorusPlugin/TriboroughBridgeUtilities.cs @@ -101,9 +101,9 @@ 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(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. @@ -111,14 +111,14 @@ internal static Dictionary SetupLocalization(Dicti 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)