WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Translate role names in the new user notification email. Props obenland. fixes #20764 

git-svn-id: http://core.svn.wordpress.org/trunk@21316 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2012-07-24 17:32:40 +00:00
parent 91ab52d443
commit 5ac8a32840
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/user-new.php
View File

@ -18,6 +18,8 @@ if ( is_multisite() ) {
if ( is_multisite() ) { if ( is_multisite() ) {
function admin_created_user_email( $text ) { function admin_created_user_email( $text ) {
$roles = get_editable_roles();
$role = $roles[ $_REQUEST['role'] ];
/* translators: 1: Site name, 2: site URL, 3: role */ /* translators: 1: Site name, 2: site URL, 3: role */
return sprintf( __( 'Hi, return sprintf( __( 'Hi,
You\'ve been invited to join \'%1$s\' at You\'ve been invited to join \'%1$s\' at
@ -26,7 +28,7 @@ If you do not want to join this site please ignore
this email. This invitation will expire in a few days. this email. This invitation will expire in a few days.
Please click the following link to activate your user account: Please click the following link to activate your user account:
%%s' ), get_bloginfo('name'), home_url(), esc_html( $_REQUEST[ 'role' ] ) ); %%s' ), get_bloginfo( 'name' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ) );
} }
add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' ); add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' );
@ -72,6 +74,9 @@ if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) {
} else { } else {
$newuser_key = substr( md5( $user_id ), 0, 5 ); $newuser_key = substr( md5( $user_id ), 0, 5 );
add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST[ 'role' ] ) ); add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST[ 'role' ] ) );
$roles = get_editable_roles();
$role = $roles[ $_REQUEST['role'] ];
/* translators: 1: Site name, 2: site URL, 3: role, 4: activation URL */ /* translators: 1: Site name, 2: site URL, 3: role, 4: activation URL */
$message = __( 'Hi, $message = __( 'Hi,
@ -80,7 +85,7 @@ You\'ve been invited to join \'%1$s\' at
Please click the following link to confirm the invite: Please click the following link to confirm the invite:
%4$s' ); %4$s' );
wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname' ) ), sprintf($message, get_option('blogname'), home_url(), $_REQUEST[ 'role' ], home_url("/newbloguser/$newuser_key/"))); wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname' ) ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) );
$redirect = add_query_arg( array('update' => 'add'), 'user-new.php' ); $redirect = add_query_arg( array('update' => 'add'), 'user-new.php' );
} }
} }