Ticket #20332: patch.2.diff

File patch.2.diff, 3.2 KB (added by dllh, 14 months ago)

applies changes to wpmu_validate_blog_signup() as well

  • wp-includes/ms-functions.php

     
    445445        $user_email = sanitize_email( $user_email ); 
    446446 
    447447        if ( empty( $user_name ) ) 
    448                 $errors->add('user_name', __('Please enter a username')); 
     448                $errors->add('user_name', __( 'Please enter a username.' ) ); 
    449449 
    450450        $illegal_names = get_site_option( 'illegal_names' ); 
    451451        if ( is_array( $illegal_names ) == false ) { 
     
    453453                add_site_option( 'illegal_names', $illegal_names ); 
    454454        } 
    455455        if ( in_array( $user_name, $illegal_names ) == true ) 
    456                 $errors->add('user_name',  __('That username is not allowed')); 
     456                $errors->add('user_name',  __( 'That username is not allowed.' ) ); 
    457457 
    458458        if ( is_email_address_unsafe( $user_email ) ) 
    459459                $errors->add('user_email',  __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.')); 
    460460 
    461461        if ( strlen( $user_name ) < 4 ) 
    462                 $errors->add('user_name',  __('Username must be at least 4 characters')); 
     462                $errors->add('user_name',  __( 'Username must be at least 4 characters.' ) ); 
    463463 
    464464        if ( strpos( ' ' . $user_name, '_' ) != false ) 
    465465                $errors->add( 'user_name', __( 'Sorry, usernames may not contain the character &#8220;_&#8221;!' ) ); 
     
    471471                $errors->add('user_name', __('Sorry, usernames must have letters too!')); 
    472472 
    473473        if ( !is_email( $user_email ) ) 
    474                 $errors->add('user_email', __('Please enter a correct email address')); 
     474                $errors->add('user_email', __( 'Please enter a correct email address.' ) ); 
    475475 
    476476        $limited_email_domains = get_site_option( 'limited_email_domains' ); 
    477477        if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) { 
     
    559559                $illegal_names = array_merge($illegal_names, apply_filters( 'subdirectory_reserved_names', array( 'page', 'comments', 'blog', 'files', 'feed' ) ) ); 
    560560 
    561561        if ( empty( $blogname ) ) 
    562                 $errors->add('blogname', __('Please enter a site name')); 
     562                $errors->add('blogname', __( 'Please enter a site name.' ) ); 
    563563 
    564564        if ( preg_match( '/[^a-z0-9]+/', $blogname ) ) 
    565                 $errors->add('blogname', __('Only lowercase letters and numbers allowed')); 
     565                $errors->add('blogname', __( 'Only lowercase letters and numbers allowed.' ) ); 
    566566 
    567567        if ( in_array( $blogname, $illegal_names ) == true ) 
    568                 $errors->add('blogname',  __('That name is not allowed')); 
     568                $errors->add('blogname',  __( 'That name is not allowed.' ) ); 
    569569 
    570570        if ( strlen( $blogname ) < 4 && !is_super_admin() ) 
    571                 $errors->add('blogname',  __('Site name must be at least 4 characters')); 
     571                $errors->add('blogname',  __( 'Site name must be at least 4 characters.' ) ); 
    572572 
    573573        if ( strpos( ' ' . $blogname, '_' ) != false ) 
    574574                $errors->add( 'blogname', __( 'Sorry, site names may not contain the character &#8220;_&#8221;!' ) ); 
     
    588588        $blog_title = stripslashes(  $blog_title ); 
    589589 
    590590        if ( empty( $blog_title ) ) 
    591                 $errors->add('blog_title', __('Please enter a site title')); 
     591                $errors->add('blog_title', __( 'Please enter a site title.' ) ); 
    592592 
    593593        // Check if the domain/path has been used already. 
    594594        if ( is_subdomain_install() ) {