Ticket #22306: 22306.patch

File 22306.patch, 6.3 KB (added by pavelevap, 7 months ago)

  • wp-admin/update.php

     
    9090        } elseif ( 'install-plugin' == $action ) { 
    9191 
    9292                if ( ! current_user_can('install_plugins') ) 
    93                         wp_die(__('You do not have sufficient permissions to install plugins for this site.')); 
     93                        wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) ); 
    9494 
    9595                include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api.. 
    9696 
    … …  
    121121        } elseif ( 'upload-plugin' == $action ) { 
    122122 
    123123                if ( ! current_user_can('install_plugins') ) 
    124                         wp_die(__('You do not have sufficient permissions to install plugins for this site.')); 
     124                        wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) ); 
    125125 
    126126                check_admin_referer('plugin-upload'); 
    127127 
    … …  
    194194        } elseif ( 'install-theme' == $action ) { 
    195195 
    196196                if ( ! current_user_can('install_themes') ) 
    197                         wp_die(__('You do not have sufficient permissions to install themes for this site.')); 
     197                        wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) ); 
    198198 
    199199                include_once ABSPATH . 'wp-admin/includes/theme-install.php'; //for themes_api.. 
    200200 
    … …  
    224224        } elseif ( 'upload-theme' == $action ) { 
    225225 
    226226                if ( ! current_user_can('install_themes') ) 
    227                         wp_die(__('You do not have sufficient permissions to install themes for this site.')); 
     227                        wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) ); 
    228228 
    229229                check_admin_referer('theme-upload'); 
    230230 

  • wp-includes/default-widgets.php

     
    844844        $show_date     = (int) $show_date; 
    845845 
    846846        if ( !$rss->get_item_quantity() ) { 
    847                 echo '<ul><li>' . __( 'An error has occurred; the feed is probably down. Try again later.' ) . '</li></ul>'; 
     847                echo '<ul><li>' . __( 'An error has occurred, which probably means the feed is down. Try again later.' ) . '</li></ul>'; 
    848848                $rss->__destruct(); 
    849849                unset($rss); 
    850850                return; 

  • wp-includes/ms-functions.php

     
    16761676        if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) ) 
    16771677                wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) ); 
    16781678 
    1679         wp_die( sprintf(__('You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.'), home_url(), admin_url() ), __('Success') ); 
     1679        wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress &rsaquo; Success' ) ); 
    16801680} 
    16811681 
    16821682/** 

  • wp-includes/ms-load.php

     
    234234 
    235235        wp_load_translations_early(); 
    236236 
    237         $title = __( 'Error establishing database connection' ); 
     237        $title = __( 'Error establishing a database connection' ); 
    238238        $msg  = '<h1>' . $title . '</h1>'; 
    239239        if ( ! is_admin() ) 
    240240                die( $msg ); 
    241241        $msg .= '<p>' . __( 'If your site does not display, please contact the owner of this network.' ) . ''; 
    242242        $msg .= ' ' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '</p>'; 
    243243        if ( false && !$wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ) 
    244                 $msg .= '<p>' . sprintf( __( '<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted <code>%s</code>. You really should look at your database now.' ), $wpdb->site ) . '</p>'; 
     244                $msg .= '<p><strong>' . __( 'Database tables are missing.' ) . '</strong> ' . sprintf( __( 'This means that MySQL is not running, WordPress was not installed properly, or someone deleted <code>%s</code>. You really should look at your database now.' ), $wpdb->site ) . '</p>'; 
    245245        else 
    246246                $msg .= '<p>' . sprintf( __( '<strong>Could not find site <code>%1$s</code>.</strong> Searched for table <code>%2$s</code> in database <code>%3$s</code>. Is that right?' ), rtrim( $domain . $path, '/' ), $wpdb->blogs, DB_NAME ) . '</p>'; 
    247247        $msg .= '<p><strong>' . __( 'What do I do now?' ) . '</strong> '; 

  • wp-includes/wp-db.php

     
    11421142 
    11431143                if ( !$this->dbh ) { 
    11441144                        wp_load_translations_early(); 
    1145                         $this->bail( sprintf( __( " 
    1146 <h1>Error establishing a database connection</h1> 
     1145                        $this->bail( '<h1>' . __( 'Error establishing a database connection' ) . '</h1>' . sprintf( __( " 
    11471146<p>This either means that the username and password information in your <code>wp-config.php</code> file is incorrect or we can't contact the database server at <code>%s</code>. This could mean your host's database server is down.</p> 
    11481147<ul> 
    11491148        <li>Are you sure you have the correct username and password?</li> 

  • wp-signup.php

     
    427427                                $newblog = get_blogaddress_by_name( $newblogname ); 
    428428 
    429429                                if ( $active_signup == 'blog' || $active_signup == 'all' ) 
    430                                         printf( __( '<p><em>The site you were looking for, <strong>%s</strong> does not exist, but you can create it now!</em></p>' ), $newblog ); 
     430                                        printf( '<p><em>' . __( 'The site you were looking for, <strong>%s</strong> does not exist, but you can create it now!' ) . '</p></em>', $newblog ); 
    431431                                else 
    432                                         printf( __( '<p><em>The site you were looking for, <strong>%s</strong>, does not exist.</em></p>' ), $newblog ); 
     432                                        printf( '<p><em>' . __( 'The site you were looking for, <strong>%s</strong>, does not exist.' ) . '</p></em>', $newblog ); 
    433433                        } 
    434434                        break; 
    435435        }