diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index aff9b5eeb..ff3d4fef9 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -782,7 +782,7 @@ "21": "Please enter the captcha", "22": "The captcha is incorrect", "23": "The data repo is damaged due to external changes (such as using a third-party real-time synchronization disk), please reset the data repo", - "24": "The network is abnormal, please try again later", + "24": "Network timed out, please try again later", "25": "The attribute name only supports English letters and digits", "26": "Please initialize the data repo key first in [Settings - About - Data repo key]", "27": "Uploading [%v]", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 6aa183b03..338b7cfa7 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -782,7 +782,7 @@ "21": "Por favor ingrese el captcha", "22": "El captcha es incorrecto", "23": "El repositorio de datos está dañado debido a cambios externos (como el uso de un disco de sincronización en tiempo real de terceros), restablezca el repositorio de datos", - "24": "La red es anómala, inténtalo de nuevo más tarde", + "24": "Se agotó el tiempo de espera de la red. Vuelva a intentarlo más tarde.", "25": "El nombre del atributo sólo admite letras y dígitos en inglés", "26": "Por favor, inicialice primero la clave de repositorio de datos en [Configuración - Acerca de - Clave de repositorio de datos]", "27": "Subiendo [%v]", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 42642fdf7..03636f88d 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -782,7 +782,7 @@ "21": "Veuillez entrer le captcha", "22": "Le captcha est incorrect", "23": "Le référentiel de données est endommagé en raison de modifications externes (comme l'utilisation d'un disque de synchronisation en temps réel tiers), veuillez réinitialiser le référentiel de données", - "24": "Le réseau est anormal, veuillez réessayer plus tard", + "24": "Le réseau a expiré, veuillez réessayer plus tard", "25": "Le nom de l'attribut ne supporte que les lettres et les chiffres anglais.", "26": "Veuillez d'abord initialiser la clé du référentiel de données dans [Paramètres - À propos - Clé du référentiel de données]", "27": "Téléchargement de [%v]", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 1bc992cc0..6902b06e3 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -782,7 +782,7 @@ "21": "請輸入驗證碼", "22": "驗證碼不正確", "23": "數據倉庫因為外部變更損壞(比如使用第三方實時同步盤),請重置數據倉庫", - "24": "網絡異常,請稍後再試", + "24": "網絡超時,請稍後再試", "25": "屬性名僅支援英文字母和阿拉伯數字", "26": "請先在 [設置 - 關於 - 數據倉庫密鑰] 中初始化數據倉庫密鑰", "27": "正在上傳 [%v]", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 29ba10da1..0d121297f 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -783,7 +783,7 @@ "21": "请输入验证码", "22": "验证码不正确", "23": "数据仓库因为外部变更损坏(比如使用第三方实时同步盘),请重置数据仓库", - "24": "网络异常,请稍后再试", + "24": "网络超时,请稍后再试", "25": "属性名仅支持英文字母和阿拉伯数字", "26": "请先在 [设置 - 关于 - 数据仓库密钥] 中初始化数据仓库密钥", "27": "正在上传 [%v]", diff --git a/kernel/model/sync.go b/kernel/model/sync.go index f843862ed..75ebe159e 100644 --- a/kernel/model/sync.go +++ b/kernel/model/sync.go @@ -334,8 +334,8 @@ func formatErrorMsg(err error) string { msg = Conf.Language(23) + " " + err.Error() } else if strings.Contains(msgLowerCase, "no such host") || strings.Contains(msgLowerCase, "connection failed") || strings.Contains(msgLowerCase, "hostname resolution") { msg = Conf.Language(24) - } else if strings.Contains(msgLowerCase, "net/http: request canceled while waiting for connection") || strings.Contains(msgLowerCase, "exceeded while awaiting") { - msg = Conf.Language(24) + " net/http timeout" + } else if strings.Contains(msgLowerCase, "net/http: request canceled while waiting for connection") || strings.Contains(msgLowerCase, "exceeded while awaiting") || strings.Contains(msgLowerCase, "context deadline exceeded") { + msg = Conf.Language(24) } else if strings.Contains(msgLowerCase, "cloud object not found") { msg = Conf.Language(129) }