Translation support + french.
This commit is contained in:
parent
e9873c1943
commit
f059d3c61f
16 changed files with 380 additions and 169 deletions
|
|
@ -9,7 +9,7 @@ use crate::{
|
|||
consts,
|
||||
data::{db, model},
|
||||
html_templates::*,
|
||||
translation,
|
||||
translation::{self, Sentence},
|
||||
};
|
||||
|
||||
#[debug_handler]
|
||||
|
|
@ -22,7 +22,7 @@ pub async fn create(
|
|||
let recipe_id = connection.create_recipe(user.id).await?;
|
||||
Ok(Redirect::to(&format!("/recipe/edit/{}", recipe_id)).into_response())
|
||||
} else {
|
||||
Ok(MessageTemplate::new("Not logged in", tr).into_response())
|
||||
Ok(MessageTemplate::new(tr.t(Sentence::NotLoggedIn), tr).into_response())
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -53,13 +53,16 @@ pub async fn edit_recipe(
|
|||
}
|
||||
.into_response())
|
||||
} else {
|
||||
Ok(MessageTemplate::new("Not allowed to edit this recipe", tr).into_response())
|
||||
Ok(
|
||||
MessageTemplate::new(tr.t(Sentence::RecipeNotAllowedToEdit), tr)
|
||||
.into_response(),
|
||||
)
|
||||
}
|
||||
} else {
|
||||
Ok(MessageTemplate::new("Recipe not found", tr).into_response())
|
||||
Ok(MessageTemplate::new(tr.t(Sentence::RecipeNotFound), tr).into_response())
|
||||
}
|
||||
} else {
|
||||
Ok(MessageTemplate::new("Not logged in", tr).into_response())
|
||||
Ok(MessageTemplate::new(tr.t(Sentence::NotLoggedIn), tr).into_response())
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -76,7 +79,7 @@ pub async fn view(
|
|||
&& (user.is_none() || recipe.user_id != user.as_ref().unwrap().id)
|
||||
{
|
||||
return Ok(MessageTemplate::new_with_user(
|
||||
&format!("Not allowed the view the recipe {}", recipe_id),
|
||||
tr.tp(Sentence::RecipeNotAllowedToView, &[Box::new(recipe_id)]),
|
||||
tr,
|
||||
user,
|
||||
)
|
||||
|
|
@ -103,11 +106,9 @@ pub async fn view(
|
|||
}
|
||||
.into_response())
|
||||
}
|
||||
None => Ok(MessageTemplate::new_with_user(
|
||||
&format!("Cannot find the recipe {}", recipe_id),
|
||||
tr,
|
||||
user,
|
||||
)
|
||||
.into_response()),
|
||||
None => Ok(
|
||||
MessageTemplate::new_with_user(tr.t(Sentence::RecipeNotFound), tr, user)
|
||||
.into_response(),
|
||||
),
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue