Remove an unwrap
This commit is contained in:
parent
ef918dc724
commit
5962b13d05
1 changed files with 7 additions and 5 deletions
|
|
@ -295,6 +295,8 @@ struct Language {
|
||||||
translation: Vec<String>,
|
translation: Vec<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const UNABLE_TO_FIND_TRANSLATION_MESSAGE: &str = "Unable to find translation";
|
||||||
|
|
||||||
impl Language {
|
impl Language {
|
||||||
pub fn from_stored_language(stored_language: StoredLanguage) -> Self {
|
pub fn from_stored_language(stored_language: StoredLanguage) -> Self {
|
||||||
Self {
|
Self {
|
||||||
|
|
@ -317,11 +319,11 @@ impl Language {
|
||||||
{
|
{
|
||||||
let sentence_cloned: Sentence = sentence.borrow().clone();
|
let sentence_cloned: Sentence = sentence.borrow().clone();
|
||||||
|
|
||||||
let text: &str = self
|
let text: &str = match self.translation.get(sentence_cloned as usize) {
|
||||||
.translation
|
None => UNABLE_TO_FIND_TRANSLATION_MESSAGE,
|
||||||
.get(sentence_cloned as usize)
|
Some(text) => text,
|
||||||
.unwrap()
|
};
|
||||||
.as_ref();
|
|
||||||
if text.is_empty() && self.code != DEFAULT_LANGUAGE_CODE {
|
if text.is_empty() && self.code != DEFAULT_LANGUAGE_CODE {
|
||||||
return get_language_translation(DEFAULT_LANGUAGE_CODE).get(sentence);
|
return get_language_translation(DEFAULT_LANGUAGE_CODE).get(sentence);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue