Ticket #29452: 29452.2.diff
| File 29452.2.diff, 3.8 KB (added by , 12 years ago) |
|---|
-
src/wp-admin/setup-config.php
65 65 * @since 2.3.0 66 66 */ 67 67 function setup_config_display_header( $body_classes = array() ) { 68 global $wp_version ;68 global $wp_version, $wp_locale; 69 69 $body_classes = (array) $body_classes; 70 70 $body_classes[] = 'wp-core-ui'; 71 71 if ( is_rtl() ) { … … 87 87 <body class="<?php echo implode( ' ', $body_classes ); ?>"> 88 88 <h1 id="logo"><a href="<?php esc_attr_e( 'https://wordpress.org/' ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></h1> 89 89 <?php 90 if ( strpos( $GLOBALS['wp_version'], '-src' ) and ( 'rtl' == _x( 'ltr', 'text direction' ) ) ) { 91 $wp_locale->rtl_src_admin_notice(); 92 } 90 93 } // end function setup_config_display_header(); 91 94 92 95 $language = ''; … … 110 113 $loaded_language = wp_download_language_pack( $language ); 111 114 if ( $loaded_language ) { 112 115 load_default_textdomain( $loaded_language ); 116 $GLOBALS['wp_locale'] = new WP_Locale(); 113 117 } 114 118 } 115 119 116 120 setup_config_display_header(); 121 117 122 $step_1 = 'setup-config.php?step=1'; 118 123 if ( isset( $_REQUEST['noapi'] ) ) { 119 124 $step_1 .= '&noapi'; … … 144 149 145 150 case 1: 146 151 load_default_textdomain( $language ); 152 $GLOBALS['wp_locale'] = new WP_Locale(); 153 147 154 setup_config_display_header(); 148 155 ?> 149 156 <form method="post" action="setup-config.php?step=2"> … … 184 191 185 192 case 2: 186 193 load_default_textdomain( $language ); 194 $GLOBALS['wp_locale'] = new WP_Locale(); 195 187 196 $dbname = trim( wp_unslash( $_POST[ 'dbname' ] ) ); 188 197 $uname = trim( wp_unslash( $_POST[ 'uname' ] ) ); 189 198 $pwd = trim( wp_unslash( $_POST[ 'pwd' ] ) ); -
src/wp-admin/install.php
54 54 * @since 2.5.0 55 55 */ 56 56 function display_header( $body_classes = '' ) { 57 global $wp_locale; 57 58 header( 'Content-Type: text/html; charset=utf-8' ); 58 59 if ( is_rtl() ) { 59 60 $body_classes .= 'rtl'; … … 76 77 <h1 id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></h1> 77 78 78 79 <?php 80 if ( strpos( $GLOBALS['wp_version'], '-src' ) and ( 'rtl' == _x( 'ltr', 'text direction' ) ) ) { 81 $wp_locale->rtl_src_admin_notice(); 82 } 83 79 84 } // end display_header() 80 85 81 86 /** … … 204 209 $loaded_language = wp_download_language_pack( $langugage ); 205 210 if ( $loaded_language ) { 206 211 load_default_textdomain( $loaded_language ); 212 $GLOBALS['wp_locale'] = new WP_Locale(); 207 213 } 208 214 } 209 215 210 216 display_header(); 217 211 218 ?> 212 219 <h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1> 213 220 <p><?php __( 'Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you’ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ); ?></p> … … 221 228 case 2: 222 229 if ( ! empty( $langugage ) && load_default_textdomain( $langugage ) ) { 223 230 $loaded_language = $langugage; 231 $GLOBALS['wp_locale'] = new WP_Locale(); 224 232 } else { 225 233 $loaded_language = 'en_US'; 226 234 } … … 229 237 wp_die( $wpdb->error->get_error_message() ); 230 238 231 239 display_header(); 240 232 241 // Fill in the data we gathered 233 242 $weblog_title = isset( $_POST['weblog_title'] ) ? trim( wp_unslash( $_POST['weblog_title'] ) ) : ''; 234 243 $user_name = isset($_POST['user_name']) ? trim( wp_unslash( $_POST['user_name'] ) ) : ''; -
src/wp-admin/css/install.css
230 230 border-color: #8dff1c !important; 231 231 } 232 232 233 .error p, 233 234 .message { 234 235 border: 1px solid #c00; 235 236 padding: 0.5em 0.7em;