diff --git a/wp-admin/ms-admin.php b/wp-admin/ms-admin.php index 14a337c7ce..8cd2078188 100644 --- a/wp-admin/ms-admin.php +++ b/wp-admin/ms-admin.php @@ -22,7 +22,7 @@ $c_users = get_user_count(); $c_blogs = get_blog_count(); $user_text = sprintf( _n( '%s user', '%s users', $c_users ), number_format_i18n( $c_users ) ); -$blog_text = sprintf( _n( '%s blog', '%s blogs', $c_blogs ), number_format_i18n( $c_blogs ) ); +$blog_text = sprintf( _n( '%s site', '%s sites', $c_blogs ), number_format_i18n( $c_blogs ) ); $sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text ); ?> diff --git a/wp-admin/ms-edit.php b/wp-admin/ms-edit.php index 60fd4c2ea3..8a5a9a159e 100644 --- a/wp-admin/ms-edit.php +++ b/wp-admin/ms-edit.php @@ -141,14 +141,14 @@ switch ( $_GET['action'] ) { wp_die( __('You do not have permission to access this page.') ); if ( is_array( $_POST[ 'blog' ] ) == false ) - wp_die( "Can't create an empty blog." ); + wp_die( "Can't create an empty site." ); $blog = $_POST['blog']; $domain = sanitize_user( str_replace( '/', '', $blog[ 'domain' ] ) ); $email = sanitize_email( $blog[ 'email' ] ); $title = $blog[ 'title' ]; if ( empty($domain) || empty($email) ) - wp_die( __('Missing blog address or email address.') ); + wp_die( __('Missing site address or email address.') ); if ( !is_email( $email ) ) wp_die( __('Invalid email address') ); @@ -178,8 +178,8 @@ switch ( $_GET['action'] ) { $dashboard_blog = get_dashboard_blog(); if ( get_user_option( 'primary_blog', $user_id ) == $dashboard_blog->blog_id ) update_user_option( $user_id, 'primary_blog', $id, true ); - $content_mail = sprintf( __( "New blog created by %1s\n\nAddress: http://%2s\nName: %3s"), $current_user->user_login , $newdomain.$path, stripslashes( $title ) ); - wp_mail( get_site_option('admin_email'), sprintf(__('[%s] New Blog Created'), $current_site->site_name), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' ); + $content_mail = sprintf( __( "New site created by %1s\n\nAddress: http://%2s\nName: %3s"), $current_user->user_login , $newdomain.$path, stripslashes( $title ) ); + wp_mail( get_site_option('admin_email'), sprintf(__('[%s] New Site Created'), $current_site->site_name), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' ); wpmu_welcome_notification( $id, $user_id, $password, $title, array( "public" => 1 ) ); wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'add-blog'), $_SERVER['HTTP_REFERER'] ) ); exit(); @@ -439,7 +439,7 @@ switch ( $_GET['action'] ) { >
-