Skip to content

Specify the Culture while searching the font #1129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tonyqus merged 2 commits into from
Aug 17, 2023
Merged

Specify the Culture while searching the font #1129

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58d67eb
Specify the Culture while searchig the font
Bykiev Jul 25, 2023
2004c1f
Merge remote-tracking branch 'upstream/master' into FixSixLaborsFont
Bykiev Aug 13, 2023
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
5 changes: 3 additions & 2 deletions main/SS/Util/SheetUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ namespace NPOI.SS.Util
using System.Collections.Generic;
using SixLabors.Fonts;
using System.Linq;
using System.Globalization;

/**
* Helper methods for when working with Usermodel sheets
Expand Down Expand Up @@ -717,9 +718,9 @@ internal static Font IFont2Font(IFont font1)
// use "Arial". TODO-Fonts: More fallbacks.
SixLabors.Fonts.FontFamily fontFamily;

if (false == SystemFonts.TryGet(font1.FontName, out fontFamily))
if (false == SystemFonts.TryGet(font1.FontName, CultureInfo.CurrentCulture, out fontFamily))
{
if (false == SystemFonts.TryGet("Arial", out fontFamily))
if (false == SystemFonts.TryGet("Arial", CultureInfo.CurrentCulture, out fontFamily))
{
fontFamily = SystemFonts.Families.First();
}
Expand Down