fixup! refactor(core): use font_id_t instead of plain int

trezor · Sep 19, 2024 · 00e4847 · 00e4847
1 parent 6ee035d
commit 00e4847
Show file tree

Hide file tree

Showing 9 changed files with 158 additions and 155 deletions.
diff --git a/core/translations/cs.json b/core/translations/cs.json
@@ -1,34 +1,34 @@
 {
   "fonts": {
     "##Safe3": {
-      "1_FONT_NORMAL": "font_pixeloperator_regular_8_cs.json",
+      "0_FONT_NORMAL": "font_pixeloperator_regular_8_cs.json",
+      "1_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_cs.json",
       "2_FONT_BOLD": "font_pixeloperator_bold_8_cs.json",
-      "3_FONT_MONO": "font_pixeloperatormono_regular_8_cs.json",
-      "4_FONT_BIG": "font_unifont_regular_16_cs.json",
-      "5_FONT_DEMIBOLD": "font_unifont_bold_16_cs.json",
-      "6_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_cs.json",
-      "7_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_cs.json",
-      "8_FONT_SUB": null
+      "3_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_cs.json",
+      "4_FONT_DEMIBOLD": "font_unifont_bold_16_cs.json",
+      "5_FONT_MONO": "font_pixeloperatormono_regular_8_cs.json",
+      "6_FONT_BIG": "font_unifont_regular_16_cs.json",
+      "7_FONT_SUB": null
     },
     "T2T1": {
-      "1_FONT_NORMAL": "font_tthoves_regular_21_cs.json",
+      "0_FONT_NORMAL": "font_tthoves_regular_21_cs.json",
+      "1_FONT_NORMAL_UPPER": null,
       "2_FONT_BOLD": null,
-      "3_FONT_MONO": "font_robotomono_medium_20_cs.json",
-      "4_FONT_BIG": null,
-      "5_FONT_DEMIBOLD": "font_tthoves_demibold_21_cs.json",
-      "6_FONT_NORMAL_UPPER": null,
-      "7_FONT_BOLD_UPPER": "font_tthoves_bold_17_upper_cs.json",
-      "8_FONT_SUB": null
+      "3_FONT_BOLD_UPPER": "font_tthoves_bold_17_upper_cs.json",
+      "4_FONT_DEMIBOLD": "font_tthoves_demibold_21_cs.json",
+      "5_FONT_MONO": "font_robotomono_medium_20_cs.json",
+      "6_FONT_BIG": null,
+      "7_FONT_SUB": null
     },
     "T3T1": {
-      "1_FONT_NORMAL": "font_ttsatoshi_demibold_21_cs.json",
+      "0_FONT_NORMAL": "font_ttsatoshi_demibold_21_cs.json",
+      "1_FONT_NORMAL_UPPER": null,
       "2_FONT_BOLD": "font_ttsatoshi_demibold_21_cs.json",
-      "3_FONT_MONO": "font_robotomono_medium_21_cs.json",
-      "4_FONT_BIG": null,
-      "5_FONT_DEMIBOLD": "font_ttsatoshi_demibold_21_cs.json",
-      "6_FONT_NORMAL_UPPER": null,
-      "7_FONT_BOLD_UPPER": null,
-      "8_FONT_SUB": "font_ttsatoshi_demibold_18_cs.json"
+      "3_FONT_BOLD_UPPER": null,
+      "4_FONT_DEMIBOLD": "font_ttsatoshi_demibold_21_cs.json",
+      "5_FONT_MONO": "font_robotomono_medium_21_cs.json",
+      "6_FONT_BIG": null,
+      "7_FONT_SUB": "font_ttsatoshi_demibold_18_cs.json"
     }
   },
   "header": {

diff --git a/core/translations/de.json b/core/translations/de.json
@@ -1,34 +1,34 @@
 {
   "fonts": {
     "##Safe3": {
-      "1_FONT_NORMAL": "font_pixeloperator_regular_8_de.json",
+      "0_FONT_NORMAL": "font_pixeloperator_regular_8_de.json",
+      "1_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_de.json",
       "2_FONT_BOLD": "font_pixeloperator_bold_8_de.json",
-      "3_FONT_MONO": "font_pixeloperatormono_regular_8_de.json",
-      "4_FONT_BIG": "font_unifont_regular_16_de.json",
-      "5_FONT_DEMIBOLD": "font_unifont_bold_16_de.json",
-      "6_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_de.json",
-      "7_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_de.json",
-      "8_FONT_SUB": null
+      "3_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_de.json",
+      "4_FONT_DEMIBOLD": "font_unifont_bold_16_de.json",
+      "5_FONT_MONO": "font_pixeloperatormono_regular_8_de.json",
+      "6_FONT_BIG": "font_unifont_regular_16_de.json",
+      "7_FONT_SUB": null
     },
     "T2T1": {
-      "1_FONT_NORMAL": "font_tthoves_regular_21_de.json",
+      "0_FONT_NORMAL": "font_tthoves_regular_21_de.json",
+      "1_FONT_NORMAL_UPPER": null,
       "2_FONT_BOLD": null,
-      "3_FONT_MONO": "font_robotomono_medium_20_de.json",
-      "4_FONT_BIG": null,
-      "5_FONT_DEMIBOLD": "font_tthoves_demibold_21_de.json",
-      "6_FONT_NORMAL_UPPER": null,
-      "7_FONT_BOLD_UPPER": "font_tthoves_bold_17_upper_de.json",
-      "8_FONT_SUB": null
+      "3_FONT_BOLD_UPPER": "font_tthoves_bold_17_upper_de.json",
+      "4_FONT_DEMIBOLD": "font_tthoves_demibold_21_de.json",
+      "5_FONT_MONO": "font_robotomono_medium_20_de.json",
+      "6_FONT_BIG": null,
+      "7_FONT_SUB": null
     },
     "T3T1": {
-      "1_FONT_NORMAL": "font_ttsatoshi_demibold_21_de.json",
+      "0_FONT_NORMAL": "font_ttsatoshi_demibold_21_de.json",
+      "1_FONT_NORMAL_UPPER": null,
       "2_FONT_BOLD": "font_ttsatoshi_demibold_21_de.json",
-      "3_FONT_MONO": "font_robotomono_medium_21_de.json",
-      "4_FONT_BIG": null,
-      "5_FONT_DEMIBOLD": "font_ttsatoshi_demibold_21_de.json",
-      "6_FONT_NORMAL_UPPER": null,
-      "7_FONT_BOLD_UPPER": null,
-      "8_FONT_SUB": "font_ttsatoshi_demibold_18_de.json"
+      "3_FONT_BOLD_UPPER": null,
+      "4_FONT_DEMIBOLD": "font_ttsatoshi_demibold_21_de.json",
+      "5_FONT_MONO": "font_robotomono_medium_21_de.json",
+      "6_FONT_BIG": null,
+      "7_FONT_SUB": "font_ttsatoshi_demibold_18_de.json"
     }
   },
   "header": {

diff --git a/core/translations/es.json b/core/translations/es.json
@@ -1,34 +1,34 @@
 {
   "fonts": {
     "##Safe3": {
-      "1_FONT_NORMAL": "font_pixeloperator_regular_8_es.json",
+      "0_FONT_NORMAL": "font_pixeloperator_regular_8_es.json",
+      "1_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_es.json",
       "2_FONT_BOLD": "font_pixeloperator_bold_8_es.json",
-      "3_FONT_MONO": "font_pixeloperatormono_regular_8_es.json",
-      "4_FONT_BIG": "font_unifont_regular_16_es.json",
-      "5_FONT_DEMIBOLD": "font_unifont_bold_16_es.json",
-      "6_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_es.json",
-      "7_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_es.json",
-      "8_FONT_SUB": null
+      "3_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_es.json",
+      "4_FONT_DEMIBOLD": "font_unifont_bold_16_es.json",
+      "5_FONT_MONO": "font_pixeloperatormono_regular_8_es.json",
+      "6_FONT_BIG": "font_unifont_regular_16_es.json",
+      "7_FONT_SUB": null
     },
     "T2T1": {
-      "1_FONT_NORMAL": "font_tthoves_regular_21_es.json",
+      "0_FONT_NORMAL": "font_tthoves_regular_21_es.json",
+      "1_FONT_NORMAL_UPPER": null,
       "2_FONT_BOLD": null,
-      "3_FONT_MONO": "font_robotomono_medium_20_es.json",
-      "4_FONT_BIG": null,
-      "5_FONT_DEMIBOLD": "font_tthoves_demibold_21_es.json",
-      "6_FONT_NORMAL_UPPER": null,
-      "7_FONT_BOLD_UPPER": "font_tthoves_bold_17_upper_es.json",
-      "8_FONT_SUB": null
+      "3_FONT_BOLD_UPPER": "font_tthoves_bold_17_upper_es.json",
+      "4_FONT_DEMIBOLD": "font_tthoves_demibold_21_es.json",
+      "5_FONT_MONO": "font_robotomono_medium_20_es.json",
+      "6_FONT_BIG": null,
+      "7_FONT_SUB": null
     },
     "T3T1": {
-      "1_FONT_NORMAL": "font_ttsatoshi_demibold_21_es.json",
+      "0_FONT_NORMAL": "font_ttsatoshi_demibold_21_es.json",
+      "1_FONT_NORMAL_UPPER": null,
       "2_FONT_BOLD": "font_ttsatoshi_demibold_21_es.json",
-      "3_FONT_MONO": "font_robotomono_medium_21_es.json",
-      "4_FONT_BIG": null,
-      "5_FONT_DEMIBOLD": "font_ttsatoshi_demibold_21_es.json",
-      "6_FONT_NORMAL_UPPER": null,
-      "7_FONT_BOLD_UPPER": null,
-      "8_FONT_SUB": "font_ttsatoshi_demibold_18_es.json"
+      "3_FONT_BOLD_UPPER": null,
+      "4_FONT_DEMIBOLD": "font_ttsatoshi_demibold_21_es.json",
+      "5_FONT_MONO": "font_robotomono_medium_21_es.json",
+      "6_FONT_BIG": null,
+      "7_FONT_SUB": "font_ttsatoshi_demibold_18_es.json"
     }
   },
   "header": {

diff --git a/core/translations/fr.json b/core/translations/fr.json
@@ -1,34 +1,34 @@
 {
   "fonts": {
     "##Safe3": {
-      "1_FONT_NORMAL": "font_pixeloperator_regular_8_fr.json",
+      "0_FONT_NORMAL": "font_pixeloperator_regular_8_fr.json",
+      "1_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_fr.json",
       "2_FONT_BOLD": "font_pixeloperator_bold_8_fr.json",
-      "3_FONT_MONO": "font_pixeloperatormono_regular_8_fr.json",
-      "4_FONT_BIG": "font_unifont_regular_16_fr.json",
-      "5_FONT_DEMIBOLD": "font_unifont_bold_16_fr.json",
-      "6_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_fr.json",
-      "7_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_fr.json",
-      "8_FONT_SUB": null
+      "3_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_fr.json",
+      "4_FONT_DEMIBOLD": "font_unifont_bold_16_fr.json",
+      "5_FONT_MONO": "font_pixeloperatormono_regular_8_fr.json",
+      "6_FONT_BIG": "font_unifont_regular_16_fr.json",
+      "7_FONT_SUB": null
     },
     "T2T1": {
-      "1_FONT_NORMAL": "font_tthoves_regular_21_fr.json",
+      "0_FONT_NORMAL": "font_tthoves_regular_21_fr.json",
+      "1_FONT_NORMAL_UPPER": null,
       "2_FONT_BOLD": null,
-      "3_FONT_MONO": "font_robotomono_medium_20_fr.json",
-      "4_FONT_BIG": null,
-      "5_FONT_DEMIBOLD": "font_tthoves_demibold_21_fr.json",
-      "6_FONT_NORMAL_UPPER": null,
-      "7_FONT_BOLD_UPPER": "font_tthoves_bold_17_upper_fr.json",
-      "8_FONT_SUB": null
+      "3_FONT_BOLD_UPPER": "font_tthoves_bold_17_upper_fr.json",
+      "4_FONT_DEMIBOLD": "font_tthoves_demibold_21_fr.json",
+      "5_FONT_MONO": "font_robotomono_medium_20_fr.json",
+      "6_FONT_BIG": null,
+      "7_FONT_SUB": null
     },
     "T3T1": {
-      "1_FONT_NORMAL": "font_ttsatoshi_demibold_21_fr.json",
+      "0_FONT_NORMAL": "font_ttsatoshi_demibold_21_fr.json",
+      "1_FONT_NORMAL_UPPER": null,
       "2_FONT_BOLD": "font_ttsatoshi_demibold_21_fr.json",
-      "3_FONT_MONO": "font_robotomono_medium_21_fr.json",
-      "4_FONT_BIG": null,
-      "5_FONT_DEMIBOLD": "font_ttsatoshi_demibold_21_fr.json",
-      "6_FONT_NORMAL_UPPER": null,
-      "7_FONT_BOLD_UPPER": null,
-      "8_FONT_SUB": "font_ttsatoshi_demibold_18_fr.json"
+      "3_FONT_BOLD_UPPER": null,
+      "4_FONT_DEMIBOLD": "font_ttsatoshi_demibold_21_fr.json",
+      "5_FONT_MONO": "font_robotomono_medium_21_fr.json",
+      "6_FONT_BIG": null,
+      "7_FONT_SUB": "font_ttsatoshi_demibold_18_fr.json"
     }
   },
   "header": {

diff --git a/core/translations/it.json b/core/translations/it.json
@@ -1,34 +1,34 @@
 {
   "fonts": {
     "##Safe3": {
-      "1_FONT_NORMAL": "font_pixeloperator_regular_8_it.json",
+      "0_FONT_NORMAL": "font_pixeloperator_regular_8_it.json",
+      "1_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_it.json",
       "2_FONT_BOLD": "font_pixeloperator_bold_8_it.json",
-      "3_FONT_MONO": "font_pixeloperatormono_regular_8_it.json",
-      "4_FONT_BIG": "font_unifont_regular_16_it.json",
-      "5_FONT_DEMIBOLD": "font_unifont_bold_16_it.json",
-      "6_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_it.json",
-      "7_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_it.json",
-      "8_FONT_SUB": null
+      "3_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_it.json",
+      "4_FONT_DEMIBOLD": "font_unifont_bold_16_it.json",
+      "5_FONT_MONO": "font_pixeloperatormono_regular_8_it.json",
+      "6_FONT_BIG": "font_unifont_regular_16_it.json",
+      "7_FONT_SUB": null
     },
     "T2T1": {
-      "1_FONT_NORMAL": "font_tthoves_regular_21_it.json",
+      "0_FONT_NORMAL": "font_tthoves_regular_21_it.json",
+      "1_FONT_NORMAL_UPPER": null,
       "2_FONT_BOLD": null,
-      "3_FONT_MONO": "font_robotomono_medium_20_it.json",
-      "4_FONT_BIG": null,
-      "5_FONT_DEMIBOLD": "font_tthoves_demibold_21_it.json",
-      "6_FONT_NORMAL_UPPER": null,
-      "7_FONT_BOLD_UPPER": "font_tthoves_bold_17_upper_it.json",
-      "8_FONT_SUB": null
+      "3_FONT_BOLD_UPPER": "font_tthoves_bold_17_upper_it.json",
+      "4_FONT_DEMIBOLD": "font_tthoves_demibold_21_it.json",
+      "5_FONT_MONO": "font_robotomono_medium_20_it.json",
+      "6_FONT_BIG": null,
+      "7_FONT_SUB": null
     },
     "T3T1": {
-      "1_FONT_NORMAL": "font_ttsatoshi_demibold_21_it.json",
+      "0_FONT_NORMAL": "font_ttsatoshi_demibold_21_it.json",
+      "1_FONT_NORMAL_UPPER": null,
       "2_FONT_BOLD": "font_ttsatoshi_demibold_21_it.json",
-      "3_FONT_MONO": "font_robotomono_medium_21_it.json",
-      "4_FONT_BIG": null,
-      "5_FONT_DEMIBOLD": "font_ttsatoshi_demibold_21_it.json",
-      "6_FONT_NORMAL_UPPER": null,
-      "7_FONT_BOLD_UPPER": null,
-      "8_FONT_SUB": "font_ttsatoshi_demibold_18_it.json"
+      "3_FONT_BOLD_UPPER": null,
+      "4_FONT_DEMIBOLD": "font_ttsatoshi_demibold_21_it.json",
+      "5_FONT_MONO": "font_robotomono_medium_21_it.json",
+      "6_FONT_BIG": null,
+      "7_FONT_SUB": "font_ttsatoshi_demibold_18_it.json"
     }
   },
   "header": {

diff --git a/core/translations/pt.json b/core/translations/pt.json
@@ -1,34 +1,34 @@
 {
   "fonts": {
     "##Safe3": {
-      "1_FONT_NORMAL": "font_pixeloperator_regular_8_pt.json",
+      "0_FONT_NORMAL": "font_pixeloperator_regular_8_pt.json",
+      "1_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_pt.json",
       "2_FONT_BOLD": "font_pixeloperator_bold_8_pt.json",
-      "3_FONT_MONO": "font_pixeloperatormono_regular_8_pt.json",
-      "4_FONT_BIG": "font_unifont_regular_16_pt.json",
-      "5_FONT_DEMIBOLD": "font_unifont_bold_16_pt.json",
-      "6_FONT_NORMAL_UPPER": "font_pixeloperator_regular_8_upper_pt.json",
-      "7_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_pt.json",
-      "8_FONT_SUB": null
+      "3_FONT_BOLD_UPPER": "font_pixeloperator_bold_8_upper_pt.json",
+      "4_FONT_DEMIBOLD": "font_unifont_bold_16_pt.json",
+      "5_FONT_MONO": "font_pixeloperatormono_regular_8_pt.json",
+      "6_FONT_BIG": "font_unifont_regular_16_pt.json",
+      "7_FONT_SUB": null
     },
     "T2T1": {
-      "1_FONT_NORMAL": "font_tthoves_regular_21_pt.json",
+      "0_FONT_NORMAL": "font_tthoves_regular_21_pt.json",
+      "1_FONT_NORMAL_UPPER": null,
       "2_FONT_BOLD": null,
-      "3_FONT_MONO": "font_robotomono_medium_20_pt.json",
-      "4_FONT_BIG": null,
-      "5_FONT_DEMIBOLD": "font_tthoves_demibold_21_pt.json",
-      "6_FONT_NORMAL_UPPER": null,
-      "7_FONT_BOLD_UPPER": "font_tthoves_bold_17_upper_pt.json",
-      "8_FONT_SUB": null
+      "3_FONT_BOLD_UPPER": "font_tthoves_bold_17_upper_pt.json",
+      "4_FONT_DEMIBOLD": "font_tthoves_demibold_21_pt.json",
+      "5_FONT_MONO": "font_robotomono_medium_20_pt.json",
+      "6_FONT_BIG": null,
+      "7_FONT_SUB": null
     },
     "T3T1": {
-      "1_FONT_NORMAL": "font_ttsatoshi_demibold_21_pt.json",
+      "0_FONT_NORMAL": "font_ttsatoshi_demibold_21_pt.json",
+      "1_FONT_NORMAL_UPPER": null,
       "2_FONT_BOLD": "font_ttsatoshi_demibold_21_pt.json",
-      "3_FONT_MONO": "font_robotomono_medium_21_pt.json",
-      "4_FONT_BIG": null,
-      "5_FONT_DEMIBOLD": "font_ttsatoshi_demibold_21_pt.json",
-      "6_FONT_NORMAL_UPPER": null,
-      "7_FONT_BOLD_UPPER": null,
-      "8_FONT_SUB": "font_ttsatoshi_demibold_18_pt.json"
+      "3_FONT_BOLD_UPPER": null,
+      "4_FONT_DEMIBOLD": "font_ttsatoshi_demibold_21_pt.json",
+      "5_FONT_MONO": "font_robotomono_medium_21_pt.json",
+      "6_FONT_BIG": null,
+      "7_FONT_SUB": "font_ttsatoshi_demibold_18_pt.json"
     }
   },
   "header": {

diff --git a/core/translations/signatures.json b/core/translations/signatures.json
@@ -1,8 +1,8 @@
 {
   "current": {
-    "merkle_root": "3f354ff51c2d3855bf128509cd29b88c442eb7421f40e3788c1999cbbbe852eb",
-    "datetime": "2024-09-16T08:04:38.685162",
-    "commit": "1fac12992b035ba9ed86399ba00d52ca44cc9bc5"
+    "merkle_root": "7f1fee76a3b387c4b892b9b5275d7056730221899ee8d1cc33db50876199e29c",
+    "datetime": "2024-09-19T10:31:56.736930",
+    "commit": "877d39e8b5a2041cf0b21134fe74e3fbc5619ad4"
   },
   "history": [
     {