mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-27 03:41:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2260 from LemmyNet/fix_email_param_order

Browse source 
Fixing malformed rosetta translations. Fixes #2231
This commit is contained in:
Nutomic 2022-05-16 10:58:58 +00:00 committed by GitHub
commit 91d1d5f7ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/api_common/src/utils.rs
View file

@ -401,7 +401,7 @@ pub async fn send_password_reset_email(
let subject = &lang.password_reset_subject(&user.person.name); let subject = &lang.password_reset_subject(&user.person.name);
let protocol_and_hostname = settings.get_protocol_and_hostname(); let protocol_and_hostname = settings.get_protocol_and_hostname();
let reset_link = format!("{}/password_change/{}", protocol_and_hostname, &token); let reset_link = format!("{}/password_change/{}", protocol_and_hostname, &token);
let body = &lang.password_reset_body(&user.person.name, reset_link); let body = &lang.password_reset_body(reset_link, &user.person.name);
send_email(subject, email, &user.person.name, body, settings) send_email(subject, email, &user.person.name, body, settings)
} }
@ -426,7 +426,7 @@ pub async fn send_verification_email(
let lang = get_user_lang(user); let lang = get_user_lang(user);
let subject = lang.verify_email_subject(&settings.hostname); let subject = lang.verify_email_subject(&settings.hostname);
let body = lang.verify_email_body(&user.person.name, &settings.hostname, verify_link); let body = lang.verify_email_body(&settings.hostname, &user.person.name, verify_link);
send_email(&subject, new_email, &user.person.name, &body, settings)?; send_email(&subject, new_email, &user.person.name, &body, settings)?;
Ok(()) Ok(())

8
crates/api_crud/src/private_message/create.rs
View file

@ -113,11 +113,11 @@ impl PerformCrud for CreatePrivateMessage {
let inbox_link = format!("{}/inbox", context.settings().get_protocol_and_hostname()); let inbox_link = format!("{}/inbox", context.settings().get_protocol_and_hostname());
send_email_to_user( send_email_to_user(
&local_recipient, &local_recipient,
&lang.notification_mentioned_by_subject(&local_recipient.person.name), &lang.notification_private_message_subject(&local_recipient.person.name),
&lang.notification_mentioned_by_body( &lang.notification_private_message_body(
&local_recipient.person.name,
&content_slurs_removed,
&inbox_link, &inbox_link,
&content_slurs_removed,
&local_recipient.person.name,
), ),
&context.settings(), &context.settings(),
); );

8
crates/websocket/src/send.rs
View file

@ -215,7 +215,7 @@ pub async fn send_local_notifs(
send_email_to_user( send_email_to_user(
&mention_user_view, &mention_user_view,
&lang.notification_mentioned_by_subject(&person.name), &lang.notification_mentioned_by_subject(&person.name),
&lang.notification_mentioned_by_body(&person.name, &comment.content, &inbox_link), &lang.notification_mentioned_by_body(&comment.content, &inbox_link, &person.name),
&context.settings(), &context.settings(),
) )
} }
@ -249,8 +249,8 @@ pub async fn send_local_notifs(
let lang = get_user_lang(&parent_user_view); let lang = get_user_lang(&parent_user_view);
send_email_to_user( send_email_to_user(
&parent_user_view, &parent_user_view,
&lang.notification_post_reply_subject(&person.name), &lang.notification_comment_reply_subject(&person.name),
&lang.notification_post_reply_body(&person.name, &comment.content, &inbox_link), &lang.notification_comment_reply_body(&comment.content, &inbox_link, &person.name),
&context.settings(), &context.settings(),
) )
} }
@ -280,7 +280,7 @@ pub async fn send_local_notifs(
send_email_to_user( send_email_to_user(
&parent_user_view, &parent_user_view,
&lang.notification_post_reply_subject(&person.name), &lang.notification_post_reply_subject(&person.name),
&lang.notification_post_reply_body(&person.name, &comment.content, &inbox_link), &lang.notification_post_reply_body(&comment.content, &inbox_link, &person.name),
&context.settings(), &context.settings(),
) )
} }