- replace internationalized ellipsis with glyph from u8g2_font_siji_t_6x10

MirakelDev · MirakelDev · commit 2207be5c6944 · 2024-01-24T15:01:33.000+01:00
diff --git a/fw/application/src/i18n/de_DE.c b/fw/application/src/i18n/de_DE.c
@@ -7,7 +7,6 @@ const char * const lang_de_DE[_L_COUNT] = {
     [_L_BACK] = "[Zurück]",
     [_L_ERR] = "Fehler",
     [_L_ERR_CODE] = "Fehlercode",
-    [_L_ELLIPSIS] = "...",
     [_L_APP_AMIIBO] = "Amiibo-Emulator",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "BLE-Dateiübertragung",
diff --git a/fw/application/src/i18n/en_US.c b/fw/application/src/i18n/en_US.c
@@ -7,7 +7,6 @@ const char * const lang_en_US[_L_COUNT] = {
     [_L_BACK] = "Back",
     [_L_ERR] = "Error",
     [_L_ERR_CODE] = "Error Code",
-    [_L_ELLIPSIS] = "...",
     [_L_APP_AMIIBO] = "Amiibo Emulator",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "BLE File Transfer",
diff --git a/fw/application/src/i18n/es_ES.c b/fw/application/src/i18n/es_ES.c
@@ -7,7 +7,6 @@ const char * const lang_es_ES[_L_COUNT] = {
     [_L_BACK] = "[Atrás]",
     [_L_ERR] = "Error",
     [_L_ERR_CODE] = "Código error",
-    [_L_ELLIPSIS] = "...",
     [_L_APP_AMIIBO] = "Emulador de amiibo",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "Transferencia BLE",
diff --git a/fw/application/src/i18n/fr_FR.c b/fw/application/src/i18n/fr_FR.c
@@ -7,7 +7,6 @@ const char * const lang_fr_FR[_L_COUNT] = {
     [_L_BACK] = "Retour",
     [_L_ERR] = "Erreur",
     [_L_ERR_CODE] = "Code d'Erreur",
-    [_L_ELLIPSIS] = "...",
     [_L_APP_AMIIBO] = "Emulateur Amiibo",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "Transfert de Fichiers BLE",
diff --git a/fw/application/src/i18n/hu_HU.c b/fw/application/src/i18n/hu_HU.c
@@ -7,7 +7,6 @@ const char * const lang_hu_HU[_L_COUNT] = {
     [_L_BACK] = "Vissza",
     [_L_ERR] = "Hiba",
     [_L_ERR_CODE] = "Hibakód",
-    [_L_ELLIPSIS] = "...",
     [_L_APP_AMIIBO] = "Amiibo Emulátor",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "BLE Fájltovábbítás",
diff --git a/fw/application/src/i18n/ja_JP.c b/fw/application/src/i18n/ja_JP.c
@@ -7,7 +7,6 @@ const char * const lang_ja_JP[_L_COUNT] = {
     [_L_BACK] = "戻る",
     [_L_ERR] = "エラー",
     [_L_ERR_CODE] = "エラーコード",
-    [_L_ELLIPSIS] = "..",
     [_L_APP_AMIIBO] = "Amiiboエミュレータ",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "BLEファイル転送",
diff --git a/fw/application/src/i18n/nl_NL.c b/fw/application/src/i18n/nl_NL.c
@@ -7,7 +7,6 @@ const char * const lang_nl_NL[_L_COUNT] = {
     [_L_BACK] = "Terug",
     [_L_ERR] = "Fout",
     [_L_ERR_CODE] = "Foutcode",
-    [_L_ELLIPSIS] = "...",
     [_L_APP_AMIIBO] = "Amiibo-Emulator",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "BLE Bestandsoverdracht",
diff --git a/fw/application/src/i18n/pt_BR.c b/fw/application/src/i18n/pt_BR.c
@@ -7,7 +7,6 @@ const char * const lang_pt_BR[_L_COUNT] = {
     [_L_BACK] = "Voltar",
     [_L_ERR] = "Erro",
     [_L_ERR_CODE] = "Código de Erro",
-    [_L_ELLIPSIS] = "...",
     [_L_APP_AMIIBO] = "Emulador de Amiibo",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "Transferência de Arquivos BLE",
diff --git a/fw/application/src/i18n/string_id.h b/fw/application/src/i18n/string_id.h
@@ -8,7 +8,6 @@ typedef enum {
     _L_BACK,
     _L_ERR,
     _L_ERR_CODE,
-    _L_ELLIPSIS,
     _L_APP_AMIIBO,
     _L_APP_AMIIBOLINK,
     _L_APP_BLE,
diff --git a/fw/application/src/i18n/zh_Hans.c b/fw/application/src/i18n/zh_Hans.c
@@ -7,7 +7,6 @@ const char * const lang_zh_Hans[_L_COUNT] = {
     [_L_BACK] = "返回",
     [_L_ERR] = "错误",
     [_L_ERR_CODE] = "错误码",
-    [_L_ELLIPSIS] = "..",
     [_L_APP_AMIIBO] = "Amiibo模拟器",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "蓝牙传输",
diff --git a/fw/application/src/i18n/zh_TW.c b/fw/application/src/i18n/zh_TW.c
@@ -7,7 +7,6 @@ const char * const lang_zh_TW[_L_COUNT] = {
     [_L_BACK] = "返回",
     [_L_ERR] = "錯誤",
     [_L_ERR_CODE] = "錯誤碼",
-    [_L_ELLIPSIS] = "..",
     [_L_APP_AMIIBO] = "Amiibo模擬器",
     [_L_APP_AMIIBOLINK] = "AmiiboLink",
     [_L_APP_BLE] = "藍牙傳送",
diff --git a/fw/application/src/mui/mui_canvas.c b/fw/application/src/mui/mui_canvas.c
@@ -64,16 +64,18 @@ uint16_t mui_canvas_draw_utf8_truncate(mui_canvas_t* p_canvas, uint8_t x, uint8_
     char utf8[5];
 
     if (max_width < mui_canvas_get_utf8_width(p_canvas, str)) {
-        max_width -= mui_canvas_get_utf8_width(p_canvas, getLangString(_L_ELLIPSIS));
         while (*p != 0) {
             uint8_t utf8_size = mui_canvas_get_utf8_bytes(p);
             memcpy(utf8, p, utf8_size);
             utf8[utf8_size] = '\0';
-            if (x >= 0 && x <= max_width) {
+            if (x >= 0 && x <= max_width - 8) {
                 uint8_t utf8_w = mui_canvas_draw_utf8(p_canvas, x, y, utf8);
                 x += utf8_w;
             } else {
-                uint8_t utf8_w = mui_canvas_draw_utf8(p_canvas, x, y, getLangString(_L_ELLIPSIS));
+                uint8_t *font = u8g2_GetFont(p_canvas->fb);
+                u8g2_SetFont(p_canvas->fb, u8g2_font_siji_t_6x10);
+                uint8_t utf8_w = mui_canvas_draw_glyph(p_canvas, x, y - 1, 0xe21f);
+                u8g2_SetFont(p_canvas->fb, font);
                 x += utf8_w + 1;
 
                 break;
diff --git a/fw/application/src/mui/mui_canvas.h b/fw/application/src/mui/mui_canvas.h
@@ -2,7 +2,6 @@
 #define MUI_CANVAS_H
 
 #include "mui_common.h"
-#include "i18n/language.h"
 
 typedef struct {
     u8g2_t *fb;
diff --git a/fw/components/u8g2/csrc/u8g2.h b/fw/components/u8g2/csrc/u8g2.h
@@ -1670,6 +1670,7 @@ u8g2_uint_t u8g2_DrawExtUTF8(u8g2_t *u8g2, u8g2_uint_t x, u8g2_uint_t y, uint8_t
 #define u8g2_GetDescent(u8g2) ((u8g2)->font_ref_descent)
 #define u8g2_GetFontAscent(u8g2) ((u8g2)->font_ref_ascent)
 #define u8g2_GetFontDescent(u8g2) ((u8g2)->font_ref_descent)
+#define u8g2_GetFont(u8g2) ((u8g2)->font)
 
 uint8_t u8g2_IsAllValidUTF8(u8g2_t *u8g2, const char *str);	// checks whether all codes are valid
 
diff --git a/fw/data/i18n.csv b/fw/data/i18n.csv
@@ -6,7 +6,6 @@ _L_OFF_F,[OFF],[关],[關],[NO],[KI],[AUS],[DÉSACTIVÉ],[UIT],[DESLIGADO],[オ
 _L_BACK,Back,返回,返回,[Atrás],Vissza,[Zurück],Retour,Terug,Voltar,戻る
 _L_ERR,Error,错误,錯誤,Error,Hiba,Fehler,Erreur,Fout,Erro,エラー
 _L_ERR_CODE,Error Code,错误码,錯誤碼,Código error,Hibakód,Fehlercode,Code d'Erreur,Foutcode,Código de Erro,エラーコード
-_L_ELLIPSIS,...,..,..,...,...,...,...,...,...,..
 _L_APP_AMIIBO,Amiibo Emulator,Amiibo模拟器,Amiibo模擬器,Emulador de amiibo,Amiibo Emulátor,Amiibo-Emulator,Emulateur Amiibo,Amiibo-Emulator,Emulador de Amiibo,Amiiboエミュレータ
 _L_APP_AMIIBOLINK,AmiiboLink,AmiiboLink,AmiiboLink,AmiiboLink,AmiiboLink,AmiiboLink,AmiiboLink,AmiiboLink,AmiiboLink,AmiiboLink
 _L_APP_BLE,BLE File Transfer,蓝牙传输,藍牙傳送,Transferencia BLE,BLE Fájltovábbítás,BLE-Dateiübertragung,Transfert de Fichiers BLE,BLE Bestandsoverdracht,Transferência de Arquivos BLE,BLEファイル転送
