arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-19 12:58:13 +00:00
Code Issues Releases Wiki Activity

feat(core): deal with non-breaking spaces

Browse Source 
[no changelog]
This commit is contained in:
Ioan Bizău 2024-07-09 11:28:21 +02:00 committed by Ioan Bizău
parent a35e9ba5fa
commit 5188dfc83d
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/embed/rust/src/translations/generated/translated_string.rs.mako
View File

@ -5,6 +5,7 @@
#![cfg_attr(rustfmt, rustfmt_skip)] #![cfg_attr(rustfmt, rustfmt_skip)]
<% <%
import json import json
import re
ALTCOIN_PREFIXES = ( ALTCOIN_PREFIXES = (
"binance", "binance",
@ -55,7 +56,7 @@ impl TranslatedString {
%if any(name.startswith(prefix + "__") for prefix in ALTCOIN_PREFIXES): %if any(name.startswith(prefix + "__") for prefix in ALTCOIN_PREFIXES):
#[cfg(feature = "universal_fw")] #[cfg(feature = "universal_fw")]
%endif %endif
Self::${name} => ${json.dumps(en_data.get(name, '""'))}, Self::${name} => ${re.sub(r'\\u([0-9a-f]{4})', r'\\u{\g<1>}', json.dumps(en_data.get(name, '""')))},
% endfor % endfor
} }
} }

6
core/embed/rust/src/ui/display/font.rs
View File

@ -285,6 +285,12 @@ impl Font {
} }
pub fn get_glyph(self, ch: char) -> Glyph { pub fn get_glyph(self, ch: char) -> Glyph {
/* have the non-breaking space counted for width but not counted as a
* breaking point */
let ch = match ch {
'\u{00a0}' => '\u{0020}',
c => c,
};
let gl_data = display::get_char_glyph(ch as u16, self.into()); let gl_data = display::get_char_glyph(ch as u16, self.into());
ensure!(!gl_data.is_null(), "Failed to load glyph"); ensure!(!gl_data.is_null(), "Failed to load glyph");

2
tests/translations.py
View File

@ -107,7 +107,7 @@ def _resolve_path_to_texts(
if lower: if lower:
texts = [t.lower() for t in texts] texts = [t.lower() for t in texts]
texts = [t.strip() for t in texts] texts = [t.replace("\xa0", " ").strip() for t in texts]
return texts return texts