diff options
Diffstat (limited to 'modules/user/user.module')
| -rw-r--r-- | modules/user/user.module | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index 132ec622c..bac1b767c 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -2416,141 +2416,141 @@ function _user_mail_text($key, $language = NULL, $variables = array(), $replace // No override, return default string. switch ($key) { case 'register_no_approval_required_subject': - $text = t('Account details for !user-name-token at !site-name-token', array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); + $text = t('Account details for [user:name] at [site:name]', array(), array('langcode' => $langcode)); break; case 'register_no_approval_required_body': - $text = t("!user-name-token, + $text = t("[user:name], -Thank you for registering at !site-name-token. You may now log in by clicking this link or copying and pasting it to your browser: +Thank you for registering at [site:name]. You may now log in by clicking this link or copying and pasting it to your browser: -!one-time-login-token +[user:one-time-login-url] This link can only be used once to log in and will lead you to a page where you can set your password. -After setting your password, you will be able to log in at !site-login-url-token in the future using: +After setting your password, you will be able to log in at [site:login-url] in the future using: -username: !user-name-token +username: [user:name] password: Your password --- !site-name-token team", array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]', '!one-time-login-token' => '[user:one-time-login-url]', '!site-login-url-token' => '[site:login-url]'), array('langcode' => $langcode)); +-- [site:name] team", array(), array('langcode' => $langcode)); break; case 'register_admin_created_subject': - $text = t('An administrator created an account for you at !site-name-token', array('!site-name-token' => '[site:name]'), array('langcode' => $langcode)); + $text = t('An administrator created an account for you at [site:name]', array(), array('langcode' => $langcode)); break; case 'register_admin_created_body': - $text = t("!user-name-token, + $text = t("[user:name], -A site administrator at !site-name-token has created an account for you. You may now log in by clicking this link or copying and pasting it to your browser: +A site administrator at [site:name] has created an account for you. You may now log in by clicking this link or copying and pasting it to your browser: -!one-time-login-token +[user:one-time-login-url] This link can only be used once to log in and will lead you to a page where you can set your password. -After setting your password, you will be able to log in at !site-login-url-token in the future using: +After setting your password, you will be able to log in at [site:login-url] in the future using: -username: !user-name-token +username: [user:name] password: Your password --- !site-name-token team", array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]', '!one-time-login-token' => '[user:one-time-login-url]', '!site-login-url-token' => '[site:login-url]'), array('langcode' => $langcode)); +-- [site:name] team", array(), array('langcode' => $langcode)); break; case 'register_pending_approval_subject': case 'register_pending_approval_admin_subject': - $text = t('Account details for !user-name-token at !site-name-token (pending admin approval)', array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); + $text = t('Account details for [user:name] at [site:name] (pending admin approval)', array(), array('langcode' => $langcode)); break; case 'register_pending_approval_body': - $text = t("!user-name-token, + $text = t("[user:name], -Thank you for registering at !site-name-token. Your application for an account is currently pending approval. Once it has been approved, you will receive another e-mail containing information about how to log in, set your password, and other details. +Thank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another e-mail containing information about how to log in, set your password, and other details. --- !site-name-token team", array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); +-- [site:name] team", array(), array('langcode' => $langcode)); break; case 'register_pending_approval_admin_body': - $text = t("!user-name-token has applied for an account. + $text = t("[user:name] has applied for an account. -!user-edit-url-token", array('!user-name-token' => '[user:name]', '!user-edit-url-token' => '[user:edit-url]'), array('langcode' => $langcode)); +[user:edit-url]", array(), array('langcode' => $langcode)); break; case 'password_reset_subject': - $text = t('Replacement login information for !user-name-token at !site-name-token', array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); + $text = t('Replacement login information for [user:name] at [site:name]', array(), array('langcode' => $langcode)); break; case 'password_reset_body': - $text = t("!user-name-token, + $text = t("[user:name], -A request to reset the password for your account has been made at !site-name-token. +A request to reset the password for your account has been made at [site:name]. You may now log in by clicking this link or copying and pasting it to your browser: -!one-time-login-token +[user:one-time-login-url] This link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used. --- !site-name-token team", array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]', '!one-time-login-token' => '[user:one-time-login-url]'), array('langcode' => $langcode)); +-- [site:name] team", array(), array('langcode' => $langcode)); break; case 'status_activated_subject': - $text = t('Account details for !user-name-token at !site-name-token (approved)', array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); + $text = t('Account details for [user:name] at [site:name] (approved)', array(), array('langcode' => $langcode)); break; case 'status_activated_body': - $text = t("!user-name-token, + $text = t("[user:name], -Your account at !site-name-token has been activated. +Your account at [site:name] has been activated. You may now log in by clicking this link or copying and pasting it into your browser: -!one-time-login-token +[site:login-url] This link can only be used once to log in and will lead you to a page where you can set your password. -After setting your password, you will be able to log in at !site-login-url-token in the future using: +After setting your password, you will be able to log in at [site:login-url] in the future using: -username: !user-name-token +username: [user:name] password: Your password --- !site-name-token team", array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]', '!site-login-url-token' => '[site:login-url]', '!one-time-login-token' => '[user:one-time-login-url]'), array('langcode' => $langcode)); +-- [site:name] team", array(), array('langcode' => $langcode)); break; case 'status_blocked_subject': - $text = t('Account details for !user-name-token at !site-name-token (blocked)', array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); + $text = t('Account details for [user:name] at [site:name] (blocked)', array(), array('langcode' => $langcode)); break; case 'status_blocked_body': - $text = t("!user-name-token, + $text = t("[user:name], -Your account on !site-name-token has been blocked. +Your account on [site:name] has been blocked. --- !site-name-token team", array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); +-- [site:name] team", array(), array('langcode' => $langcode)); break; case 'cancel_confirm_subject': - $text = t('Account cancellation request for !user-name-token at !site-name-token', array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); + $text = t('Account cancellation request for [user:name] at [site:name]', array(), array('langcode' => $langcode)); break; case 'cancel_confirm_body': - $text = t("!user-name-token, + $text = t("[user:name], -A request to cancel your account has been made at !site-name-token. +A request to cancel your account has been made at [site:name]. -You may now cancel your account on !site-url-brief-token by clicking this link or copying and pasting it into your browser: +You may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser: -!user-cancel-url-token +[user:cancel-url] NOTE: The cancellation of your account is not reversible. This link expires in one day and nothing will happen if it is not used. --- !site-name-token team", array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]', '!site-url-brief-token' => '[site:url-brief]', '!user-cancel-url-token' => '[user:cancel-url]'), array('langcode' => $langcode)); +-- [site:name] team", array(), array('langcode' => $langcode)); break; case 'status_canceled_subject': - $text = t('Account details for !user-name-token at !site-name-token (canceled)', array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); + $text = t('Account details for [user:name] at [site:name] (canceled)', array(), array('langcode' => $langcode)); break; case 'status_canceled_body': - $text = t("!user-name-token, + $text = t("[user:name], -Your account on !site-name-token has been canceled. +Your account on [site:name] has been canceled. --- !site-name-token team", array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); +-- [site:name] team", array(), array('langcode' => $langcode)); break; } } |