Merge branch 'main' into optimize-chinese-transation

hd-zero · Jan 24, 2025 · ddd61d1 · ddd61d1
2 parents d802b1b + 8ae0adc
commit ddd61d1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/mkapp/app/language/zh_hans.ini b/mkapp/app/language/zh_hans.ini
@@ -215,7 +215,7 @@ SD Card integrity check is active = "SD卡完成性检查处于活动状态"
 controls are disabled until process has completed = "此界面暂时被禁用"
 
 ; firmware
-Firmware    = "固件"
+Firmware = "固件"
 Flashing = "更新中"
 SUCCESS = "成功"
 Verification failed, try it again = "验证失败, 再次尝试"
@@ -235,7 +235,6 @@ Release Notes = "发布信息"
 not found = "没有找到"
 Update = "更新"
 Target = "目标"
-Firmware = "固件"
 Current Version = "当前版本"
 Reset all settings = "重置所有设置"
 Update complete = "更新完成"

diff --git a/src/ui/page_version.c b/src/ui/page_version.c
@@ -781,6 +781,8 @@ static void page_version_fw_select_create(const char *device, fw_select_t *fw_se
 
 static lv_obj_t *page_version_create(lv_obj_t *parent, panel_arr_t *arr) {
     char buf[128];
+    static char page_name[32];
+
     lv_obj_t *page = lv_menu_page_create(parent, NULL);
     lv_obj_clear_flag(page, LV_OBJ_FLAG_SCROLLABLE);
     lv_obj_set_size(page, 1053, 900);
@@ -864,6 +866,9 @@ static lv_obj_t *page_version_create(lv_obj_t *parent, panel_arr_t *arr) {
     page_version_fw_select_create(_lang("Goggle"), &fw_select_goggle, flash_goggle);
     page_version_fw_select_create("VTX", &fw_select_vtx, flash_vtx);
 
+    snprintf(page_name, sizeof(page_name), "%s   ", _lang("Firmware"));
+    pp_version.name = page_name;
+
     return page;
 }
 
@@ -1218,7 +1223,7 @@ page_pack_t pp_version = {
         .cur = 0,
         .max = ROW_COUNT,
     },
-    .name = "Firmware   ", // Spaces are necessary to include alert icon.
+    .name = "Firmware   ", // Spaces are necessary to include alert icon. Note name will be overwritten when page_version_create() is called
     .create = page_version_create,
     .enter = page_version_enter,
     .exit = page_version_exit,