Refactor MessageTemplate initialization to use Context directly instead of Tr and user parameters
This commit is contained in:
parent
c8e0aa918c
commit
710a134966
4 changed files with 49 additions and 151 deletions
|
|
@ -4,7 +4,7 @@ use crate::{
|
|||
app::Context,
|
||||
data::{db, model},
|
||||
log::Log,
|
||||
translation::{self, Sentence, Tr},
|
||||
translation::{self, Sentence},
|
||||
};
|
||||
|
||||
pub struct Recipes {
|
||||
|
|
@ -84,29 +84,9 @@ pub struct MessageTemplate<'a> {
|
|||
}
|
||||
|
||||
impl<'a> MessageTemplate<'a> {
|
||||
pub fn new(message: &'a str, tr: Tr) -> MessageTemplate<'a> {
|
||||
pub fn new(message: &'a str, context: Context) -> MessageTemplate<'a> {
|
||||
MessageTemplate {
|
||||
context: Context {
|
||||
user: None,
|
||||
tr,
|
||||
dark_theme: false,
|
||||
},
|
||||
message,
|
||||
as_code: false,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new_with_user(
|
||||
message: &'a str,
|
||||
tr: Tr,
|
||||
user: Option<model::User>,
|
||||
) -> MessageTemplate<'a> {
|
||||
MessageTemplate {
|
||||
context: Context {
|
||||
user,
|
||||
tr,
|
||||
dark_theme: false,
|
||||
},
|
||||
context,
|
||||
message,
|
||||
as_code: false,
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue