mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-26 19:29:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes #2281 rewording set and reset mail content

Browse source
This commit is contained in:
Linty 2024-11-25 11:06:43 +01:00
parent 6e45a8f426
commit 465e6eced4
3 changed files with 21 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

42
include/functions_mail.inc.php
View file

@ -1019,18 +1019,15 @@ function pwg_generate_reset_password_mail($username, $password_link, $gallery_ti
{
set_make_full_url();
$message = l10n('Someone requested that the password be reset for the following user account:') . "\r\n\r\n";
$message.= l10n(
'Username "%s" on gallery %s',
$username,
get_gallery_home_url()
);
$message.= "\r\n\r\n";
$message.= l10n('To reset your password, visit the following address:') . "\r\n";
$message.= $password_link . "\r\n";
$message = '<p style="margin: 20px 0">';
$message = l10n('Someone requested that the password be reset for the following user account:')." ".$username.'</p>';
$message.= '<p style="margin: 20px 0">'.l10n('To reset your password, visit the following address:');
$message.= ' <a href="'.$password_link.'">'.l10n('Change my password').'</a></p>';
$message.= '<p style="text-align: center; font-size: 70%;">'.$password_link.'</p>';
$message.= '<p style="margin: 20px 0;">';
$message.= l10n('This link is valid for %s. After this time, you will need to request a new link.', $remaining_time);
$message.= "\r\n\r\n";
$message.= l10n('If this was a mistake, just ignore this email and nothing will happen.')."\r\n";
$message.= " ";
$message.= l10n('If this was a mistake, just ignore this email and nothing will happen.').'</p>';
unset_make_full_url();
@ -1039,7 +1036,7 @@ function pwg_generate_reset_password_mail($username, $password_link, $gallery_ti
return array(
'subject' => '['.$gallery_title.'] '.l10n('Password Reset'),
'content' => $message,
'content_format' => 'text/plain',
'content_format' => 'text/html',
);
}
@ -1058,18 +1055,15 @@ function pwg_generate_set_password_mail($username, $set_password_link, $gallery_
{
set_make_full_url();
$message = l10n('Someone requested that the password be set for the following user account:') . "\r\n\r\n";
$message.= l10n(
'Username "%s" on gallery %s',
$username,
get_gallery_home_url()
);
$message.= "\r\n\r\n";
$message.= l10n('To set your password, visit the following address:') . "\r\n";
$message.= $set_password_link . "\r\n";
$message = '<p style="margin: 20px 0">';
$message.= l10n('A photo library administrator has created the following account for you:')." ".$username.'</p>';
$message.= '<p style="margin: 20px 0">'.l10n('To set your password, visit the following address:');
$message.= ' <a href="'.$set_password_link.'">'.l10n('Activate').'</a></p>';
$message.= '<p style="text-align: center; font-size: 70%; margin: 20px 0;">'.$set_password_link.'</p>';
$message.= '<p style="margin: 20px 0;">';
$message.= l10n('This link is valid for %s. After this time, you will need to request a new link.', $remaining_time);
$message.= "\r\n\r\n";
$message.= l10n('If this was a mistake, just ignore this email and nothing will happen.')."\r\n";
$message.= " ";
$message.= l10n('If this was a mistake, just ignore this email and nothing will happen.') . '</p>';
unset_make_full_url();
@ -1078,7 +1072,7 @@ function pwg_generate_set_password_mail($username, $set_password_link, $gallery_
return array(
'subject' => l10n('Welcome to ') . '['.$gallery_title.']',
'content' => $message,
'content_format' => 'text/plain',
'content_format' => 'text/html',
);
}

2
language/en_UK/admin.lang.php
View file

@ -1405,5 +1405,5 @@ $lang['Read the release note'] = 'Read the release note';
$lang['Ok, got it!'] = 'Ok, got it!';
$lang['This link is valid for %s. After this time, you will need to request a new link.'] = 'This link is valid for %s. After this time, you will need to request a new link.';
$lang['To set your password, visit the following address:'] = 'To set your password, visit the following address:';
$lang['Someone requested that the password be set for the following user account:'] = 'Someone requested that the password be set for the following user account:';
$lang['A photo library administrator has created the following account for you:'] = 'A photo library administrator has created the following account for you:';
// Leave this line empty

4
language/fr_FR/admin.lang.php
View file

@ -1406,6 +1406,6 @@ $lang['What\'s new in version %s'] = 'Quoi de neuf dans Piwigo %s ?';
$lang['Read the release note'] = 'Lire la note de version';
$lang['Ok, got it!'] = 'Ok, j\'ai compris!';
$lang['This link is valid for %s. After this time, you will need to request a new link.'] = 'Ce lien est valide pendant %s. Passé ce délai, vous devrez demander un nouveau lien.';
$lang['To set your password, visit the following address:'] = 'Pour définir votre mot de passe, rendez-vous à l\'adresse suivante:';
$lang['Someone requested that the password be set for the following user account:'] = 'Quelqu\'un a demandé que le mot de passe soit défini pour l\'utilisateur suivant:';
$lang['To set your password, visit the following address:'] = 'Pour définir votre mot de passe, rendez-vous à l\'adresse suivante :';
$lang['A photo library administrator has created the following account for you:'] = 'Un administrateur de la photothèque vous a créé le compte suivant :';
// Leave this line empty