Skip to content

Commit

Permalink
fix live stream translate
Browse files Browse the repository at this point in the history
  • Loading branch information
ligenxxxx committed Jan 24, 2025
1 parent a723a2a commit cfb68c1
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion mkapp/app/language/zh_hans.ini
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Invalid Format = "格式无效"
Password Requirements = "密码要求"
Minimum 8 characters = "最少8个字符"
maximum 64 characters = "最多64个字符"
Live stream: = "直播:"
Live stream = "直播"
Connect to the WiFi network identified above = "连接上面标识的WiFi网络"
Use VLC Player to open a Network Stream = "使用VLC播放器打开网络串流"
Apply Settings = "生效设置"
Expand Down
23 changes: 11 additions & 12 deletions src/ui/page_wifi.c
Original file line number Diff line number Diff line change
Expand Up @@ -357,22 +357,22 @@ static void page_wifi_update_page_1_notes() {

static char buf[1024];
snprintf(buf, sizeof(buf), "%s:\n %s,%s.\n\n%s:\n 1. %s.\n 2. %s:\n\n rtsp://%s:8554/hdzero\n\n",
_lang("Password Requirements"),
_lang("Minimum 8 characters"),
_lang("maximum 64 characters"),
_lang("Live Stream"),
_lang("Connect to the WiFi network identified above"),
_lang("Use VLC Player to open a Network Stream"),
address ? address : page_wifi.page_2.ip_addr.text);
_lang("Password Requirements"),
_lang("Minimum 8 characters"),
_lang("maximum 64 characters"),
_lang("Live stream"),
_lang("Connect to the WiFi network identified above"),
_lang("Use VLC Player to open a Network Stream"),
address ? address : page_wifi.page_2.ip_addr.text);
lv_label_set_text(page_wifi.page_1.note, buf);
}

static void page_wifi_update_page_3_notes() {
static char buf[256];
snprintf(buf, sizeof(buf), "%s:\n %s,%s.\n\n",
_lang("Password Requirements"),
_lang("Minimum 8 characters"),
_lang("maximum 64 characters"));
_lang("Password Requirements"),
_lang("Minimum 8 characters"),
_lang("maximum 64 characters"));
lv_label_set_text(page_wifi.page_3.note, buf);
}

Expand Down Expand Up @@ -859,7 +859,7 @@ static void page_wifi_on_roller(uint8_t key) {
/**
* Common handling method of the three "apply settings" buttons.
*/
static void page_wifi_handle_apply_button(lv_obj_t* apply_button) {
static void page_wifi_handle_apply_button(lv_obj_t *apply_button) {
if (page_wifi.confirm_settings) {
lv_label_set_text(apply_button, "#FF0000 Updating WiFi...#");
page_wifi_apply_settings_timer = lv_timer_create(page_wifi_apply_settings_timer_cb, 1000, NULL);
Expand Down Expand Up @@ -1016,7 +1016,6 @@ static void page_wifi_on_click(uint8_t key, int sel) {
break;
}


// Enable/Disable panel scrolling when elements are in focus
pp_wifi.p_arr.max =
keyboard_active() || page_wifi.page_2.rf_channel.active
Expand Down

0 comments on commit cfb68c1

Please sign in to comment.