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
8 changes: 3 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

### Changed
- [SIL.Windows.Forms] BREAKING CHANGE: Removed optional moreSelected parameter from ToolStripExtensions.InitializeWithAvailableUILocales method. This parameter was no longer being used. Clients that want to have a More menu item that performs a custom action will now need to add it themselves.

### Added
- [SIL.Core.Clearshare] Added new classes MetadataCore, CreativeCommonsLicenseInfo, and CustomLicenseInfo; these are Winforms-free base versions of the classes Metadata, CreativeCommonsLicense, and CustomLicense.

Expand Down Expand Up @@ -49,10 +46,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- [SIL.Windows.Forms] Add a reference to L10nSharp.Windows.Forms v9.
- [SIL.Windows.Forms.Keyboarding] BREAKING CHANGE: Upgraded to L10nSharp v9. Any clients which also use L10nSharp must also upgrade to v9.
- [SIL.Windows.Forms.Keyboarding] Add a reference to L10nSharp.Windows.Forms v9.
- [SIL.Windows.Forms] BREAKING CHANGE: ToolStripExtensions.InitializeWithAvailableUILocales() removed the ILocalizationManager parameter. This method no longer provides functionality to display the localization dialog box in response to the user clicking More.
- [SIL.Windows.Forms] BREAKING CHANGE: ToolStripExtensions.InitializeWithAvailableUILocales() removed the ILocalizationManager parameter. This method no longer provides functionality to display the localization dialog box in response to the user clicking More.
- [SIL.Windows.Forms] BREAKING CHANGE: Removed optional moreSelected parameter from ToolStripExtensions.InitializeWithAvailableUILocales method. This parameter was no longer being used. Clients that want to have a More menu item that performs a custom action will now need to add it themselves.
- [SIL.Windows.Forms] BREAKING CHANGE: LocalizationIncompleteDlg's EmailAddressForLocalizationRequests is no longer autopopulated from LocalizationManager. A new optional constructor parameter, emailAddressForLocalizationRequests, can be used instead. If not supplied, the "More information" controls will be hidden.

### Removed

- [SIL.Windows.Forms] In .NET 8 builds, removed Scanner and Camera options from the Image Toolbox.

## [16.2.0] - 2025-09-24
Expand Down
2 changes: 1 addition & 1 deletion SIL.Core.Desktop/SIL.Core.Desktop.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="L10NSharp" Version="9.0.0-*" />
<PackageReference Include="L10NSharp" Version="10.0.0-beta0001" />
<PackageReference Include="Markdig.Signed" Version="0.37.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="NDesk.DBus" Version="0.15.0" Condition=" $(DefineConstants.Contains('NETFRAMEWORK')) " />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="L10NSharp" Version="9.0.0-*" />
<PackageReference Include="L10NSharp.Windows.Forms" Version="9.0.0-*" />
<PackageReference Include="L10NSharp" Version="10.0.0-beta0001" />
<PackageReference Include="L10NSharp.Windows.Forms" Version="10.0.0-beta0001" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.2" />
<PackageReference Include="ibusdotnet" Version="2.0.3" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="L10NSharp" Version="9.0.0-*" />
<PackageReference Include="L10NSharp.Windows.Forms" Version="9.0.0-*" />
<PackageReference Include="L10NSharp" Version="10.0.0-beta0001" />
<PackageReference Include="L10NSharp.Windows.Forms" Version="10.0.0-beta0001" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Mono.Unix" Version="7.1.0-final.1.21458.1" />
<PackageReference Include="SIL.ReleaseTasks" Version="3.1.1" PrivateAssets="All" />
Expand Down
4 changes: 2 additions & 2 deletions SIL.Windows.Forms.Tests/SIL.Windows.Forms.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="L10NSharp" Version="9.0.0-*" />
<PackageReference Include="L10NSharp.Windows.Forms" Version="9.0.0-*" />
<PackageReference Include="L10NSharp" Version="10.0.0-beta0001" />
<PackageReference Include="L10NSharp.Windows.Forms" Version="10.0.0-beta0001" />
<PackageReference Include="Markdig.Signed" Version="0.37.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.2" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,15 @@ public LocalizationIncompleteDlg(LocalizationIncompleteViewModel model)
_linkCrowdinAndEmailInstructions.Visible =
_model.CrowdinProjectUrl != null;

_lblMoreInformationEmail.Text = string.Format(_lblMoreInformationEmail.Text,
model.EmailAddressForLocalizationRequests);
if (model.EmailAddressForLocalizationRequests == null)
{
_lblMoreInformationEmail.Visible = _btnCopy.Visible = false;
}
else
{
_lblMoreInformationEmail.Text = string.Format(_lblMoreInformationEmail.Text,
model.EmailAddressForLocalizationRequests);
}
}

