diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/dfrn_request.php | 4 | ||||
| -rw-r--r-- | mod/lostpass.php | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 3cd8473cf..11b7438a7 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -500,7 +500,9 @@ function dfrn_request_content(&$a) { '$dfrn_url' => $dfrn_url, '$aes_allow' => (($aes_allow) ? '<input type="hidden" name="aes_allow" value="1" />' : "" ), '$confirm_key' => $confirm_key, - '$username' => $a->user['username'], + '$welcome' => sprintf( t('Welcome home %s.'), $a->user['username']), + '$please' => sprintf( t('Please confirm your introduction/connection request to %s.'), $dfrn_url), + '$submit' => t('Confirm'), '$uid' => $_SESSION['uid'], '$nickname' => $a->user['nickname'], 'dfrn_rawurl' => $_GET['dfrn_url'] diff --git a/mod/lostpass.php b/mod/lostpass.php index 3dcf41be7..335a1f512 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -24,7 +24,7 @@ function lostpass_post(&$a) { intval($uid) ); if($r) - notice("Password reset request issued. Check your email."); + notice( t('Password reset request issued. Check your email.') . EOL); $email_tpl = load_view_file("view/lostpass_eml.tpl"); $email_tpl = replace_macros($email_tpl, array( @@ -35,7 +35,7 @@ function lostpass_post(&$a) { '$reset_link' => $a->get_baseurl() . '/lostpass?verify=' . $new_password )); - $res = mail($email, sprintf(t('Password reset requested at %s'),$a->config['sitename']), + $res = mail($email, sprintf( t('Password reset requested at %s'),$a->config['sitename']), $email_tpl, 'From: ' . t('Administrator') . '@' . $_SERVER[SERVER_NAME]); goaway($a->get_baseurl()); @@ -53,7 +53,7 @@ function lostpass_content(&$a) { dbesc($hash) ); if(! count($r)) { - notice("Request could not be verified. (You may have previously submitted it.) Password reset failed." . EOL); + notice( t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.") . EOL); goaway($a->get_baseurl()); return; } @@ -96,7 +96,12 @@ function lostpass_content(&$a) { else { $tpl = load_view_file('view/lostpass.tpl'); - $o .= $tpl; + $o .= replace_macros($tpl,array( + '$title' => t('Forgot your Password?'), + '$desc' => t('Enter your email address and submit to have your password reset. Then check your email for further instructions.'), + '$name' => t('Nickname or Email: '), + '$submit' => t('Reset') + )); return $o; } |