WIP - move translations to core top-level

core/embed/rust/src/translations/generated/translated_string.rs

@@ -1,7 +1,6 @@
-//! generated from enum.out.mako
+//! generated from translated_string.rs.mako
 //! (by running `make templates` in `core`)
 //! do not edit manually!
-
 #[cfg(feature = "micropython")]
 use crate::micropython::qstr::Qstr;
 

core/embed/rust/src/translations/generated/translated_string.rs.mako

@@ -1,20 +1,17 @@
-//! generated from enum.out.mako
+//! generated from ${THIS_FILE.name}
 //! (by running `make templates` in `core`)
 //! do not edit manually!
-
 <%
 import json
-from pathlib import Path
 
-THIS = Path(local.filename).resolve()
-SRCDIR = THIS.parent.parent
+TR_DIR = ROOT / "core" / "translations"
 
-order_file = SRCDIR / "order.json"
+order_file = TR_DIR / "order.json"
 order_index_name = json.loads(order_file.read_text())
 order = {int(k): v for k, v in order_index_name.items()}
 
 
-en_file = SRCDIR / "en.json"
+en_file = TR_DIR / "en.json"
 en_data = json.loads(en_file.read_text())["translations"]
 
 def get_en_strings(data: dict) -> dict[str, str]:

core/embed/rust/src/translations/mod.rs

@@ -4,8 +4,6 @@ mod generated;
 mod micropython;
 mod translated_string;
 
-#[cfg(feature = "micropython")]
-pub use micropython::tr;
 pub use translated_string::TranslatedString as TR;
 
 use crate::{error::Error, io::InputStream};
@@ -159,7 +157,7 @@ struct TranslationsHeader<'a> {
 }
 
 impl<'a> TranslationsHeader<'a> {
-    const MAGIC: [u8; 4] = [84, 82, 84, 82]; // b"TRTR"
+    const MAGIC: &'static [u8] = b"TRTR00";
     const VERSION_LEN: usize = 16;
     const LANG_LEN: usize = 32;
     const DATA_HASH_LEN: usize = 32;
@@ -182,7 +180,7 @@ impl<'a> TranslationsHeader<'a> {
 
         let mut reader = crate::io::InputStream::new(data);
 
-        let magic = reader.read(4)?;
+        let magic = reader.read(Self::MAGIC.len())?;
         if magic != Self::MAGIC {
             return Err(value_error!("Invalid header magic"));
         }

core/tools/codegen/gen_font.py

@@ -24,7 +24,7 @@ HERE = Path(__file__).parent
 CORE_ROOT = HERE.parent.parent
 FONTS_DIR = HERE / "fonts"
 C_FONTS_DEST = CORE_ROOT / "embed" / "lib" / "fonts"
-JSON_FONTS_DEST = CORE_ROOT / "embed" / "rust" / "src" / "ui" / "translations" / "fonts"
+JSON_FONTS_DEST = CORE_ROOT / "translations" / "fonts"
 
 MIN_GLYPH = ord(" ")
 MAX_GLYPH = ord("~")

core/translations/cs.json

@@ -1,13 +1,13 @@
 {
   "font": {
-    "Safe 3": {
+    "T2B1": {
       "1_FONT_NORMAL": "font_pixeloperator_regular_8_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"
     },
-    "T": {
+    "T2T1": {
       "1_FONT_NORMAL": "font_tthoves_regular_21_cs.json",
       "2_FONT_BOLD": "font_tthoves_bold_17_cs.json",
       "3_FONT_MONO": "font_robotomono_medium_20_cs.json",
@@ -18,7 +18,7 @@
   "header": {
     "change_language_prompt": "Zmenit jazyk na cestinu?",
     "change_language_title": "ZMENA JAZYKA",
-    "language": "cs",
+    "language": "csCZ",
     "version": "2.6.5"
   },
   "translations": {

core/translations/fr.json

@@ -1,13 +1,13 @@
 {
   "font": {
-    "Safe 3": {
+    "T2B1": {
       "1_FONT_NORMAL": "font_pixeloperator_regular_8_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"
     },
-    "T": {
+    "T2T1": {
       "1_FONT_NORMAL": "font_tthoves_regular_21_fr.json",
       "2_FONT_BOLD": "font_tthoves_bold_17_fr.json",
       "3_FONT_MONO": "font_robotomono_medium_20_fr.json",
@@ -18,7 +18,7 @@
   "header": {
     "change_language_prompt": "Changer de langue en francais?",
     "change_language_title": "CHANGER LA LANGUE",
-    "language": "fr",
+    "language": "frFR",
     "version": "2.6.5"
   },
   "translations": {