private void btnOk_Click(object sender, EventArgs e)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ public class LocalizationIncompleteViewModel
[CLSCompliant(false)]
public ILocalizationManager PrimaryLocalizationManager { get; }

public string EmailAddressForLocalizationRequests =>
LocalizationManager.EmailForSubmissions;
public string EmailAddressForLocalizationRequests { get; }

private readonly string _crowdinProjectName;
private readonly Action _issueRequestForLocalization;
Expand Down Expand Up @@ -48,14 +47,18 @@ public class LocalizationIncompleteViewModel
/// part of the Crowdin project's URL following https://crowdin.com/project/</param>
/// <param name="issueRequestForLocalization">An action to handle issuing a localization
/// request (typically by passing the <see cref="StandardAnalyticsInfo"/> to
/// DesktopAnalytics.Track</param>
/// DesktopAnalytics.Track)</param>
/// <param name="emailAddressForLocalizationRequests">Optional email address to display in
/// order for the user to be able to request more information.</param>
[CLSCompliant(false)]
public LocalizationIncompleteViewModel(ILocalizationManager appLm,
string crowdinProjectName, Action issueRequestForLocalization)
string crowdinProjectName, Action issueRequestForLocalization,
string emailAddressForLocalizationRequests = null)
{
PrimaryLocalizationManager = appLm;
_crowdinProjectName = crowdinProjectName;
_issueRequestForLocalization = issueRequestForLocalization;
EmailAddressForLocalizationRequests = emailAddressForLocalizationRequests;
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions SIL.Windows.Forms/SIL.Windows.Forms.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<ItemGroup>
<PackageReference Include="Enchant.Net" Version="1.4.2" />
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="All" />
<PackageReference Include="L10NSharp" Version="9.0.0-*" />
<PackageReference Include="L10NSharp.Windows.Forms" Version="9.0.0-*" />
<PackageReference Include="L10NSharp" Version="10.0.0-beta0001" />
<PackageReference Include="L10NSharp.Windows.Forms" Version="10.0.0-beta0001" />
<PackageReference Include="Markdig.Signed" Version="0.37.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Mono.Unix" Version="7.1.0-final.1.21458.1" />
Expand Down
2 changes: 1 addition & 1 deletion TestApps/ArchivingTestApp/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ static void Main(string[] args)
var localizationFolder = Path.GetDirectoryName(
FileLocationUtilities.GetFileDistributedWithApplication($"Palaso.{preferredUILocale}.xlf"));
PrimaryL10NManager = LocalizationManagerWinforms.Create(preferredUILocale, "Palaso", "Palaso",
"1.0.0", localizationFolder, "SIL/Palaso", null, "testapp@sil.org", new [] {"SIL."});
"1.0.0", localizationFolder, "SIL/Palaso", null, ["SIL."]);

Application.Run(new MainForm());
}
Expand Down
5 changes: 3 additions & 2 deletions TestApps/SIL.Windows.Forms.TestApp/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ namespace SIL.Windows.Forms.TestApp
{
public static class Program
{
internal const string kSupportEmailAddress = "bogus_test_app_email_addr@sil.org";
internal static ILocalizationManager PrimaryL10NManager;

[STAThread]
Expand All @@ -34,7 +35,7 @@ public static void Main(string[] args)
var localizationFolder = Path.GetDirectoryName(
FileLocationUtilities.GetFileDistributedWithApplication($"Palaso.{preferredUILocale}.xlf"));
PrimaryL10NManager = LocalizationManagerWinforms.Create(preferredUILocale, "Palaso", "Palaso",
"1.0.0", localizationFolder, "SIL/Palaso", null, "testapp@sil.org", new [] {"SIL."});
"1.0.0", localizationFolder, "SIL/Palaso", null, new [] {"SIL."});

Application.Run(new TestAppForm());

Expand All @@ -43,7 +44,7 @@ public static void Main(string[] args)

private static void SetUpErrorHandling()
{
ErrorReport.EmailAddress = "bogus_test_app_email_addr@sil.org";
ErrorReport.EmailAddress = kSupportEmailAddress;
ErrorReport.AddStandardProperties();
ExceptionHandler.Init(new WinFormsExceptionHandler());
}
Expand Down
2 changes: 1 addition & 1 deletion TestApps/SIL.Windows.Forms.TestApp/TestAppForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public TestAppForm()
Text = Platform.DesktopEnvironmentInfoString;
_localizationIncompleteViewModel = new LocalizationIncompleteViewModel(
Program.PrimaryL10NManager, "testapp",
IssueAnalyticsRequest);
IssueAnalyticsRequest, Program.kSupportEmailAddress);
_uiLanguageMenu.InitializeWithAvailableUILocales(l => true,
_localizationIncompleteViewModel, additionalNamedLocales:new Dictionary<string, string> {
{ "Some untranslated language", WellKnownSubtags.UnlistedLanguage } });
Expand Down
Loading