mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-15 08:30:02 +00:00
add translations and minor fixes to workflow
This commit is contained in:
parent
d21bd5c935
commit
851604f471
4 changed files with 162 additions and 43 deletions
|
|
@ -21,14 +21,6 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"wlanman": {
|
||||
"context_name": "WLAN manager",
|
||||
"menu_name": {
|
||||
"appmenu.wlanman": {
|
||||
"en": "WLAN manager"
|
||||
}
|
||||
}
|
||||
},
|
||||
"vault": {
|
||||
"context_name": "Key Vault",
|
||||
"menu_name": {
|
||||
|
|
|
|||
|
|
@ -139,8 +139,10 @@
|
|||
"en-tts": "Sleep now"
|
||||
},
|
||||
"mainmenu.wifimenu": {
|
||||
"en": "Wi-Fi menu",
|
||||
"en-tts": "Wi-Fi menu"
|
||||
"en": "WiFi menu",
|
||||
"en-tts": "WiFi menu",
|
||||
"ja": "WiFiメニュー",
|
||||
"zh": "无线网络菜单"
|
||||
},
|
||||
"mainmenu.backlighton": {
|
||||
"en": "Backlight on",
|
||||
|
|
@ -250,6 +252,120 @@
|
|||
"zh": "外壳聊天",
|
||||
"en-tts": "Shellchat"
|
||||
},
|
||||
"wlan.turnon": {
|
||||
"en": "Turn WiFi on",
|
||||
"ja": "Wi-Fiをオンにする",
|
||||
"zh": "打开wifi",
|
||||
"en-tts": "Turn WiFi on"
|
||||
},
|
||||
"wlan.turnoff": {
|
||||
"en": "Turn WiFi off",
|
||||
"ja": "Wi-Fiをオフにする",
|
||||
"zh": "关闭无线网络",
|
||||
"en-tts": "Turn WiFi off"
|
||||
},
|
||||
"wlan.manual_add": {
|
||||
"en": "Manually add a network",
|
||||
"ja": "ネットワークを手動で追加する",
|
||||
"zh": "手动添加网络",
|
||||
"en-tts": "Manually add a network"
|
||||
},
|
||||
"wlan.scan": {
|
||||
"en": "Scan for networks",
|
||||
"ja": "ネットワークのスキャン",
|
||||
"zh": "扫描网络",
|
||||
"en-tts": "Scan for networks"
|
||||
},
|
||||
"wlan.status": {
|
||||
"en": "Network status",
|
||||
"ja": "ネットワークの状態",
|
||||
"zh": "网络状态",
|
||||
"en-tts": "Network status"
|
||||
},
|
||||
"wlan.delete": {
|
||||
"en": "Delete network",
|
||||
"ja": "ネットワークを削除",
|
||||
"zh": "删除网络",
|
||||
"en-tts": "Delete network"
|
||||
},
|
||||
"wlan.list_known": {
|
||||
"en": "List known networks",
|
||||
"ja": "既知のネットワークを一覧表示する",
|
||||
"zh": "列出已知网络",
|
||||
"en-tts": "List known networks"
|
||||
},
|
||||
"wlan.ssid_entry": {
|
||||
"en": "Fill in SSID and password:",
|
||||
"ja": "SSID とパスワードを入力します:",
|
||||
"zh": "填写SSID和密码:",
|
||||
"en-tts": "Fill in SSID and password:"
|
||||
},
|
||||
"wlan.ssid": {
|
||||
"en": "SSID",
|
||||
"ja": "SSID",
|
||||
"zh": "SSID",
|
||||
"en-tts": "SSID"
|
||||
},
|
||||
"wlan.password": {
|
||||
"en": "Password",
|
||||
"ja": "パスワード",
|
||||
"zh": "密码",
|
||||
"en-tts": "Password"
|
||||
},
|
||||
"wlan.no_networks": {
|
||||
"en": "No networks available.",
|
||||
"ja": "利用可能なネットワークがありません。",
|
||||
"zh": "没有可用的网络。",
|
||||
"en-tts": "No networks available."
|
||||
},
|
||||
"wlan.ssid_choose": {
|
||||
"en": "Choose a network:",
|
||||
"ja": "ネットワークを選択してください:",
|
||||
"zh": "选择网络:",
|
||||
"en-tts": "Choose a network:"
|
||||
},
|
||||
"wlan.ssid_password": {
|
||||
"en": "Please enter the password for {ssid}:",
|
||||
"ja": "{ssid} のパスワードを入力してください:",
|
||||
"zh": "请输入 {ssid} 的密码:",
|
||||
"en-tts": "Please enter the password for {ssid}:"
|
||||
},
|
||||
"wlan.password_empty": {
|
||||
"en": "Password field cannot be empty",
|
||||
"ja": "パスワードを空にすることはできません",
|
||||
"zh": "密码不能为空",
|
||||
"en-tts": "Password field cannot be empty"
|
||||
},
|
||||
"wlan.no_known_networks": {
|
||||
"en": "No known networks.",
|
||||
"ja": "既知のネットワークはありません。",
|
||||
"zh": "没有已知的网络。",
|
||||
"en-tts": "No known networks."
|
||||
},
|
||||
"wlan.known_networks": {
|
||||
"en": "Known networks:\n",
|
||||
"ja": "既知のネットワーク:\n",
|
||||
"zh": "已知网络:\n",
|
||||
"en-tts": "Known networks:\n"
|
||||
},
|
||||
"wlan.cancel": {
|
||||
"en": "Cancel",
|
||||
"ja": "キャンセル",
|
||||
"zh": "取消",
|
||||
"en-tts": "Cancel"
|
||||
},
|
||||
"wlan.choose_delete": {
|
||||
"en": "Choose a network to delete:",
|
||||
"ja": "削除するネットワークを選択してください:",
|
||||
"zh": "选择要删除的网络:",
|
||||
"en-tts": "Choose a network to delete:"
|
||||
},
|
||||
"wlan.error": {
|
||||
"en": "Error",
|
||||
"ja": "エラー",
|
||||
"zh": "错误",
|
||||
"en-tts": "Error"
|
||||
},
|
||||
"rtc.try_ntp": {
|
||||
"en": "Attempt to automatically set time with NTP?",
|
||||
"ja": "NTPで時間を設定しようとしますか?",
|
||||
|
|
|
|||
|
|
@ -50,14 +50,6 @@ pub fn create_main_menu(keys: Arc<Mutex<RootKeys>>, menu_management_sid: xous::S
|
|||
// close_on_select: true,
|
||||
// });
|
||||
|
||||
menuitems.push(MenuItem {
|
||||
name: String::from_str(t!("mainmenu.wifimenu", xous::LANG)),
|
||||
action_conn: Some(status_conn),
|
||||
action_opcode: StatusOpcode::WifiMenu.to_u32().unwrap(),
|
||||
action_payload: MenuPayload::Scalar([0, 0, 0, 0]),
|
||||
close_on_select: true,
|
||||
});
|
||||
|
||||
menuitems.push(MenuItem {
|
||||
name: String::from_str(t!("mainmenu.sleep", xous::LANG)),
|
||||
action_conn: Some(status_conn),
|
||||
|
|
@ -148,6 +140,15 @@ pub fn create_main_menu(keys: Arc<Mutex<RootKeys>>, menu_management_sid: xous::S
|
|||
action_payload: MenuPayload::Scalar([0, 0, 0, 0]),
|
||||
close_on_select: true,
|
||||
});
|
||||
|
||||
menuitems.push(MenuItem {
|
||||
name: String::from_str(t!("mainmenu.wifimenu", xous::LANG)),
|
||||
action_conn: Some(status_conn),
|
||||
action_opcode: StatusOpcode::WifiMenu.to_u32().unwrap(),
|
||||
action_payload: MenuPayload::Scalar([0, 0, 0, 0]),
|
||||
close_on_select: true,
|
||||
});
|
||||
|
||||
if key_init {
|
||||
menuitems.push(MenuItem {
|
||||
name: String::from_str(t!("mainmenu.prep_backup", xous::LANG)),
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ use num_traits::*;
|
|||
|
||||
use std::io::Write;
|
||||
|
||||
use locales::t;
|
||||
|
||||
#[derive(Debug, num_derive::FromPrimitive, num_derive::ToPrimitive, PartialEq, PartialOrd)]
|
||||
enum WlanManOp {
|
||||
TurnWlanOn = 3,
|
||||
|
|
@ -18,13 +20,13 @@ enum WlanManOp {
|
|||
impl Display for WlanManOp {
|
||||
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
|
||||
match self {
|
||||
Self::TurnWlanOn => write!(f, "Turn WLAN on"),
|
||||
Self::TurnWlanOff => write!(f, "Turn WLAN off"),
|
||||
Self::AddNetworkManually => write!(f, "Manually add a network"),
|
||||
Self::ScanForNetworks => write!(f, "Scan for networks"),
|
||||
Self::Status => write!(f, "Network status"),
|
||||
Self::DeleteNetwork => write!(f, "Delete network"),
|
||||
Self::KnownNetworks => write!(f, "List known networks"),
|
||||
Self::TurnWlanOn => write!(f, "{}", t!("wlan.turnon", xous::LANG)),
|
||||
Self::TurnWlanOff => write!(f, "{}", t!("wlan.turnoff", xous::LANG)),
|
||||
Self::AddNetworkManually => write!(f, "{}", t!("wlan.manual_add", xous::LANG)),
|
||||
Self::ScanForNetworks => write!(f, "{}", t!("wlan.scan", xous::LANG)),
|
||||
Self::Status => write!(f, "{}", t!("wlan.status", xous::LANG)),
|
||||
Self::DeleteNetwork => write!(f, "{}", t!("wlan.delete", xous::LANG)),
|
||||
Self::KnownNetworks => write!(f, "{}", t!("wlan.list_known", xous::LANG)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -119,7 +121,7 @@ impl WLANMan {
|
|||
fn add_new_ssid(&mut self) -> Result<(), WLANError> {
|
||||
let connection_data = self
|
||||
.modals
|
||||
.alert_builder("Fill this form with your connection SSID and password.")
|
||||
.alert_builder(t!("wlan.ssid_entry", xous::LANG))
|
||||
.field(
|
||||
Some("SSID".to_string()),
|
||||
Some(|text| {
|
||||
|
|
@ -131,7 +133,7 @@ impl WLANMan {
|
|||
}),
|
||||
)
|
||||
.field(
|
||||
Some("Password".to_string()),
|
||||
Some(t!("wlan.password", xous::LANG).to_string()),
|
||||
Some(|text| {
|
||||
if text.as_str().is_empty() {
|
||||
return Some(xous_ipc::String::from_str("Password cannot be empty"));
|
||||
|
|
@ -195,14 +197,14 @@ impl WLANMan {
|
|||
|
||||
if networks.is_empty() {
|
||||
self.modals
|
||||
.show_notification("No networks available.", None)
|
||||
.show_notification(t!("wlan.no_networks", xous::LANG), None)
|
||||
.unwrap();
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
self.modals.add_list(networks).unwrap();
|
||||
|
||||
let ssid = self.modals.get_radiobutton("Choose an action:").unwrap();
|
||||
let ssid = self.modals.get_radiobutton(t!("wlan.ssid_choose", xous::LANG)).unwrap();
|
||||
|
||||
self.fill_password_for_ssid(&ssid)
|
||||
}
|
||||
|
|
@ -210,12 +212,12 @@ impl WLANMan {
|
|||
fn fill_password_for_ssid(&mut self, ssid: &str) -> Result<(), WLANError> {
|
||||
let connection_data = self
|
||||
.modals
|
||||
.alert_builder(&format!("Fill this form with the password for {ssid}."))
|
||||
.alert_builder(&t!("wlan.ssid_password", xous::LANG).replace("{ssid}", ssid))
|
||||
.field(
|
||||
Some("Password".to_string()),
|
||||
Some(t!("wlan.password", xous::LANG).to_string()),
|
||||
Some(|text| {
|
||||
if text.as_str().is_empty() {
|
||||
return Some(xous_ipc::String::from_str("Password cannot be empty"));
|
||||
return Some(xous_ipc::String::from_str(t!("wlan.password_empty", xous::LANG)));
|
||||
}
|
||||
|
||||
None
|
||||
|
|
@ -233,12 +235,14 @@ impl WLANMan {
|
|||
let status = self.com.wlan_status()?;
|
||||
let ssid = match status.ssid {
|
||||
Some(s) => s.name.to_string(),
|
||||
None => "not connected".to_string(),
|
||||
None => t!("stats.disconnected", xous::LANG).to_string(),
|
||||
};
|
||||
|
||||
let ls = status.link_state;
|
||||
let ip = &status.ipv4;
|
||||
|
||||
// TODO: make a proper translation for this. But, I think for now, this is a fairly
|
||||
// technical screen that we can leave in English.
|
||||
let status_str = format!(
|
||||
"Connection status: \n\n - SSID: {}\n - Link state: {:?}\n - IP: {}\n - Gateway: {}\n - Subnet mask: {}\n - DNS 1: {}\n - DNS 2: {}\n - DHCP state: {:?}",
|
||||
ssid,
|
||||
|
|
@ -256,9 +260,12 @@ impl WLANMan {
|
|||
}
|
||||
|
||||
fn known_networks(&self) -> Result<(), WLANError> {
|
||||
let networks = self.pddb.list_keys(net::AP_DICT_NAME, None)?;
|
||||
let networks = match self.pddb.list_keys(net::AP_DICT_NAME, None) {
|
||||
Ok(list) => list,
|
||||
Err(_) => Vec::new(),
|
||||
};
|
||||
|
||||
let mut networks_string = String::from("No known networks.");
|
||||
let mut networks_string = String::from(t!("wlan.no_known_networks", xous::LANG));
|
||||
|
||||
if networks.is_empty() {
|
||||
self.modals
|
||||
|
|
@ -267,7 +274,7 @@ impl WLANMan {
|
|||
return Ok(());
|
||||
}
|
||||
|
||||
networks_string = String::from("Known networks:\n");
|
||||
networks_string = String::from(t!("wlan.known_networks", xous::LANG));
|
||||
|
||||
networks_string += &networks
|
||||
.iter()
|
||||
|
|
@ -283,16 +290,19 @@ impl WLANMan {
|
|||
}
|
||||
|
||||
fn delete_network(&mut self) -> Result<(), WLANError> {
|
||||
let networks = self.pddb.list_keys(net::AP_DICT_NAME, None)?;
|
||||
let networks = match self.pddb.list_keys(net::AP_DICT_NAME, None) {
|
||||
Ok(list) => list,
|
||||
Err(_) => Vec::new(),
|
||||
};
|
||||
|
||||
if networks.is_empty() {
|
||||
self.modals
|
||||
.show_notification("No known networks.", None)
|
||||
.show_notification(t!("wlan.no_known_networks", xous::LANG), None)
|
||||
.unwrap();
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
let cancel_item = "Cancel";
|
||||
let cancel_item = t!("wlan.cancel", xous::LANG);
|
||||
self.modals
|
||||
.add_list(networks.iter().map(|s| s.as_str()).collect())
|
||||
.unwrap();
|
||||
|
|
@ -300,13 +310,13 @@ impl WLANMan {
|
|||
|
||||
let ssid_to_be_deleted = self
|
||||
.modals
|
||||
.get_radiobutton("Choose network to delete:")
|
||||
.get_radiobutton(t!("wlan.choose_delete", xous::LANG))
|
||||
.unwrap();
|
||||
|
||||
if ssid_to_be_deleted.eq(cancel_item) {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
|
||||
self
|
||||
.pddb
|
||||
.delete_key(net::AP_DICT_NAME, &ssid_to_be_deleted, None).map_err(|e| WLANError::PDDBIoError(e))?;
|
||||
|
|
@ -328,7 +338,7 @@ impl WLANMan {
|
|||
.collect::<Vec<gam::MenuItem>>();
|
||||
|
||||
menus.push(gam::MenuItem {
|
||||
name: xous_ipc::String::from_str("Close menu"),
|
||||
name: xous_ipc::String::from_str(t!("mainmenu.closemenu", xous::LANG)),
|
||||
action_conn: None,
|
||||
action_opcode: 0,
|
||||
action_payload: gam::MenuPayload::Scalar([0, 0, 0, 0]),
|
||||
|
|
@ -354,7 +364,7 @@ impl WLANMan {
|
|||
|
||||
fn show_error_modal(&self, e: WLANError) {
|
||||
self.modals
|
||||
.show_notification(format!("Error: {}", e).as_str(), None)
|
||||
.show_notification(format!("{}: {}", t!("wlan.error", xous::LANG), e).as_str(), None)
|
||||
.unwrap()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue