From a442ce627dff5c24132b0f1aaf783b46e1622805 Mon Sep 17 00:00:00 2001 From: justvanrossum Date: Thu, 1 Nov 2018 09:52:06 +0100 Subject: [PATCH] work towards making name strings localizable --- Lib/fontTools/fontBuilder.py | 8 +++----- Tests/fontBuilder/fontBuilder_test.py | 6 ++++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Lib/fontTools/fontBuilder.py b/Lib/fontTools/fontBuilder.py index 267ba8e2b..c9aed9261 100644 --- a/Lib/fontTools/fontBuilder.py +++ b/Lib/fontTools/fontBuilder.py @@ -250,11 +250,9 @@ class FontBuilder(object): nameID = nameName else: nameID = _nameIDs[nameName] - if not isinstance(nameValue, basestring): - nameValue, language = nameValue - else: - language = "en" - nameTable.addMultilingualName({language: nameValue}, ttFont=self.font, nameID=nameID) + if isinstance(nameValue, basestring): + nameValue = dict(en=nameValue) + nameTable.addMultilingualName(nameValue, ttFont=self.font, nameID=nameID) def setupOS2(self, **values): if "xAvgCharWidth" not in values: diff --git a/Tests/fontBuilder/fontBuilder_test.py b/Tests/fontBuilder/fontBuilder_test.py index c2b6eff07..54745427d 100644 --- a/Tests/fontBuilder/fontBuilder_test.py +++ b/Tests/fontBuilder/fontBuilder_test.py @@ -41,8 +41,10 @@ def _setupFontBuilder(isTTF): advanceWidths = {".notdef": 600, "A": 600, "a": 600, ".null": 600} - nameStrings = dict(familyName="HelloTestFont", styleName="TotallyNormal") - nameStrings['psName'] = nameStrings["familyName"] + "-" + nameStrings["styleName"] + familyName = "HelloTestFont" + styleName = "TotallyNormal" + nameStrings = dict(familyName=dict(en="HelloTestFont"), styleName=dict(en="TotallyNormal")) + nameStrings['psName'] = familyName + "-" + styleName return fb, advanceWidths, nameStrings