WordPress.org

Make WordPress Core

Ticket #26879: 26879-9.diff

File 26879-9.diff, 11.7 KB (added by Hanni, 7 years ago)

Promised edits to some of the wordy bits.

  • wp-admin/css/install.css

     
    77        background: #fff;
    88        color: #555;
    99        font-family: "Open Sans", sans-serif;
    10         margin: 140px auto 25px;
    11         padding: 20px 20px 10px 20px;
     10        margin: 8em auto;
     11        padding: 1em 2em;
    1212        max-width: 700px;
    1313        -webkit-font-smoothing: subpixel-antialiased;
    1414        -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.13);
     
    187187
    188188#error-page code, .code {
    189189        font-family: Consolas, Monaco, monospace;
     190        background: aliceblue;
    190191}
    191192
    192193#pass-strength-result {
  • wp-admin/setup-config.php

     
    112112                setup_config_display_header();
    113113?>
    114114
    115 <p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ) ?></p>
     115<p><?php _e( "OK! We need some information about your database." )?></p>
     116<p><?php _e("This information is available through your web host. If you don't have it, you'll need to get in touch with them. Here's what you need:" ) ?></p>
    116117<ol>
    117118        <li><?php _e( 'Database name' ); ?></li>
    118119        <li><?php _e( 'Database username' ); ?></li>
    119120        <li><?php _e( 'Database password' ); ?></li>
    120121        <li><?php _e( 'Database host' ); ?></li>
    121         <li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
    122122</ol>
    123 <p><strong><?php _e( "If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open <code>wp-config-sample.php</code> in a text editor, fill in your information, and save it as <code>wp-config.php</code>." ); ?></strong></p>
    124 <p><?php _e( "In all likelihood, these items were supplied to you by your Web Host. If you do not have this information, then you will need to contact them before you can continue. If you&#8217;re all ready&hellip;" ); ?></p>
     123<p><?php _e( "Once you fill in this information, WordPress will create a configuration file called wp-config.php. This connects WordPress with your database (that's where your content, settings, photos, and all that paraphernalia is stored). Need more help? Check out our <a href='http://codex.wordpress.org/Editing_wp-config.php'>documentation</a>." ); ?></p>
     124<p><?php _e( "If you&#8217;re all ready&hellip;" ); ?></p>
    125125
    126 <p class="step"><a href="setup-config.php?step=1<?php if ( isset( $_GET['noapi'] ) ) echo '&amp;noapi'; ?>" class="button button-large"><?php _e( 'Let&#8217;s go!' ); ?></a></p>
     126<p class="step"><a href="setup-config.php?step=1<?php if ( isset( $_GET['noapi'] ) ) echo '&amp;noapi'; ?>" class="button button-large"><?php _e( 'Let&#8217;s Go!' ); ?></a></p>
    127127<?php
    128128        break;
    129129
     
    131131                setup_config_display_header();
    132132        ?>
    133133<form method="post" action="setup-config.php?step=2">
    134         <p><?php _e( "Below you should enter your database connection details. If you&#8217;re not sure about these, contact your host." ); ?></p>
     134        <p><?php _e( "Below you should enter your MySQL database connection details. If you&#8217;re not sure about these, contact your host." ); ?></p>
    135135        <table class="form-table">
    136136                <tr>
    137137                        <th scope="row"><label for="dbname"><?php _e( 'Database Name' ); ?></label></th>
    138138                        <td><input name="dbname" id="dbname" type="text" size="25" value="wordpress" /></td>
    139                         <td><?php _e( 'The name of the database you want to run WP in.' ); ?></td>
     139                        <td><?php _e( 'The name of the database you want to use with WordPress.' ); ?></td>
    140140                </tr>
    141141                <tr>
    142142                        <th scope="row"><label for="uname"><?php _e( 'User Name' ); ?></label></th>
    143143                        <td><input name="uname" id="uname" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'username', 'example username' ), ENT_QUOTES ); ?>" /></td>
    144                         <td><?php _e( 'Your MySQL username' ); ?></td>
     144                        <td><?php _e( 'Your database username.' ); ?></td>
    145145                </tr>
    146146                <tr>
    147147                        <th scope="row"><label for="pwd"><?php _e( 'Password' ); ?></label></th>
    148148                        <td><input name="pwd" id="pwd" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'password', 'example password' ), ENT_QUOTES ); ?>" /></td>
    149                         <td><?php _e( '&hellip;and your MySQL password.' ); ?></td>
     149                        <td><?php _e( 'Your database password.' ); ?></td>
    150150                </tr>
    151151                <tr>
    152152                        <th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>
     
    169169        foreach ( array( 'dbname', 'uname', 'pwd', 'dbhost', 'prefix' ) as $key )
    170170                $$key = trim( wp_unslash( $_POST[ $key ] ) );
    171171
    172         $tryagain_link = '</p><p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
     172        $tryagain_link = '</p><p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try Again' ) . '</a>';
    173173
    174         if ( empty( $prefix ) )
    175                 wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
     174        // Validate $prefix: it must not be empty
     175                if ( empty( $prefix ) ):
     176                        $die  = '<h1 id="logo">' . __( "<a href='http://wordpress.org/'>WordPress</a>" ) . '</h1>';
     177                        $die .= '<p style="text-align: center;">' . __( "Oops, the Table Prefix field can't be empty. Please go back and try again." ) . '</p>';
     178                        $die .= '<p style="text-align: center;">'  . __( "Need more help? Check out our <a href='http://codex.wordpress.org/Editing_wp-config.php#table_prefix'>documentation</a>." ) . '</p>';
     179                        $die .= ( __( $tryagain_link ) );
     180                        wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
     181                endif;
    176182
    177183        // Validate $prefix: it can only contain letters, numbers and underscores.
    178         if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
    179                 wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
     184        if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ):
     185                        $die  = '<h1 id="logo">' . __( "<a href='http://wordpress.org/'>WordPress</a>" ) . '</h1>';
     186                        $die .= '<p style="text-align: center;">' . __( "Oops, the Table Prefix field can only contain numbers, letters, and underscores. Please go back and try again. ") . '</p>';
     187                        $die .= '<p style="text-align: center;">'  . __( " Need more help? Check out our <a href='http://codex.wordpress.org/Editing_wp-config.php#table_prefix'>documentation</a>." ) . '</p>';
     188                        $die .= ( __( $tryagain_link ) );
     189                        wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
     190                endif;
    180191
    181192        // Test the db connection.
    182193        /**#@+
     
    259270        if ( ! is_writable(ABSPATH) ) :
    260271                setup_config_display_header();
    261272?>
    262 <p><?php _e( "Sorry, but I can&#8217;t write the <code>wp-config.php</code> file." ); ?></p>
    263 <p><?php _e( 'You can create the <code>wp-config.php</code> manually and paste the following text into it.' ); ?></p>
     273<p><?php _e( 'Please manually create a file called <code>wp-config.php</code> in the root directory where the rest of your WordPress files are located and copy and paste the following text into the file:' ); ?></p>
    264274<textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php
    265275                foreach( $config_file as $line ) {
    266276                        echo htmlentities($line, ENT_COMPAT, 'UTF-8');
  • wp-includes/functions.php

     
    21942194        <style type="text/css">
    21952195                html {
    21962196                        background: #eee;
     2197                        margin: 0 20px;
    21972198                }
    21982199                body {
    21992200                        background: #fff;
    2200                         color: #333;
     2201                        color: #555;
    22012202                        font-family: "Open Sans", sans-serif;
    2202                         margin: 2em auto;
     2203                        margin: 8em auto;
    22032204                        padding: 1em 2em;
    22042205                        max-width: 700px;
     2206                        -webkit-font-smoothing: subpixel-antialiased;
    22052207                        -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.13);
    22062208                        box-shadow: 0 1px 3px rgba(0,0,0,0.13);
    22072209                }
     
    22142216                        padding: 0;
    22152217                        padding-bottom: 7px;
    22162218                }
    2217                 #error-page {
    2218                         margin-top: 50px;
    2219                 }
    22202219                #error-page p {
    22212220                        font-size: 14px;
    22222221                        line-height: 1.5;
    2223                         margin: 25px 0 20px;
     2222                        padding-bottom: 2px;
    22242223                }
    22252224                #error-page code {
    22262225                        font-family: Consolas, Monaco, monospace;
    22272226                }
     2227                #logo {
     2228                        margin: 6px 0 14px 0;
     2229                        border-bottom: none;
     2230                        text-align:center;
     2231                }
     2232                #logo a {
     2233                        background-image: url('../wp-admin/images/w-logo-blue.png');
     2234                        background-image: none, url('../wp-admin/images/wordpress-logo.svg');
     2235                        background-size: 80px 80px;
     2236                        background-position: center top;
     2237                        background-repeat: no-repeat;
     2238                        color: #999;
     2239                        height: 80px;
     2240                        font-size: 20px;
     2241                        font-weight: normal;
     2242                        line-height: 1.3em;
     2243                        margin: -154px auto 25px;
     2244                        padding: 0;
     2245                        text-decoration: none;
     2246                        width: 80px;
     2247                        text-indent: -9999px;
     2248                        outline: none;
     2249                        overflow: hidden;
     2250                        display: block;
     2251                }
     2252
    22282253                ul li {
    22292254                        margin-bottom: 10px;
    22302255                        font-size: 14px ;
  • wp-includes/wp-db.php

     
    972972                        $this->ready = false;
    973973                        if ( ! did_action( 'template_redirect' ) ) {
    974974                                wp_load_translations_early();
    975                                 $this->bail( sprintf( __( '<h1>Can&#8217;t select database</h1>
     975                                $this->bail( sprintf( __( '<h1 id="logo"><a href="http://wordpress.org/">WordPress</a></h1>
     976                                <h1>Can&#8217;t select database</h1>
    976977<p>We were able to connect to the database server (which means your username and password is okay) but not able to select the <code>%1$s</code> database.</p>
    977978<ul>
    978979<li>Are you sure it exists?</li>
     
    13551356                        }
    13561357
    13571358                        $this->bail( sprintf( __( "
     1359<h1 id='logo'><a href='http://wordpress.org/'>WordPress</a></h1>
    13581360<h1>Error establishing a database connection</h1>
    13591361<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>
    13601362<ul>
  • wp-load.php

     
    5353        $path = wp_guess_url() . '/wp-admin/setup-config.php';
    5454
    5555        // Die with an error message
    56         $die  = __( "There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started." ) . '</p>';
    57         $die .= '<p>' . __( "Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ) . '</p>';
    58         $die .= '<p>' . __( "You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file." ) . '</p>';
    59         $die .= '<p><a href="' . $path . '" class="button button-large">' . __( "Create a Configuration File" ) . '</a>';
    60 
    61         wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
     56        $die  = '<h1 id="logo">' . __( "<a href='http://wordpress.org/'>WordPress</a>" ) . '</h1>';
     57        $die .= '<h1 style="text-align: center;">' . __( "Welcome to WordPress!" ) . '</h1>';
     58        $die .= '<p>' . __( "WordPress is web software you can use to create a beautiful website, blog, or almost <a href='http://wordpress.org/showcase/'>anything you can imagine</a>. This free and Open Source software is built and maintained by a community of hundreds of volunteers, and there are countless of <a href='http://wordpress.org/plugins/'>plugins</a> and <a href='http://wordpress.org/themes/'>themes</a> available to transform your website." ) . '</p>';
     59        $die .= '<p style="text-align: center;"><a href="' . $path . '" class="button button-large">' . __( "Let's Get Started!" ) . '</a>';
     60       
     61        wp_die( $die, __( "Welcome to WordPress!" ) );
    6262}