![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png){kind=logo}
Ticket #31840: 31840.patch
| File 31840.patch, 8.8 KB (added by , 11 years ago) |
|---|
-
network.php
103 103 } 104 104 105 105 if ( ! network_domain_check() && ( ! defined( 'WP_ALLOW_MULTISITE' ) || ! WP_ALLOW_MULTISITE ) ) 106 wp_die( __( 'You must define the <code>WP_ALLOW_MULTISITE</code> constant as true in your wp-config.php file to allow creation of a Network.' ) ); 106 wp_die( 107 printf( 108 /* translators: 1: WP_ALLOW_MULTISITE 2: wp-config.php */ 109 __( 'You must define the %1$s constant as true in your %2$s file to allow creation of a Network.' ), 110 '<code>WP_ALLOW_MULTISITE</code>', 111 '<code>wp-config.php</code>' 112 ) 113 ); 107 114 108 115 if ( is_network_admin() ) { 109 116 $title = __( 'Network Setup' ); … … 172 179 $has_ports = strstr( $hostname, ':' ); 173 180 if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) { 174 181 echo '<div class="error"><p><strong>' . __( 'ERROR:') . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>'; 175 echo '<p>' . sprintf( __( 'You cannot use port numbers such as <code>%s</code>.' ), $has_ports) . '</p>';182 echo '<p>' . sprintf( __( 'You cannot use port numbers such as %s.' ), '<code>'.$has_ports.'</code>' ) . '</p>'; 176 183 echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Return to Dashboard' ) . '</a>'; 177 184 echo '</div>'; 178 185 include( ABSPATH . 'wp-admin/admin-footer.php' ); … … 224 231 <tr> 225 232 <th><label><input type="radio" name="subdomain_install" value="1"<?php checked( $subdomain_install ); ?> /> <?php _e( 'Sub-domains' ); ?></label></th> 226 233 <td><?php printf( 227 /* translators: 1: hostname */ 228 _x( 'like <code>site1.%1$s</code> and <code>site2.%1$s</code>', 'subdomain examples' ), 229 $hostname 234 /* translators: 1: sub-domain example 1. 2: sub-domain example 2. */ 235 __( 'like %1$s and %2$s' ), 236 '<code>site1.' . $hostname . '</code>', 237 '<code>site2.' . $hostname . '</code>' 230 238 ); ?></td> 231 239 </tr> 232 240 <tr> 233 241 <th><label><input type="radio" name="subdomain_install" value="0"<?php checked( ! $subdomain_install ); ?> /> <?php _e( 'Sub-directories' ); ?></label></th> 234 242 <td><?php printf( 235 /* translators: 1: hostname */ 236 _x( 'like <code>%1$s/site1</code> and <code>%1$s/site2</code>', 'subdirectory examples' ), 237 $hostname 243 /* translators: 1: sub-directory example 1. 2: sub-directory example 2. */ 244 __( 'like %1$s and %2$s' ), 245 '<code>' . $hostname . '/site1</code>', 246 '<code>' . $hostname . '/site2</code>' 238 247 ); ?></td> 239 248 </tr> 240 249 </table> … … 249 258 if ( $is_www ) : 250 259 ?> 251 260 <h3><?php esc_html_e( 'Server Address' ); ?></h3> 252 <p><?php printf( __( 'We recommend you change your siteurl to <code>%1$s</code> before enabling the network feature. It will still be possible to visit your site using the <code>www</code> prefix with an address like <code>%2$s</code> but any links will not have the <code>www</code> prefix.' ), substr( $hostname, 4 ), $hostname ); ?></p> 261 <p><?php printf( 262 /* translators: 1: site url 2: host name 3. www */ 263 __( 'We recommend you change your siteurl to %1$s before enabling the network feature. It will still be possible to visit your site using the %3$s prefix with an address like %2$s but any links will not have the %3$s prefix.' ), 264 '<code>' . substr( $hostname, 4 ) . '</code>', 265 '<code>' . $hostname . '</code>', 266 '<code>www</code>' 267 ); ?></p> 253 268 <table class="form-table"> 254 269 <tr> 255 270 <th scope='row'><?php esc_html_e( 'Server Address' ); ?></th> 256 271 <td> 257 <?php printf( __( 'The internet address of your network will be <code>%s</code>.' ), $hostname ); ?> 272 <?php printf( 273 /* translators: host name */ 274 __( 'The internet address of your network will be %s.' ), 275 '<code>' . $hostname . '</code>' 276 ); ?> 258 277 </td> 259 278 </tr> 260 279 </table> … … 294 313 <tr> 295 314 <th scope='row'><?php esc_html_e( 'Server Address' ); ?></th> 296 315 <td> 297 <?php printf( __( 'The internet address of your network will be <code>%s</code>.' ), $hostname ); ?> 316 <?php printf( 317 /* translators: host name */ 318 __( 'The internet address of your network will be %s.' ), 319 '<code>' . $hostname . '</code>' 320 ); ?> 298 321 </td> 299 322 </tr> 300 323 <?php endif; ?> … … 380 403 <p><?php _e( 'Complete the following steps to enable the features for creating a network of sites.' ); ?></p> 381 404 <div class="updated inline"><p><?php 382 405 if ( file_exists( $home_path . '.htaccess' ) ) 383 printf( __( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> and <code>%s</code> files.' ), '.htaccess' ); 406 printf( 407 /* translators: 1: wp-config.php 2: .htaccess */ 408 __( '<strong>Caution:</strong> We recommend you back up your existing %1$s and %2$s files.' ), 409 '<code>wp-config.php</code>', 410 '<code>.htaccess</code>' 411 ); 384 412 elseif ( file_exists( $home_path . 'web.config' ) ) 385 printf( __( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> and <code>%s</code> files.' ), 'web.config' ); 413 printf( 414 /* translators: 1: wp-config.php 2: web.config */ 415 __( '<strong>Caution:</strong> We recommend you back up your existing %1$s and %2$s files.' ), 416 '<code>wp-config.php</code>', 417 '<code>web.config</code>' 418 ); 386 419 else 387 _e( '<strong>Caution:</strong> We recommend you back up your existing <code>wp-config.php</code> file.' ); 420 printf( 421 /* translators: 1: wp-config.php */ 422 __( '<strong>Caution:</strong> We recommend you back up your existing %s file.' ), 423 '<code>wp-config.php</code>' 424 ); 388 425 ?></p></div> 389 426 <?php 390 427 } 391 428 ?> 392 429 <ol> 393 <li><p><?php printf( __( 'Add the following to your <code>wp-config.php</code> file in <code>%s</code> <strong>above</strong> the line reading <code>/* That’s all, stop editing! Happy blogging. */</code>:' ), $location_of_wp_config ); ?></p> 430 <li><p><?php printf( 431 /* translators: 1: wp-config.php 2: location of wp-config file */ 432 __( 'Add the following to your %1$s file in %2$s <strong>above</strong> the line reading <code>/* That’s all, stop editing! Happy blogging. */</code>:' ), 433 '<code>wp-config.php</code>', 434 '<code>' . $location_of_wp_config . '</code>' 435 ); ?></p> 394 436 <textarea class="code" readonly="readonly" cols="100" rows="7"> 395 437 define('MULTISITE', true); 396 438 define('SUBDOMAIN_INSTALL', <?php echo $subdomain_install ? 'true' : 'false'; ?>); … … 424 466 <p> 425 467 <?php 426 468 if ( 1 == $num_keys_salts ) { 427 _e( 'This unique authentication key is also missing from your <code>wp-config.php</code> file.' ); 469 printf( 470 /* translators: 1: wp-config.php */ 471 __( 'This unique authentication key is also missing from your %s file.' ); 472 '<code>wp-config.php</code>', 473 ); 428 474 } else { 429 _e( 'These unique authentication keys are also missing from your <code>wp-config.php</code> file.' ); 475 printf( 476 /* translators: 1: wp-config.php */ 477 __( 'These unique authentication keys are also missing from your %s file.' ); 478 '<code>wp-config.php</code>', 479 ); 430 480 } 431 481 ?> 432 482 <?php _e( 'To make your installation more secure, you should also add:' ); ?> … … 491 541 '; 492 542 493 543 echo '<li><p>'; 494 /* translators: 1: a filename like .htaccess. 2: a file path. */ 495 printf( __( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ), 496 '<code>web.config</code>', '<code>' . $home_path . '</code>' ); 544 printf( 545 /* translators: 1: a filename like .htaccess. 2: a file path. */ 546 __( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ), 547 '<code>web.config</code>', 548 '<code>' . $home_path . '</code>' 549 ); 497 550 echo '</p>'; 498 551 if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' ) 499 552 echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>'; … … 528 581 EOF; 529 582 530 583 echo '<li><p>'; 531 /* translators: 1: a filename like .htaccess. 2: a file path. */ 532 printf( __( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ), 533 '<code>.htaccess</code>', '<code>' . $home_path . '</code>' ); 584 printf( 585 /* translators: 1: a filename like .htaccess. 2: a file path. */ 586 __( 'Add the following to your %1$s file in %2$s, <strong>replacing</strong> other WordPress rules:' ), 587 '<code>.htaccess</code>', 588 '<code>' . $home_path . '</code>' 589 ); 534 590 echo '</p>'; 535 591 if ( ! $subdomain_install && WP_CONTENT_DIR != ABSPATH . 'wp-content' ) 536 592 echo '<p><strong>' . __('Warning:') . ' ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</strong></p>';
