Skip to content

optimize email text for totp #789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kasparsd merged 8 commits into from
Feb 13, 2026
Merged

optimize email text for totp #789

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3991f53
optimize email text for totp
masteradhoc Feb 13, 2026
a11d9fc
@kasparsd feedback
masteradhoc Feb 13, 2026
012778b
Merge branch 'master' into patch-1
masteradhoc Feb 13, 2026
afd2af9
Merge branch 'master' into patch-1
kasparsd Feb 13, 2026
295dc23
Use constant and input directly
kasparsd Feb 13, 2026
4d54d51
Move into own line
kasparsd Feb 13, 2026
94e24d5
Doesn’t need double quotes
kasparsd Feb 13, 2026
8a7dec3
Include username and how user login with password was successfull
kasparsd Feb 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions providers/class-two-factor-email.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,24 +261,27 @@ private function get_client_ip() {
public function generate_and_email_token( $user ) {
$token = $this->generate_token( $user->ID );
$remote_ip = $this->get_client_ip();
$ttl_minutes = (int) ceil( $this->user_token_ttl( $user->ID ) / MINUTE_IN_SECONDS );

$subject = wp_strip_all_tags(
sprintf(
/* translators: %s: site name */
__( 'Your login confirmation code for %s', 'two-factor' ),
__( '[%s] Login confirmation code', 'two-factor' ),
Comment thread
kasparsd marked this conversation as resolved.
wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES )
)
);

$message_parts = array(
__( 'Please complete the login by entering the verification code below:', 'two-factor' ),
$token,
sprintf(
/* translators: %s: token */
__( 'Enter %s to log in.', 'two-factor' ),
$token
/* translators: %d: number of minutes */
__( 'This code will expire in %d minutes.', 'two-factor' ),
$ttl_minutes
),
sprintf(
/* translators: $1$s: IP address of user, %2$s: `user_login` of authenticated user */
__( 'Didn\'t expect this? A user from %1$s has successfully authenticated as %2$s. If this wasn\'t you, please change your password.', 'two-factor' ),
/* translators: $1$s: IP address of user, $2$s: user login */
__( 'A user from IP address %1$s has successfully authenticated as %2$s. If this wasn\'t you, please change your password.', 'two-factor' ),
$remote_ip,
$user->user_login
),
Expand Down
Loading