error messages wip

Author: functora

rust/cryptonote/src/error.rs

@@ -22,15 +22,15 @@ impl AppError {
         t: &crate::i18n::Translations,
     ) -> String {
         let msg = match self {
-            AppError::Cipher(_) => t.crypto_error,
-            AppError::Getrandom(_) => t.crypto_error,
-            AppError::Base64(_) => t.encoding_error,
-            AppError::Json(_) => t.encoding_error,
+            AppError::Cipher(_) => t.cipher_error,
+            AppError::Getrandom(_) => t.getrandom_error,
+            AppError::Base64(_) => t.base64_error,
+            AppError::Json(_) => t.json_error,
             AppError::Utf8(_) => t.utf8_error,
-            AppError::Qr(_) => t.utf8_error,
-            AppError::Encrypt => t.crypto_error,
-            AppError::Decrypt => t.crypto_error,
-            AppError::Url => t.invalid_url_error,
+            AppError::Qr(_) => t.qr_error,
+            AppError::Encrypt => t.encrypt_error,
+            AppError::Decrypt => t.decrypt_error,
+            AppError::Url => t.url_error,
         };
         format!("{}: {}", msg, self)
     }

rust/cryptonote/src/i18n.rs

@@ -44,19 +44,17 @@ pub struct Translations {
     pub error_title: &'static str,
     pub loading: &'static str,
     pub password_required: &'static str,
-    pub encryption_failed: &'static str,
-    pub qr_generation_failed: &'static str,
-    pub url_generation_failed: &'static str,
-    pub failed_to_parse_url: &'static str,
     pub no_note_in_url: &'static str,
-    pub decryption_failed: &'static str,
     pub invalid_utf8: &'static str,
-    pub crypto_error: &'static str,
-    pub encoding_error: &'static str,
+    pub cipher_error: &'static str,
+    pub getrandom_error: &'static str,
+    pub base64_error: &'static str,
+    pub json_error: &'static str,
     pub utf8_error: &'static str,
-    pub invalid_url_error: &'static str,
-    pub missing_salt_error: &'static str,
-    pub invalid_encryption_mode_error: &'static str,
+    pub qr_error: &'static str,
+    pub encrypt_error: &'static str,
+    pub decrypt_error: &'static str,
+    pub url_error: &'static str,
 }
 
 pub fn get_translations(lang: Language) -> Translations {
@@ -79,19 +77,17 @@ pub fn get_translations(lang: Language) -> Translations {
             error_title: "Error",
             loading: "Loading note...",
             password_required: "Password is required for encryption",
-            encryption_failed: "Encryption failed",
-            qr_generation_failed: "QR generation failed",
-            url_generation_failed: "URL generation failed",
-            failed_to_parse_url: "Failed to parse URL",
             no_note_in_url: "No note found in URL",
-            decryption_failed: "Decryption failed",
             invalid_utf8: "Decrypted data is not valid UTF-8",
-            crypto_error: "Cryptography error",
-            encoding_error: "Encoding error",
+            cipher_error: "Cipher initialization error",
+            getrandom_error: "Random number generation error",
+            base64_error: "Base64 decoding error",
+            json_error: "JSON parsing error",
             utf8_error: "Text encoding error",
-            invalid_url_error: "Invalid URL format",
-            missing_salt_error: "Missing encryption salt",
-            invalid_encryption_mode_error: "Invalid encryption mode",
+            qr_error: "QR code generation error",
+            encrypt_error: "Encryption failed",
+            decrypt_error: "Decryption failed",
+            url_error: "Invalid URL format",
         },
         Language::Spanish => Translations {
             note_placeholder: "Escribe tu nota aquí...",
@@ -111,19 +107,17 @@ pub fn get_translations(lang: Language) -> Translations {
             error_title: "Error",
             loading: "Cargando nota...",
             password_required: "Se requiere contraseña para el cifrado",
-            encryption_failed: "Falló el cifrado",
-            qr_generation_failed: "Falló la generación del código QR",
-            url_generation_failed: "Falló la generación de URL",
-            failed_to_parse_url: "No se pudo analizar la URL",
             no_note_in_url: "No se encontró nota en la URL",
-            decryption_failed: "Falló el descifrado",
             invalid_utf8: "Los datos descifrados no son UTF-8 válidos",
-            crypto_error: "Error criptográfico",
-            encoding_error: "Error de codificación",
+            cipher_error: "Error de inicialización de cifrado",
+            getrandom_error: "Error de generación de números aleatorios",
+            base64_error: "Error de decodificación Base64",
+            json_error: "Error de análisis JSON",
             utf8_error: "Error de codificación de texto",
-            invalid_url_error: "Formato de URL inválido",
-            missing_salt_error: "Falta sal de cifrado",
-            invalid_encryption_mode_error: "Modo de cifrado inválido",
+            qr_error: "Error de generación de código QR",
+            encrypt_error: "Falló el cifrado",
+            decrypt_error: "Falló el descifrado",
+            url_error: "Formato de URL inválido",
         },
         Language::Russian => Translations {
             note_placeholder: "Введите вашу заметку здесь...",
@@ -143,19 +137,17 @@ pub fn get_translations(lang: Language) -> Translations {
             error_title: "Ошибка",
             loading: "Загрузка заметки...",
             password_required: "Для шифрования требуется пароль",
-            encryption_failed: "Ошибка шифрования",
-            qr_generation_failed: "Ошибка генерации QR-кода",
-            url_generation_failed: "Ошибка генерации URL",
-            failed_to_parse_url: "Не удалось разобрать URL",
             no_note_in_url: "Заметка не найдена в URL",
-            decryption_failed: "Ошибка расшифровки",
             invalid_utf8: "Расшифрованные данные не являются допустимым UTF-8",
-            crypto_error: "Криптографическая ошибка",
-            encoding_error: "Ошибка кодирования",
+            cipher_error: "Ошибка инициализации шифра",
+            getrandom_error: "Ошибка генерации случайных чисел",
+            base64_error: "Ошибка декодирования Base64",
+            json_error: "Ошибка разбора JSON",
             utf8_error: "Ошибка кодировки текста",
-            invalid_url_error: "Неверный формат URL",
-            missing_salt_error: "Отсутствует соль шифрования",
-            invalid_encryption_mode_error: "Неверный режим шифрования",
+            qr_error: "Ошибка генерации QR-кода",
+            encrypt_error: "Ошибка шифрования",
+            decrypt_error: "Ошибка расшифровки",
+            url_error: "Неверный формат URL",
         },
     }
 }