Skip to content

Commit c8b7bd4

Browse files
committed
Use display names whenever possible
1 parent 6a819d1 commit c8b7bd4

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

scripts/tokenide.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ class TokenIDESheet:
3131

3232
def __init__(self, sheet: dict[str] = None):
3333
self.sheet = sheet or {"tokens": {}, "meta": []}
34+
self.sheet["tokens"] |= {"$00": {"string": "", "variants": set(), "attrib": {}, "tokens": {}}}
3435

3536
@staticmethod
3637
def from_xml_string(xml_str: str) -> 'TokenIDESheet':
@@ -137,7 +138,11 @@ def for_version(self, *, version: OsVersion = None, lang: str = 'en') -> 'TokenI
137138
with open(os.path.join(os.path.dirname(__file__), "../8X.xml"), encoding="UTF-8") as file:
138139
tokens = Tokens.from_xml_string(file.read(), version or OsVersions.LATEST)
139140

140-
for byte, token in tokens.bytes.items():
141+
all_bytes = tokens.bytes
142+
all_names = [name for token in all_bytes.values()
143+
for name in {*token.langs.get(lang, "en").names(), token.langs.get(lang, "en").display}]
144+
145+
for byte, token in all_bytes.items():
141146
if version is not None and token.since > version:
142147
continue
143148

@@ -160,9 +165,7 @@ def for_version(self, *, version: OsVersion = None, lang: str = 'en') -> 'TokenI
160165
translation = token.langs.get(lang, "en")
161166
display = translation.display
162167

163-
if new[value]["string"] not in [*translation.names(), display]:
164-
new[value]["string"] = translation.accessible
165-
168+
new[value]["string"] = display if all_names.count(display) == 1 else translation.accessible
166169
new[value]["variants"] |= {*translation.names()}
167170
new[value]["variants"] -= {new[value]["string"]}
168171

0 commit comments

Comments
 (0)