WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

i18n: Skip language chooser for localized packages. 

Also fixes the install.php welcome string, which was not bring printed.

fixes #29487.

Built from https://develop.svn.wordpress.org/trunk@29705


git-svn-id: http://core.svn.wordpress.org/trunk@29479 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2014-09-04 14:39:15 +00:00
parent 0b3ba1e405
commit 34bf81970e
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wp-admin/install.php
View File

@ -181,15 +181,17 @@ if ( ! is_string( $wpdb->base_prefix ) || '' === $wpdb->base_prefix ) {
die( '<h1>' . __( 'Configuration Error' ) . '</h1><p>' . __( 'Your <code>wp-config.php</code> file has an empty database table prefix, which is not supported.' ) . '</p></body></html>' ); die( '<h1>' . __( 'Configuration Error' ) . '</h1><p>' . __( 'Your <code>wp-config.php</code> file has an empty database table prefix, which is not supported.' ) . '</p></body></html>' );
} }
$langugage = ''; $language = '';
if ( ! empty( $_REQUEST['language'] ) ) { if ( ! empty( $_REQUEST['language'] ) ) {
$langugage = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] ); $language = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] );
} elseif ( isset( $GLOBALS['wp_local_package'] ) ) {
$language = $GLOBALS['wp_local_package'];
} }
switch($step) { switch($step) {
case 0: // Step 0 case 0: // Step 0
if ( wp_can_install_language_pack() && empty( $langugage ) && ( $languages = wp_get_available_translations() ) ) { if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
display_header( 'language-chooser' ); display_header( 'language-chooser' );
echo '<form id="setup" method="post" action="?step=1">'; echo '<form id="setup" method="post" action="?step=1">';
wp_install_language_form( $languages ); wp_install_language_form( $languages );
@ -200,8 +202,8 @@ switch($step) {
// Deliberately fall through if we can't reach the translations API. // Deliberately fall through if we can't reach the translations API.
case 1: // Step 1, direct link or from language chooser. case 1: // Step 1, direct link or from language chooser.
if ( ! empty( $langugage ) ) { if ( ! empty( $language ) ) {
$loaded_language = wp_download_language_pack( $langugage ); $loaded_language = wp_download_language_pack( $language );
if ( $loaded_language ) { if ( $loaded_language ) {
load_default_textdomain( $loaded_language ); load_default_textdomain( $loaded_language );
$GLOBALS['wp_locale'] = new WP_Locale(); $GLOBALS['wp_locale'] = new WP_Locale();
@ -211,7 +213,7 @@ switch($step) {
display_header(); display_header();
?> ?>
<h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1> <h1><?php _ex( 'Welcome', 'Howdy' ); ?></h1>
<p><?php __( 'Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you&#8217;ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ); ?></p> <p><?php _e( 'Welcome to the famous five-minute WordPress installation process! Just fill in the information below and you&#8217;ll be on your way to using the most extendable and powerful personal publishing platform in the world.' ); ?></p>
<h1><?php _e( 'Information needed' ); ?></h1> <h1><?php _e( 'Information needed' ); ?></h1>
<p><?php _e( 'Please provide the following information. Don&#8217;t worry, you can always change these settings later.' ); ?></p> <p><?php _e( 'Please provide the following information. Don&#8217;t worry, you can always change these settings later.' ); ?></p>
@ -220,8 +222,8 @@ switch($step) {
display_setup_form(); display_setup_form();
break; break;
case 2: case 2:
if ( ! empty( $langugage ) && load_default_textdomain( $langugage ) ) { if ( ! empty( $language ) && load_default_textdomain( $language ) ) {
$loaded_language = $langugage; $loaded_language = $language;
$GLOBALS['wp_locale'] = new WP_Locale(); $GLOBALS['wp_locale'] = new WP_Locale();
} else { } else {
$loaded_language = 'en_US'; $loaded_language = 'en_US';

3
wp-admin/setup-config.php
View File

@ -90,7 +90,10 @@ function setup_config_display_header( $body_classes = array() ) {
$language = ''; $language = '';
if ( ! empty( $_REQUEST['language'] ) ) { if ( ! empty( $_REQUEST['language'] ) ) {
$language = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] ); $language = preg_replace( '/[^a-zA-Z_]/', '', $_REQUEST['language'] );
} elseif ( isset( $GLOBALS['wp_local_package'] ) ) {
$language = $GLOBALS['wp_local_package'];
} }
switch($step) { switch($step) {
case -1: case -1:
if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) { if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {