From 5962b13d05e53c2b3293de6cee6f8969cc8b723d Mon Sep 17 00:00:00 2001 From: Greg Burri Date: Tue, 29 Apr 2025 13:14:46 +0200 Subject: [PATCH] Remove an `unwrap` --- backend/src/translation.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/backend/src/translation.rs b/backend/src/translation.rs index 6bced76..5bd28eb 100644 --- a/backend/src/translation.rs +++ b/backend/src/translation.rs @@ -295,6 +295,8 @@ struct Language { translation: Vec, } +const UNABLE_TO_FIND_TRANSLATION_MESSAGE: &str = "Unable to find translation"; + impl Language { pub fn from_stored_language(stored_language: StoredLanguage) -> Self { Self { @@ -317,11 +319,11 @@ impl Language { { let sentence_cloned: Sentence = sentence.borrow().clone(); - let text: &str = self - .translation - .get(sentence_cloned as usize) - .unwrap() - .as_ref(); + let text: &str = match self.translation.get(sentence_cloned as usize) { + None => UNABLE_TO_FIND_TRANSLATION_MESSAGE, + Some(text) => text, + }; + if text.is_empty() && self.code != DEFAULT_LANGUAGE_CODE { return get_language_translation(DEFAULT_LANGUAGE_CODE).get(sentence); }