1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-18 05:28:40 +00:00

chore(tools): add rules for buttons and new strings

[no changelog]
This commit is contained in:
grdddj 2024-02-20 11:18:01 +01:00 committed by Jiří Musil
parent a6b02e0311
commit d2167fdd27
2 changed files with 18 additions and 44 deletions

View File

@ -335,12 +335,17 @@
"inputs__cancel": "text,1", "inputs__cancel": "text,1",
"inputs__delete": "text,1", "inputs__delete": "text,1",
"inputs__enter": "text,1", "inputs__enter": "text,1",
"inputs__previous": "text,1",
"inputs__return": "text,1", "inputs__return": "text,1",
"inputs__show": "text,1", "inputs__show": "text,1",
"inputs__space": "text,1", "inputs__space": "text,1",
"joint__title": "title,1", "joint__title": "title,1",
"joint__to_the_total_amount": "text,2", "joint__to_the_total_amount": "text,2",
"joint__you_are_contributing": "text,2", "joint__you_are_contributing": "text,2",
"language__change_to_template": "text,2",
"language__changed": "text,2",
"language__progress": "text,1",
"language__title": "text,1",
"lockscreen__tap_to_connect": "text,1", "lockscreen__tap_to_connect": "text,1",
"lockscreen__tap_to_unlock": "text,1", "lockscreen__tap_to_unlock": "text,1",
"lockscreen__title_locked": "title,1", "lockscreen__title_locked": "title,1",
@ -480,6 +485,7 @@
"progress__authenticity_check": "text,1", "progress__authenticity_check": "text,1",
"progress__done": "text,1", "progress__done": "text,1",
"progress__loading_transaction": "text,1", "progress__loading_transaction": "text,1",
"progress__locking_device": "text,1",
"progress__one_second_left": "text,1", "progress__one_second_left": "text,1",
"progress__please_wait": "text,1", "progress__please_wait": "text,1",
"progress__processing": "text,1", "progress__processing": "text,1",
@ -489,6 +495,7 @@
"progress__x_seconds_left_template": "text,1", "progress__x_seconds_left_template": "text,1",
"reboot_to_bootloader__restart": "text,3", "reboot_to_bootloader__restart": "text,3",
"reboot_to_bootloader__title": "title,1", "reboot_to_bootloader__title": "title,1",
"reboot_to_bootloader__just_a_moment": "title,1",
"reboot_to_bootloader__version_by_template": "text,2", "reboot_to_bootloader__version_by_template": "text,2",
"recovery__cancel_dry_run": "text,2", "recovery__cancel_dry_run": "text,2",
"recovery__check_dry_run": "text,2", "recovery__check_dry_run": "text,2",

View File

@ -16,10 +16,10 @@ class TooLong:
lines_en: list[str] lines_en: list[str]
def __str__(self) -> str: def __str__(self) -> str:
return f"{self.key}: {self.value} --- {self.en} ({len(self.lines)} / {len(self.lines_en)})" return f"{self.key} : {self.value} --- {self.en} ({len(self.lines)} / {len(self.lines_en)})"
altcoins = [ ALTCOINS = [
"binance", "binance",
"cardano", "cardano",
"ethereum", "ethereum",
@ -32,19 +32,8 @@ altcoins = [
"tezos", "tezos",
] ]
def get_value(key: str) -> str:
if "title" in key:
return "title,1"
if "button" in key:
return "button,1"
return "text,1"
# rules = {k: get_value(k) for k in translation_content}
# rules_file.write_text(json.dumps(rules, indent=2, sort_keys=True))
SCREEN_TEXT_WIDTHS = {"TT": 240 - 12, "TS3": 128} SCREEN_TEXT_WIDTHS = {"TT": 240 - 12, "TS3": 128}
MAX_BUTTON_WIDTH = {"TT": 162, "TS3": 88}
FONT_MAPPING = { FONT_MAPPING = {
"TT": { "TT": {
@ -69,37 +58,17 @@ FONTS: dict[str, dict[str, dict[str, int]]] = json.loads(FONTS_FILE.read_text())
def will_fit(text: str, type: str, device: str, lines: int) -> bool: def will_fit(text: str, type: str, device: str, lines: int) -> bool:
needed_lines = get_needed_lines(text, type, device) if type == "button":
return needed_lines <= lines return get_text_width(text, type, device) <= MAX_BUTTON_WIDTH[device]
else:
needed_lines = get_needed_lines(text, type, device)
return needed_lines <= lines
def get_needed_lines(text: str, type: str, device: str) -> int: def get_needed_lines(text: str, type: str, device: str) -> int:
return len(assemble_lines(text, type, device)) return len(assemble_lines(text, type, device))
# def assemble_lines(text: str, type: str, device: str) -> list[str]:
# space_width = get_text_width(" ", type, device)
# words = text.split(" ")
# current_line_length = 0
# current_line = []
# assembled_lines: list[str] = []
# screen_width = SCREEN_TEXT_WIDTHS[device]
# for word in words:
# word_width = get_text_width(word, type, device)
# if current_line_length + word_width <= screen_width:
# current_line.append(word)
# current_line_length += word_width + space_width
# else:
# assembled_lines.append(" ".join(current_line))
# current_line = [word]
# current_line_length = word_width + space_width
# assembled_lines.append(" ".join(current_line))
# return assembled_lines
def assemble_lines(text: str, type: str, device: str) -> list[str]: def assemble_lines(text: str, type: str, device: str) -> list[str]:
space_width = get_text_width(" ", type, device) space_width = get_text_width(" ", type, device)
words = text.replace("\r", "\n").split(" ") # Splitting explicitly by space words = text.replace("\r", "\n").split(" ") # Splitting explicitly by space
@ -176,10 +145,8 @@ def check(language: str) -> list[TooLong]:
wrong: dict[str, TooLong] = {} wrong: dict[str, TooLong] = {}
# new_rules: dict[str, str] = {}
for k, v in list(translation_content.items())[:]: for k, v in list(translation_content.items())[:]:
if k.split("__")[0] in altcoins: if k.split("__")[0] in ALTCOINS:
continue continue
if k.split("__")[0] == "plurals": if k.split("__")[0] == "plurals":
continue continue
@ -191,8 +158,6 @@ def check(language: str) -> list[TooLong]:
type, lines = rule.split(",") type, lines = rule.split(",")
lines = int(lines) lines = int(lines)
# most_needed_lines = 0
for model in DEVICES: for model in DEVICES:
if model == "TT" and k.startswith("tutorial"): if model == "TT" and k.startswith("tutorial"):
continue continue
@ -235,6 +200,8 @@ def test() -> None:
model, model,
4, 4,
) )
assert will_fit("HOLD TO CONFIRM", "button", model, 1)
assert will_fit("OK, I UNDERSTAND", "button", model, 1)
assert will_fit("Choose level of details", "text", "TT", 1) assert will_fit("Choose level of details", "text", "TT", 1)
test_fits_exactly( test_fits_exactly(