diff --git a/kernel/util/font.go b/kernel/util/font.go index 97ad30b7f..0b1824ee4 100644 --- a/kernel/util/font.go +++ b/kernel/util/font.go @@ -125,20 +125,7 @@ func loadFonts() (ret []*Font) { continue } - if sfnt.PlatformLanguageID(1033) == e.LanguageID { - v, _, err := transform.Bytes(textUnicode.UTF16(textUnicode.BigEndian, textUnicode.IgnoreBOM).NewDecoder(), e.Value) - if err != nil { - //LogErrorf("decode font family [%s] failed: %s", fontPath, err) - continue - } - val := string(v) - if sfnt.NameFontFamily == e.NameID && "" != val { - family = val - } - if sfnt.NamePreferredFamily == e.NameID && "" != val { - family = val - } - } else if sfnt.PlatformLanguageID(2052) == e.LanguageID { + if sfnt.PlatformLanguageID(1033) == e.LanguageID || sfnt.PlatformLanguageID(2052) == e.LanguageID { v, _, err := transform.Bytes(textUnicode.UTF16(textUnicode.BigEndian, textUnicode.IgnoreBOM).NewDecoder(), e.Value) if err != nil { //LogErrorf("decode font family [%s] failed: %s", fontPath, err)