Skip to content

fix FontFamilyAdapter to respect system locale. #213

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
eXpl0it3r merged 1 commit into from
Dec 9, 2025
Merged

fix FontFamilyAdapter to respect system locale. #213

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 5 additions & 20 deletions Source/HtmlRenderer.WPF/Adapters/FontFamilyAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
// - Sun Tsu,
// "The Art of War"

using System.Globalization;
using System.Linq;
using System.Windows.Markup;
using System.Windows.Media;
using TheArtOfDev.HtmlRenderer.Adapters;
Expand All @@ -24,7 +26,7 @@ internal sealed class FontFamilyAdapter : RFontFamily
/// <summary>
/// Default language to get font family name by
/// </summary>
private static readonly XmlLanguage _xmlLanguage = XmlLanguage.GetLanguage("en-us");
private static readonly XmlLanguage _xmlLanguage = XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag);

/// <summary>
/// the underline win-forms font.
Expand All @@ -42,25 +44,8 @@ public FontFamilyAdapter(FontFamily fontFamily)
/// <summary>
/// the underline WPF font family.
/// </summary>
public FontFamily FontFamily
{
get { return _fontFamily; }
}
public FontFamily FontFamily => _fontFamily;

public override string Name
{
get
{
string name = _fontFamily.FamilyNames[_xmlLanguage];
if (string.IsNullOrEmpty(name))
{
foreach (var familyName in _fontFamily.FamilyNames)
{
return familyName.Value;
}
}
return name;
}
}
public override string Name => _fontFamily.FamilyNames.TryGetValue(_xmlLanguage, out var name) ? name : _fontFamily.FamilyNames.FirstOrDefault().Value;
}
}
Loading