fix on msgbox

This commit is contained in:
open-trade 2022-01-05 16:48:09 +08:00
parent b24e16d6c1
commit 9c55e1efc8
4 changed files with 8 additions and 5 deletions

View File

@ -191,5 +191,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Add to Favorites", "加入到收藏"), ("Add to Favorites", "加入到收藏"),
("Remove from Favorites", "从收藏中删除"), ("Remove from Favorites", "从收藏中删除"),
("Empty", "空空如也"), ("Empty", "空空如也"),
("Invalid folder name", "无效文件夹名称"),
].iter().cloned().collect(); ].iter().cloned().collect();
} }

View File

@ -186,5 +186,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> =
("Password missed", "Mot de passe manqué"), ("Password missed", "Mot de passe manqué"),
("Wrong credentials", "Identifiant ou mot de passe erroné"), ("Wrong credentials", "Identifiant ou mot de passe erroné"),
("Edit Tag", "Modifier la balise"), ("Edit Tag", "Modifier la balise"),
("Invalid folder name", "Nom de dossier invalide"),
].iter().cloned().collect(); ].iter().cloned().collect();
} }

View File

@ -186,6 +186,7 @@ lazy_static::lazy_static! {
("Password missed", "Password dimenticata"), ("Password missed", "Password dimenticata"),
("Wrong credentials", "Credenziali errate"), ("Wrong credentials", "Credenziali errate"),
("Edit Tag", "Modifica tag"), ("Edit Tag", "Modifica tag"),
("Invalid folder name", "Nome della cartella non valido"),
].iter().cloned().collect(); ].iter().cloned().collect();
} }

View File

@ -440,7 +440,7 @@ class FolderView : Reactor.Component {
var name = res.name.trim(); var name = res.name.trim();
if (!name) return; if (!name) return;
if (name.indexOf(me.sep()) >= 0) { if (name.indexOf(me.sep()) >= 0) {
msgbox("custom-error", "Create Folder", "Invalid folder name"); handler.msgbox("custom-error", "Create Folder", "Invalid folder name");
return; return;
} }
var path = me.joinPath(name); var path = me.joinPath(name);
@ -576,16 +576,16 @@ handler.jobDone = function(id, file_num = -1) {
handler.jobError = function(id, err, file_num = -1) { handler.jobError = function(id, err, file_num = -1) {
var job = deleting_single_file_jobs[id]; var job = deleting_single_file_jobs[id];
if (job) { if (job) {
msgbox("custom-error", "Delete File", err); handler.msgbox("custom-error", "Delete File", err);
return; return;
} }
job = create_dir_jobs[id]; job = create_dir_jobs[id];
if (job) { if (job) {
msgbox("custom-error", "Create Folder", err); handler.msgbox("custom-error", "Create Folder", err);
return; return;
} }
if (file_num < 0) { if (file_num < 0) {
msgbox("custom-error", "Failed", err); handler.msgbox("custom-error", "Failed", err);
} }
file_transfer.job_table.updateJobStatus(id, file_num, err); file_transfer.job_table.updateJobStatus(id, file_num, err);
} }
@ -619,7 +619,7 @@ handler.confirmDeleteFiles = function(id, i, name) {
if (i >= n) return; if (i >= n) return;
var file_path = job.path; var file_path = job.path;
if (name) file_path += handler.get_path_sep(job.is_remote) + name; if (name) file_path += handler.get_path_sep(job.is_remote) + name;
msgbox("custom-skip", "Confirm Delete", "<div .form> \ handler.msgbox("custom-skip", "Confirm Delete", "<div .form> \
<div>" + translate('Deleting') + " #" + (i + 1) + " / " + n + " " + translate('files') + ".</div> \ <div>" + translate('Deleting') + " #" + (i + 1) + " / " + n + " " + translate('files') + ".</div> \
<div>" + translate('Are you sure you want to delete this file?') + "</div> \ <div>" + translate('Are you sure you want to delete this file?') + "</div> \
<div.ellipsis style=\"font-weight: bold;\" .text>" + name + "</div> \ <div.ellipsis style=\"font-weight: bold;\" .text>" + name + "</div> \