Skip to content

Commit

Permalink
✨ feat: 完美汉化支持,内容逐步更新中
Browse files Browse the repository at this point in the history
  • Loading branch information
kalicyh committed Sep 21, 2024
1 parent 631d830 commit 50be49f
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 66 deletions.
8 changes: 4 additions & 4 deletions applications/main/momentum_app/momentum_app.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ bool momentum_app_apply(MomentumApp* app) {
if(app->show_slideshow) {
callback_reboot(NULL);
} else if(app->require_reboot) {
popup_set_header(app->popup, "Rebooting...", 64, 26, AlignCenter, AlignCenter);
popup_set_text(app->popup, "Applying changes...", 64, 40, AlignCenter, AlignCenter);
popup_set_header(app->popup, "正在重启...", 64, 26, AlignCenter, AlignCenter);
popup_set_text(app->popup, "正在应用更改...", 64, 40, AlignCenter, AlignCenter);
popup_set_callback(app->popup, callback_reboot);
popup_set_context(app->popup, app);
popup_set_timeout(app->popup, 1000);
Expand All @@ -133,8 +133,8 @@ bool momentum_app_apply(MomentumApp* app) {
return true;
} else if(app->apply_pack) {
asset_packs_free();
popup_set_header(app->popup, "Reloading...", 64, 26, AlignCenter, AlignCenter);
popup_set_text(app->popup, "Applying asset pack...", 64, 40, AlignCenter, AlignCenter);
popup_set_header(app->popup, "正在重新加载...", 64, 26, AlignCenter, AlignCenter);
popup_set_text(app->popup, "正在应用资源包...", 64, 40, AlignCenter, AlignCenter);
popup_set_callback(app->popup, NULL);
popup_set_context(app->popup, NULL);
popup_set_timeout(app->popup, 0);
Expand Down
37 changes: 0 additions & 37 deletions applications/services/gui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,40 +66,3 @@ class ElfManifestV1:
```
一万上下不丢个中为主之乐习书了二于些产亮仅介他以仪件份仿休会伤伪位住何余作你使例供保信值储儿允充先光入全公六关其内册写军决准凑出分切列删别到制前剩剪功加动助勿包化匹区匿十升协单卡卸厂压原取受只可右号吃同名后向否含听启呀告命和品哎商器回因围固图在地址坏块型域基堆增声壳备复外多天失头夹好如始姓字存学安完定实容密对将小少尝局屏展左已布常幕并应度建开式引当录形彩影待得循心必志忘忙快忽态怒总恢息您情愤成我或所扇手打执扩扫投护报拔拟择持挂按损据捷掉接控描提插搜操擦收改效数整文新方无日旧时明是显景更最有期未本机杂来析柠查标栈栏栗样核格框桌档桥检棕榄模橄橙次正此步段母比气水池汽法波注洋活测浏海消深添清源满激照片版牌牙特状率环现理生用电画界留略白的监盖盘目真眠睡知短码硬确示禁秒称移程空符等签管箭类粉粘系索紧紫红级纵线绍经绕绝统继维绿缀编置翻而耗背能脚自般色节英范菜蓝蔚藏虚虹行表被装要规视览解警计认议记许设证试误请读调豚贴资超跟跳踪车载辑输边过运返这进连选透通速造道遥部配重量钟钥钮锁错键长闪闭问闲间阅阈限除陪随隐隔需震青静面音项须频题颜额风饱验高黄黑默!:?
```

## 可用函数

```
dialog_ex_set_right_button_text
elements_multiline_text
desktop_view_pin_input_set_label_secondary
elements_button_left
desktop_view_pin_input_set_label_primary
submenu_set_header
submenu_add_item
其他不一一列举了...
```

### 已知bug

暂时没找到方法实现中文的函数

```
snprintf
furi_string_cat_printf
dialog_ex_set_header
dialog_ex_set_text
elements_multiline_text_aligned
popup_set_header
popup_set_text
```

能中文但是显示异常

```
dialog_ex_set_left_button_text
dialog_ex_set_center_button_text
elements_button_right
desktop_view_pin_input_set_label_button
elements_button_left
```
15 changes: 10 additions & 5 deletions applications/services/gui/canvas.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,19 +191,24 @@ void canvas_set_font(Canvas* canvas, Font font) {
}
switch(font) {
case FontPrimary:
u8g2_SetFont(&canvas->fb, u8g2_font_helvB08_tr);
// u8g2_SetFont(&canvas->fb, u8g2_font_helvB08_tr);
canvas_set_custom_u8g2_font(canvas, kalicyh);
break;
case FontSecondary:
u8g2_SetFont(&canvas->fb, u8g2_font_haxrcorp4089_tr);
// u8g2_SetFont(&canvas->fb, u8g2_font_haxrcorp4089_tr);
canvas_set_custom_u8g2_font(canvas, kalicyh);
break;
case FontKeyboard:
u8g2_SetFont(&canvas->fb, u8g2_font_profont11_mr);
// u8g2_SetFont(&canvas->fb, u8g2_font_profont11_mr);
canvas_set_custom_u8g2_font(canvas, kalicyh);
break;
case FontBigNumbers:
u8g2_SetFont(&canvas->fb, u8g2_font_profont22_tn);
// u8g2_SetFont(&canvas->fb, u8g2_font_profont22_tn);
canvas_set_custom_u8g2_font(canvas, kalicyh);
break;
case FontBatteryPercent:
u8g2_SetFont(&canvas->fb, u8g2_font_5x7_tr); //u8g2_font_micro_tr);
// u8g2_SetFont(&canvas->fb, u8g2_font_5x7_tr); //u8g2_font_micro_tr);
canvas_set_custom_u8g2_font(canvas, kalicyh);
break;
default:
furi_crash();
Expand Down
38 changes: 19 additions & 19 deletions applications/system/updater/util/update_task.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@

static const char* update_task_stage_descr[] = {
[UpdateTaskStageProgress] = "...",
[UpdateTaskStageReadManifest] = "Loading update manifest",
[UpdateTaskStageValidateDFUImage] = "Checking DFU file",
[UpdateTaskStageFlashWrite] = "Writing flash",
[UpdateTaskStageFlashValidate] = "Validating flash",
[UpdateTaskStageRadioImageValidate] = "Checking radio FW",
[UpdateTaskStageRadioErase] = "Uninstalling radio FW",
[UpdateTaskStageRadioWrite] = "Writing radio FW",
[UpdateTaskStageRadioInstall] = "Installing radio FW",
[UpdateTaskStageRadioBusy] = "Core 2 busy",
[UpdateTaskStageOBValidation] = "Validating opt. bytes",
[UpdateTaskStageIntBackup] = "Backing up configuration",
[UpdateTaskStageIntRestore] = "Restoring configuration",
[UpdateTaskStageResourcesFileCleanup] = "Cleaning up files",
[UpdateTaskStageResourcesDirCleanup] = "Cleaning up directories",
[UpdateTaskStageResourcesFileUnpack] = "Extracting resources",
[UpdateTaskStageSplashscreenInstall] = "Installing splashscreen",
[UpdateTaskStageCompleted] = "Restarting...",
[UpdateTaskStageError] = "Error",
[UpdateTaskStageOBError] = "OB, report",
[UpdateTaskStageReadManifest] = "加载更新清单",
[UpdateTaskStageValidateDFUImage] = "检查 DFU 文件",
[UpdateTaskStageFlashWrite] = "写入闪存",
[UpdateTaskStageFlashValidate] = "验证闪存",
[UpdateTaskStageRadioImageValidate] = "检查无线固件",
[UpdateTaskStageRadioErase] = "卸载无线固件",
[UpdateTaskStageRadioWrite] = "写入无线固件",
[UpdateTaskStageRadioInstall] = "安装无线固件",
[UpdateTaskStageRadioBusy] = "核心 2 繁忙",
[UpdateTaskStageOBValidation] = "验证选项字节",
[UpdateTaskStageIntBackup] = "备份配置",
[UpdateTaskStageIntRestore] = "恢复配置",
[UpdateTaskStageResourcesFileCleanup] = "清理文件",
[UpdateTaskStageResourcesDirCleanup] = "清理目录",
[UpdateTaskStageResourcesFileUnpack] = "解压资源",
[UpdateTaskStageSplashscreenInstall] = "安装启动画面",
[UpdateTaskStageCompleted] = "正在重启...",
[UpdateTaskStageError] = "错误",
[UpdateTaskStageOBError] = "选项字节错误,请报告",
};

static const struct {
Expand Down
2 changes: 1 addition & 1 deletion applications/system/updater/views/updater_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ static void updater_main_draw_callback(Canvas* canvas, void* _model) {
canvas_draw_icon(canvas, 75, 55, &I_Pin_back_arrow_10x8);
} else {
canvas_set_font(canvas, FontSecondary);
canvas_draw_str_aligned(canvas, 82, 5, AlignCenter, AlignTop, "Installing");
canvas_draw_str_aligned(canvas, 82, 5, AlignCenter, AlignTop, "正在安装");
canvas_draw_str_aligned(
canvas, 64, 51, AlignCenter, AlignTop, furi_string_get_cstr(model->status));
canvas_draw_icon(canvas, 4, 5, &I_Updating_32x40);
Expand Down

0 comments on commit 50be49f

Please sign in to comment.