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

Introduce wp_load_translations_early(), which can be used before the locale is properly loaded in order to translate early error strings. Internationalize setup-config.php -- translators no longer have a reason to modify this file. fixes #18180. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19760 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-01-26 20:34:27 +00:00
parent e1068113ac
commit 81ed9a7563
9 changed files with 207 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,31 +41,31 @@ define('WP_CONTENT_DIR', ABSPATH . 'wp-content');
define('WP_DEBUG', false); define('WP_DEBUG', false);
/**#@-*/ /**#@-*/
require_once(ABSPATH . WPINC . '/load.php'); require(ABSPATH . WPINC . '/load.php');
require_once(ABSPATH . WPINC . '/version.php'); require(ABSPATH . WPINC . '/version.php');
// Also loads functions.php, plugin.php, l10n.php, pomo/mo.php (all required by setup-config.php)
wp_load_translations_early();
wp_check_php_mysql_versions(); wp_check_php_mysql_versions();
require_once(ABSPATH . WPINC . '/compat.php'); require_once(ABSPATH . WPINC . '/compat.php');
require_once(ABSPATH . WPINC . '/functions.php');
require_once(ABSPATH . WPINC . '/class-wp-error.php'); require_once(ABSPATH . WPINC . '/class-wp-error.php');
if (!file_exists(ABSPATH . 'wp-config-sample.php')) if ( ! file_exists( ABSPATH . 'wp-config-sample.php' ) )
wp_die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.'); wp_die( __( 'Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.' ) );
$config_file = file(ABSPATH . 'wp-config-sample.php'); $config_file = file(ABSPATH . 'wp-config-sample.php');
// Check if wp-config.php has been created // Check if wp-config.php has been created
if (file_exists(ABSPATH . 'wp-config.php')) if ( file_exists( ABSPATH . 'wp-config.php' ) )
wp_die("<p>The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>.</p>"); wp_die( '<p>' . sprintf( __( "The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='%s'>installing now</a>." ), 'install.php' ) . '</p>' );
// Check if wp-config.php exists above the root directory but is not part of another install // Check if wp-config.php exists above the root directory but is not part of another install
if (file_exists(ABSPATH . '../wp-config.php') && ! file_exists(ABSPATH . '../wp-settings.php')) if ( file_exists(ABSPATH . '../wp-config.php' ) && ! file_exists( ABSPATH . '../wp-settings.php' ) )
wp_die("<p>The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>.</p>"); wp_die( '<p>' . sprintf( __( "The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>."), 'install.php' ) . '</p>' );
if (isset($_GET['step'])) $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0;
$step = $_GET['step'];
else
$step = 0;
/** /**
* Display setup wp-config.php file header. * Display setup wp-config.php file header.
@ -82,7 +82,7 @@ function display_header() {
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>WordPress &rsaquo; Setup Configuration File</title> <title><?php _e( 'WordPress &rsaquo; Setup Configuration File' ); ?></title>
<link rel="stylesheet" href="css/install.css" type="text/css" /> <link rel="stylesheet" href="css/install.css" type="text/css" />
</head> </head>
@ -96,18 +96,18 @@ switch($step) {
display_header(); display_header();
?> ?>
<p>Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.</p> <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>
<ol> <ol>
<li>Database name</li> <li><?php _e( 'Database name' ); ?></li>
<li>Database username</li> <li><?php _e( 'Database username' ); ?></li>
<li>Database password</li> <li><?php _e( 'Database password' ); ?></li>
<li>Database host</li> <li><?php _e( 'Database host' ); ?></li>
<li>Table prefix (if you want to run more than one WordPress in a single database) </li> <li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
</ol> </ol>
<p><strong>If for any reason this automatic file creation doesn't work, don'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> <p><strong><?php _e( "If for any reason this automatic file creation doesn't work, don'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>
<p>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> <p>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>
<p class="step"><a href="setup-config.php?step=1<?php if ( isset( $_GET['noapi'] ) ) echo '&amp;noapi'; ?>" class="button">Let&#8217;s go!</a></p> <p class="step"><a href="setup-config.php?step=1<?php if ( isset( $_GET['noapi'] ) ) echo '&amp;noapi'; ?>" class="button"><?php _e( 'Let&#8217;s go!' ); ?></a></p>
<?php <?php
break; break;
@ -115,36 +115,36 @@ switch($step) {
display_header(); display_header();
?> ?>
<form method="post" action="setup-config.php?step=2"> <form method="post" action="setup-config.php?step=2">
<p>Below you should enter your database connection details. If you're not sure about these, contact your host. </p> <p><?php _e( "Below you should enter your database connection details. If you're not sure about these, contact your host." ); ?></p>
<table class="form-table"> <table class="form-table">
<tr> <tr>
<th scope="row"><label for="dbname">Database Name</label></th> <th scope="row"><label for="dbname"><?php _e( 'Database Name' ); ?></label></th>
<td><input name="dbname" id="dbname" type="text" size="25" value="wordpress" /></td> <td><input name="dbname" id="dbname" type="text" size="25" value="wordpress" /></td>
<td>The name of the database you want to run WP in. </td> <td><?php _e( 'The name of the database you want to run WP in.' ); ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><label for="uname">User Name</label></th> <th scope="row"><label for="uname"><?php _e( 'User Name' ); ?></label></th>
<td><input name="uname" id="uname" type="text" size="25" value="username" /></td> <td><input name="uname" id="uname" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'username', 'example username' ), ENT_QUOTES ); ?>" /></td>
<td>Your MySQL username</td> <td><?php _e( 'Your MySQL username' ); ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><label for="pwd">Password</label></th> <th scope="row"><label for="pwd"><?php _e( 'Password' ); ?></label></th>
<td><input name="pwd" id="pwd" type="text" size="25" value="password" /></td> <td><input name="pwd" id="pwd" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'password', 'example password' ), ENT_QUOTES ); ?>" /></td>
<td>...and your MySQL password.</td> <td><?php _e( '&hellip;and your MySQL password.' ); ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><label for="dbhost">Database Host</label></th> <th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>
<td><input name="dbhost" id="dbhost" type="text" size="25" value="localhost" /></td> <td><input name="dbhost" id="dbhost" type="text" size="25" value="localhost" /></td>
<td>You should be able to get this info from your web host, if <code>localhost</code> does not work.</td> <td><?php _e( 'You should be able to get this info from your web host, if <code>localhost</code> does not work.' ); ?></td>
</tr> </tr>
<tr> <tr>
<th scope="row"><label for="prefix">Table Prefix</label></th> <th scope="row"><label for="prefix"><?php _e( 'Table Prefix' ); ?></label></th>
<td><input name="prefix" id="prefix" type="text" value="wp_" size="25" /></td> <td><input name="prefix" id="prefix" type="text" value="wp_" size="25" /></td>
<td>If you want to run multiple WordPress installations in a single database, change this.</td> <td><?php _e( 'If you want to run multiple WordPress installations in a single database, change this.' ); ?></td>
</tr> </tr>
</table> </table>
<?php if ( isset( $_GET['noapi'] ) ) { ?><input name="noapi" type="hidden" value="true" /><?php } ?> <?php if ( isset( $_GET['noapi'] ) ) { ?><input name="noapi" type="hidden" value="1" /><?php } ?>
<p class="step"><input name="submit" type="submit" value="Submit" class="button" /></p> <p class="step"><input name="submit" type="submit" value="<?php echo htmlspecialchars( __( 'Submit' ), ENT_QUOTES ); ?>" class="button" /></p>
</form> </form>
<?php <?php
break; break;
@ -160,7 +160,7 @@ switch($step) {
// Validate $prefix: it can only contain letters, numbers and underscores // Validate $prefix: it can only contain letters, numbers and underscores
if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
wp_die( /*WP_I18N_BAD_PREFIX*/'<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.'/*/WP_I18N_BAD_PREFIX*/ ); wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' ) );
// Test the db connection. // Test the db connection.
/**#@+ /**#@+
@ -175,15 +175,12 @@ switch($step) {
// We'll fail here if the values are no good. // We'll fail here if the values are no good.
require_wp_db(); require_wp_db();
if ( ! empty( $wpdb->error ) ) { if ( ! empty( $wpdb->error ) ) {
$back = '<p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button">Try Again</a></p>'; $back = '<p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button">' . __( 'Try Again' ) . '</a></p>';
wp_die( $wpdb->error->get_error_message() . $back ); wp_die( $wpdb->error->get_error_message() . $back );
} }
// Fetch or generate keys and salts. // Fetch or generate keys and salts.
$no_api = isset( $_POST['noapi'] ); $no_api = isset( $_POST['noapi'] );
require_once( ABSPATH . WPINC . '/plugin.php' );
require_once( ABSPATH . WPINC . '/l10n.php' );
require_once( ABSPATH . WPINC . '/pomo/translations.php' );
if ( ! $no_api ) { if ( ! $no_api ) {
require_once( ABSPATH . WPINC . '/class-http.php' ); require_once( ABSPATH . WPINC . '/class-http.php' );
require_once( ABSPATH . WPINC . '/http.php' ); require_once( ABSPATH . WPINC . '/http.php' );
@ -248,15 +245,15 @@ switch($step) {
if ( ! is_writable(ABSPATH) ) : if ( ! is_writable(ABSPATH) ) :
display_header(); display_header();
?> ?>
<p>Sorry, but I can't write the <code>wp-config.php</code> file.</p> <p><?php _e( "Sorry, but I can't write the <code>wp-config.php</code> file." ); ?></p>
<p>You can create the <code>wp-config.php</code> manually and paste the following text into it.</p> <p><?php _e( 'You can create the <code>wp-config.php</code> manually and paste the following text into it.' ); ?></p>
<textarea cols="98" rows="15" class="code"><?php <textarea cols="98" rows="15" class="code"><?php
foreach( $config_file as $line ) { foreach( $config_file as $line ) {
echo htmlentities($line, ENT_COMPAT, 'UTF-8'); echo htmlentities($line, ENT_COMPAT, 'UTF-8');
} }
?></textarea> ?></textarea>
<p>After you've done that, click "Run the install."</p> <p><?php _e( 'After you\'ve done that, click "Run the install."' ); ?></p>
<p class="step"><a href="install.php" class="button">Run the install</a></p> <p class="step"><a href="install.php" class="button"><?php _e( 'Run the install' ); ?></a></p>
<?php <?php
else : else :
$handle = fopen(ABSPATH . 'wp-config.php', 'w'); $handle = fopen(ABSPATH . 'wp-config.php', 'w');
@ -267,9 +264,9 @@ switch($step) {
chmod(ABSPATH . 'wp-config.php', 0666); chmod(ABSPATH . 'wp-config.php', 0666);
display_header(); display_header();
?> ?>
<p>All right sparky! You've made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;</p> <p><?php _e( "All right sparky! You've made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to&hellip;" ); ?></p>
<p class="step"><a href="install.php" class="button">Run the install</a></p> <p class="step"><a href="install.php" class="button"><?php _e( 'Run the install' ); ?></a></p>
<?php <?php
endif; endif;
break; break;

10
wp-includes/functions.php
View File

@ -1201,8 +1201,10 @@ function is_blog_installed() {
// One or more tables exist. We are insane. // One or more tables exist. We are insane.
wp_load_translations_early();
// Die with a DB error. // Die with a DB error.
$wpdb->error = sprintf( /*WP_I18N_NO_TABLES*/'One or more database tables are unavailable. The database may need to be <a href="%s">repaired</a>.'/*/WP_I18N_NO_TABLES*/, 'maint/repair.php?referrer=is_blog_installed' ); $wpdb->error = sprintf( __( 'One or more database tables are unavailable. The database may need to be <a href="%s">repaired</a>.' ), 'maint/repair.php?referrer=is_blog_installed' );
dead_db(); dead_db();
} }
@ -2647,16 +2649,18 @@ function dead_db() {
status_header( 500 ); status_header( 500 );
nocache_headers(); nocache_headers();
header( 'Content-Type: text/html; charset=utf-8' ); header( 'Content-Type: text/html; charset=utf-8' );
wp_load_translations_early();
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) ) language_attributes(); ?>> <html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) ) language_attributes(); ?>>
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo /*WP_I18N_DB_ERROR*/'Database Error'/*/WP_I18N_DB_ERROR*/; ?></title> <title><?php _e( 'Database Error' ); ?></title>
</head> </head>
<body> <body>
<h1><?php echo /*WP_I18N_DB_CONNECTION_ERROR*/'Error establishing a database connection'/*/WP_I18N_DB_CONNECTION_ERROR*/; ?></h1> <h1><?php _e( 'Error establishing a database connection' ); ?></h1>
</body> </body>
</html> </html>
<?php <?php

115
wp-includes/load.php
View File

@ -19,7 +19,7 @@ function wp_unregister_GLOBALS() {
return; return;
if ( isset( $_REQUEST['GLOBALS'] ) ) if ( isset( $_REQUEST['GLOBALS'] ) )
die( /*WP_I18N_GLOBALS_OVERWRITE*/'GLOBALS overwrite attempt detected'/*/WP_I18N_GLOBALS_OVERWRITE*/ ); die( 'GLOBALS overwrite attempt detected' );
// Variables that shouldn't be unset // Variables that shouldn't be unset
$no_unset = array( 'GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix' ); $no_unset = array( 'GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix' );
@ -97,22 +97,21 @@ function wp_fix_server_vars() {
* *
* Dies if requirements are not met. * Dies if requirements are not met.
* *
* This function must be able to work without a complete environment set up. In wp-load.php, for
* example, WP_CONTENT_DIR is defined and version.php is included before this function is called.
*
* @access private * @access private
* @since 3.0.0 * @since 3.0.0
*/ */
function wp_check_php_mysql_versions() { function wp_check_php_mysql_versions() {
// we can probably extend this function to check if wp_die() exists then use translated strings, and then use it in install.php etc.
global $required_php_version, $wp_version; global $required_php_version, $wp_version;
$php_version = phpversion(); $php_version = phpversion();
if ( version_compare( $required_php_version, $php_version, '>' ) ) if ( version_compare( $required_php_version, $php_version, '>' ) ) {
die( sprintf( /*WP_I18N_OLD_PHP*/'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.'/*/WP_I18N_OLD_PHP*/, $php_version, $wp_version, $required_php_version ) ); wp_load_translations_early();
wp_die( sprintf( __( 'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.' ), $php_version, $wp_version, $required_php_version ) );
}
if ( !extension_loaded( 'mysql' ) && !file_exists( WP_CONTENT_DIR . '/db.php' ) ) if ( ! extension_loaded( 'mysql' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
die( /*WP_I18N_OLD_MYSQL*/'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.'/*/WP_I18N_OLD_MYSQL*/ ); wp_load_translations_early();
wp_die( __( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' ) );
}
} }
/** /**
@ -159,6 +158,8 @@ function wp_maintenance() {
die(); die();
} }
wp_load_translations_early();
$protocol = $_SERVER["SERVER_PROTOCOL"]; $protocol = $_SERVER["SERVER_PROTOCOL"];
if ( 'HTTP/1.1' != $protocol && 'HTTP/1.0' != $protocol ) if ( 'HTTP/1.1' != $protocol && 'HTTP/1.0' != $protocol )
$protocol = 'HTTP/1.0'; $protocol = 'HTTP/1.0';
@ -170,11 +171,11 @@ function wp_maintenance() {
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo /*WP_I18N_MAINTENANCE*/'Maintenance'/*/WP_I18N_MAINTENANCE*/; ?></title> <title><?php _e( 'Maintenance' ); ?></title>
</head> </head>
<body> <body>
<h1><?php echo /*WP_I18N_MAINT_MSG*/'Briefly unavailable for scheduled maintenance. Check back in a minute.'/*/WP_I18N_MAINT_MSG*/; ?></h1> <h1><?php _e( 'Briefly unavailable for scheduled maintenance. Check back in a minute.' ); ?></h1>
</body> </body>
</html> </html>
<?php <?php
@ -364,8 +365,10 @@ function wp_set_wpdb_vars() {
$prefix = $wpdb->set_prefix( $table_prefix ); $prefix = $wpdb->set_prefix( $table_prefix );
if ( is_wp_error( $prefix ) ) if ( is_wp_error( $prefix ) ) {
wp_die( /*WP_I18N_BAD_PREFIX*/'<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores.'/*/WP_I18N_BAD_PREFIX*/ ); wp_load_translations_early();
wp_die( __( '<strong>ERROR</strong>: <code>$table_prefix</code> in <code>wp-config.php</code> can only contain numbers, letters, and underscores.' ) );
}
} }
/** /**
@ -649,3 +652,87 @@ function is_multisite() {
return false; return false;
} }
/**
* Attempts an early load of translations.
*
* Used for errors encountered during the initial loading process, before the locale has been
* properly detected and loaded.
*
* Designed for unusual load sequences (like setup-config.php) or for when the script will then
* terminate with an error, otherwise there is a risk that a file can be double-included.
*
* @since 3.4.0
* @access private
*/
function wp_load_translations_early() {
global $text_direction, $wp_locale;
static $loaded = false;
if ( $loaded )
return;
$loaded = true;
if ( function_exists( 'did_action' ) && did_action( 'init' ) )
return;
// We need $wp_local_package
require ABSPATH . WPINC . '/version.php';
// Translation and localization
require_once ABSPATH . WPINC . '/pomo/mo.php';
require_once ABSPATH . WPINC . '/l10n.php';
require_once ABSPATH . WPINC . '/locale.php';
// General libraries
require_once ABSPATH . WPINC . '/functions.php';
require_once ABSPATH . WPINC . '/plugin.php';
$locales = $locations = array();
while ( true ) {
if ( defined( 'WPLANG' ) ) {
if ( '' == WPLANG )
break;
$locales[] = WPLANG;
}
if ( isset( $wp_local_package ) )
$locales[] = $wp_local_package;
if ( ! $locales )
break;
if ( defined( 'WP_LANG_DIR' ) && @is_dir( WP_LANG_DIR ) )
$locations[] = WP_LANG_DIR;
if ( defined( 'WP_CONTENT_DIR' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) )
$locations[] = WP_CONTENT_DIR . '/languages';
if ( @is_dir( ABSPATH . 'wp-content/languages' ) )
$locations[] = ABSPATH . 'wp-content/languages';
if ( @is_dir( ABSPATH . WPINC . '/languages' ) )
$locations[] = ABSPATH . WPINC . '/languages';
if ( ! $locations )
break;
$locations = array_unique( $locations );
foreach ( $locales as $locale ) {
foreach ( $locations as $location ) {
if ( file_exists( $location . '/' . $locale . '.mo' ) ) {
load_textdomain( 'default', $location . '/' . $locale . '.mo' );
if ( WP_Locale::is_locale_rtl( $locale ) )
$text_direction = 'rtl';
break 2;
}
}
}
break;
}
$wp_locale = new WP_Locale();
}

7
wp-includes/locale.php
View File

@ -87,7 +87,7 @@ class WP_Locale {
/** /**
* Locales which are known to be right-to-left. * Locales which are known to be right-to-left.
*/ */
private $rtl_locales = array( 'ar', 'ckb', 'fa_IR', 'he_IL', 'ug_CN', 'dv', 'fa_AF', 'ha', 'ps', 'uz_UZ', 'yi' ); private static $rtl_locales = array( 'ar', 'ckb', 'fa_IR', 'he_IL', 'ug_CN', 'dv', 'fa_AF', 'ha', 'ps', 'uz_UZ', 'yi' );
/** /**
* Sets up the translated strings and object properties. * Sets up the translated strings and object properties.
@ -183,7 +183,7 @@ class WP_Locale {
$this->number_format['decimal_point'] = ('number_format_decimal_point' == $trans) ? '.' : $trans; $this->number_format['decimal_point'] = ('number_format_decimal_point' == $trans) ? '.' : $trans;
// Locale-specific tweaks // Locale-specific tweaks
if ( in_array( get_locale(), $this->rtl_locales ) ) if ( self::is_locale_rtl( get_locale() ) )
$this->text_direction = 'rtl'; $this->text_direction = 'rtl';
// Import the $text_direction global. // Import the $text_direction global.
@ -333,6 +333,9 @@ class WP_Locale {
return 'rtl' == $this->text_direction; return 'rtl' == $this->text_direction;
} }
public static function is_locale_rtl( $locale ) {
return in_array( $locale, self::$rtl_locales );
}
} }
/** /**

24
wp-includes/ms-load.php
View File

@ -211,10 +211,12 @@ function wpmu_current_site() {
} }
// Still no dice. // Still no dice.
wp_load_translations_early();
if ( 1 == count( $sites ) ) if ( 1 == count( $sites ) )
wp_die( sprintf( /*WP_I18N_BLOG_DOESNT_EXIST*/'That site does not exist. Please try <a href="%s">%s</a>.'/*/WP_I18N_BLOG_DOESNT_EXIST*/, $sites[0]->domain . $sites[0]->path ) ); wp_die( sprintf( __( 'That site does not exist. Please try <a href="%s">%s</a>.' ), 'http://' . $sites[0]->domain . $sites[0]->path ) );
else else
wp_die( /*WP_I18N_NO_SITE_DEFINED*/'No site defined on this host. If you are the owner of this site, please check <a href="http://codex.wordpress.org/Debugging_a_WordPress_Network">Debugging a WordPress Network</a> for help.'/*/WP_I18N_NO_SITE_DEFINED*/ ); wp_die( __( 'No site defined on this host. If you are the owner of this site, please check <a href="http://codex.wordpress.org/Debugging_a_WordPress_Network">Debugging a WordPress Network</a> for help.' ) );
} }
/** /**
@ -228,19 +230,21 @@ function wpmu_current_site() {
function ms_not_installed() { function ms_not_installed() {
global $wpdb, $domain, $path; global $wpdb, $domain, $path;
$title = /*WP_I18N_FATAL_ERROR*/'Error establishing database connection'/*/WP_I18N_FATAL_ERROR*/; wp_load_translations_early();
$title = __( 'Error establishing database connection' );
$msg = '<h1>' . $title . '</h1>'; $msg = '<h1>' . $title . '</h1>';
if ( ! is_admin() ) if ( ! is_admin() )
die( $msg ); die( $msg );
$msg .= '<p>' . /*WP_I18N_CONTACT_OWNER*/'If your site does not display, please contact the owner of this network.'/*/WP_I18N_CONTACT_OWNER*/ . ''; $msg .= '<p>' . __( 'If your site does not display, please contact the owner of this network.' ) . '';
$msg .= ' ' . /*WP_I18N_CHECK_MYSQL*/'If you are the owner of this network please check that MySQL is running properly and all tables are error free.'/*/WP_I18N_CHECK_MYSQL*/ . '</p>'; $msg .= ' ' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '</p>';
if ( false && !$wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ) if ( false && !$wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) )
$msg .= '<p>' . sprintf( /*WP_I18N_TABLES_MISSING_LONG*/'<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.'/*/WP_I18N_TABLES_MISSING_LONG*/, $wpdb->site ) . '</p>'; $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>';
else else
$msg .= '<p>' . sprintf( /*WP_I18N_NO_SITE_FOUND*/'<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?'/*/WP_I18N_NO_SITE_FOUND*/, rtrim( $domain . $path, '/' ), $wpdb->blogs, DB_NAME ) . '</p>'; $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>';
$msg .= '<p><strong>' . /*WP_I18N_WHAT_DO_I_DO*/'What do I do now?'/*/WP_I18N_WHAT_DO_I_DO*/ . '</strong> '; $msg .= '<p><strong>' . __( 'What do I do now?' ) . '</strong> ';
$msg .= /*WP_I18N_RTFM*/'Read the <a target="_blank" href="http://codex.wordpress.org/Debugging_a_WordPress_Network">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.'/*/WP_I18N_RTFM*/; $msg .= __( 'Read the <a target="_blank" href="http://codex.wordpress.org/Debugging_a_WordPress_Network">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.' );
$msg .= ' ' . /*WP_I18N_STUCK*/'If you&#8217;re still stuck with this message, then check that your database contains the following tables:'/*/WP_I18N_STUCK*/ . '</p><ul>'; $msg .= ' ' . __( 'If you&#8217;re still stuck with this message, then check that your database contains the following tables:' ) . '</p><ul>';
foreach ( $wpdb->tables('global') as $t => $table ) { foreach ( $wpdb->tables('global') as $t => $table ) {
if ( 'sitecategories' == $t ) if ( 'sitecategories' == $t )
continue; continue;

8
wp-includes/ms-settings.php
View File

@ -31,7 +31,8 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) {
$domain = substr( $domain, 0, -4 ); $domain = substr( $domain, 0, -4 );
$_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 ); $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 );
} else { } else {
wp_die( /*WP_I18N_NO_PORT_NUMBER*/'Multisite only works without the port number in the URL.'/*/WP_I18N_NO_PORT_NUMBER*/ ); wp_load_translations_early();
wp_die( __( 'Multisite only works without the port number in the URL.' ) );
} }
} }
@ -116,8 +117,9 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) {
if ( defined( 'WP_INSTALLING' ) ) { if ( defined( 'WP_INSTALLING' ) ) {
$current_blog->blog_id = $blog_id = 1; $current_blog->blog_id = $blog_id = 1;
} else { } else {
$msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . /*WP_I18N_TABLES_MISSING*/'Database tables are missing.'/*/WP_I18N_TABLES_MISSING*/ : ''; wp_load_translations_early();
wp_die( /*WP_I18N_NO_BLOG*/'No site by that name on this system.'/*/WP_I18N_NO_BLOG*/ . $msg ); $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . __( 'Database tables are missing.' ) : '';
wp_die( __( 'No site by that name on this system.' ) . $msg );
} }
} }
} }

23
wp-includes/wp-db.php
View File

@ -573,7 +573,7 @@ class wpdb {
function set_prefix( $prefix, $set_table_names = true ) { function set_prefix( $prefix, $set_table_names = true ) {
if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
return new WP_Error('invalid_db_prefix', /*WP_I18N_DB_BAD_PREFIX*/'Invalid database prefix'/*/WP_I18N_DB_BAD_PREFIX*/); return new WP_Error('invalid_db_prefix', 'Invalid database prefix' );
$old_prefix = is_multisite() ? '' : $prefix; $old_prefix = is_multisite() ? '' : $prefix;
@ -745,14 +745,15 @@ class wpdb {
if ( !@mysql_select_db( $db, $dbh ) ) { if ( !@mysql_select_db( $db, $dbh ) ) {
$this->ready = false; $this->ready = false;
$this->bail( sprintf( /*WP_I18N_DB_SELECT_DB*/'<h1>Can&#8217;t select database</h1> wp_load_translations_early();
$this->bail( sprintf( __( '<h1>Can&#8217;t select database</h1>
<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> <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>
<ul> <ul>
<li>Are you sure it exists?</li> <li>Are you sure it exists?</li>
<li>Does the user <code>%2$s</code> have permission to use the <code>%1$s</code> database?</li> <li>Does the user <code>%2$s</code> have permission to use the <code>%1$s</code> database?</li>
<li>On some systems the name of your database is prefixed with your username, so it would be like <code>username_%1$s</code>. Could that be the problem?</li> <li>On some systems the name of your database is prefixed with your username, so it would be like <code>username_%1$s</code>. Could that be the problem?</li>
</ul> </ul>
<p>If you don\'t know how to set up a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="http://wordpress.org/support/">WordPress Support Forums</a>.</p>'/*/WP_I18N_DB_SELECT_DB*/, $db, $this->dbuser ), 'db_select_fail' ); <p>If you don\'t know how to set up a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="http://wordpress.org/support/">WordPress Support Forums</a>.</p>' ), $db, $this->dbuser ), 'db_select_fail' );
return; return;
} }
} }
@ -923,10 +924,12 @@ class wpdb {
if ( $this->suppress_errors ) if ( $this->suppress_errors )
return false; return false;
wp_load_translations_early();
if ( $caller = $this->get_caller() ) if ( $caller = $this->get_caller() )
$error_str = sprintf( /*WP_I18N_DB_QUERY_ERROR_FULL*/'WordPress database error %1$s for query %2$s made by %3$s'/*/WP_I18N_DB_QUERY_ERROR_FULL*/, $str, $this->last_query, $caller ); $error_str = sprintf( __( 'WordPress database error %1$s for query %2$s made by %3$s' ), $str, $this->last_query, $caller );
else else
$error_str = sprintf( /*WP_I18N_DB_QUERY_ERROR*/'WordPress database error %1$s for query %2$s'/*/WP_I18N_DB_QUERY_ERROR*/, $str, $this->last_query ); $error_str = sprintf( __( 'WordPress database error %1$s for query %2$s' ), $str, $this->last_query );
if ( function_exists( 'error_log' ) if ( function_exists( 'error_log' )
&& ( $log_file = @ini_get( 'error_log' ) ) && ( $log_file = @ini_get( 'error_log' ) )
@ -1037,7 +1040,8 @@ class wpdb {
} }
if ( !$this->dbh ) { if ( !$this->dbh ) {
$this->bail( sprintf( /*WP_I18N_DB_CONN_ERROR*/" wp_load_translations_early();
$this->bail( sprintf( __( "
<h1>Error establishing a database connection</h1> <h1>Error establishing a database connection</h1>
<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> <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>
<ul> <ul>
@ -1046,7 +1050,7 @@ class wpdb {
<li>Are you sure that the database server is running?</li> <li>Are you sure that the database server is running?</li>
</ul> </ul>
<p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='http://wordpress.org/support/'>WordPress Support Forums</a>.</p> <p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='http://wordpress.org/support/'>WordPress Support Forums</a>.</p>
"/*/WP_I18N_DB_CONN_ERROR*/, $this->dbhost ), 'db_connect_fail' ); " ), $this->dbhost ), 'db_connect_fail' );
return; return;
} }
@ -1073,8 +1077,7 @@ class wpdb {
return false; return false;
// some queries are made before the plugins have been loaded, and thus cannot be filtered with this method // some queries are made before the plugins have been loaded, and thus cannot be filtered with this method
if ( function_exists( 'apply_filters' ) ) $query = apply_filters( 'query', $query );
$query = apply_filters( 'query', $query );
$return_val = 0; $return_val = 0;
$this->flush(); $this->flush();
@ -1326,7 +1329,7 @@ class wpdb {
} elseif ( $output == ARRAY_N ) { } elseif ( $output == ARRAY_N ) {
return $this->last_result[$y] ? array_values( get_object_vars( $this->last_result[$y] ) ) : null; return $this->last_result[$y] ? array_values( get_object_vars( $this->last_result[$y] ) ) : null;
} else { } else {
$this->print_error(/*WP_I18N_DB_GETROW_ERROR*/" \$db->get_row(string query, output type, int offset) -- Output type must be one of: OBJECT, ARRAY_A, ARRAY_N"/*/WP_I18N_DB_GETROW_ERROR*/); $this->print_error( " \$db->get_row(string query, output type, int offset) -- Output type must be one of: OBJECT, ARRAY_A, ARRAY_N" );
} }
} }

22
wp-load.php
View File

@ -39,21 +39,23 @@ if ( file_exists( ABSPATH . 'wp-config.php') ) {
// Set a path for the link to the installer // Set a path for the link to the installer
if ( strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false ) if ( strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false )
$path = ''; $path = 'setup-config.php';
else else
$path = 'wp-admin/'; $path = 'wp-admin/setup-config.php';
require_once( ABSPATH . '/wp-includes/load.php' );
require_once( ABSPATH . '/wp-includes/version.php' );
define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
define( 'WPINC', 'wp-includes' ); define( 'WPINC', 'wp-includes' );
define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' );
require_once( ABSPATH . WPINC . '/load.php' );
require_once( ABSPATH . WPINC . '/version.php' );
wp_load_translations_early();
wp_check_php_mysql_versions(); wp_check_php_mysql_versions();
// Die with an error message // Die with an error message
require_once( ABSPATH . '/wp-includes/class-wp-error.php' ); $die = '<p>' . __( "There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started." ) . '</p>';
require_once( ABSPATH . '/wp-includes/functions.php' ); $die .= '<p>' . __( "Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ) . '</p>';
require_once( ABSPATH . '/wp-includes/plugin.php' ); $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>';
$text_direction = /*WP_I18N_TEXT_DIRECTION*/'ltr'/*/WP_I18N_TEXT_DIRECTION*/; $die .= '<p><a href="' . $path . '" class="button">' . __( "Create a Configuration File" ) . '</a></p>';
wp_die(sprintf(/*WP_I18N_NO_CONFIG*/"<p>There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started.</p> <p>Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>.</p> <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><p><a href='%ssetup-config.php' class='button'>Create a Configuration File</a></p>"/*/WP_I18N_NO_CONFIG*/, $path), /*WP_I18N_ERROR_TITLE*/'WordPress &rsaquo; Error'/*/WP_I18N_ERROR_TITLE*/, array('text_direction' => $text_direction));
wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
} }

8
wp-settings.php
View File

@ -70,6 +70,7 @@ require( ABSPATH . WPINC . '/functions.php' );
require( ABSPATH . WPINC . '/class-wp.php' ); require( ABSPATH . WPINC . '/class-wp.php' );
require( ABSPATH . WPINC . '/class-wp-error.php' ); require( ABSPATH . WPINC . '/class-wp-error.php' );
require( ABSPATH . WPINC . '/plugin.php' ); require( ABSPATH . WPINC . '/plugin.php' );
require( ABSPATH . WPINC . '/pomo/mo.php' );
// Include the wpdb class and, if present, a db.php database drop-in. // Include the wpdb class and, if present, a db.php database drop-in.
require_wp_db(); require_wp_db();
@ -81,9 +82,8 @@ wp_set_wpdb_vars();
// Start the WordPress object cache, or an external object cache if the drop-in is present. // Start the WordPress object cache, or an external object cache if the drop-in is present.
wp_start_object_cache(); wp_start_object_cache();
// Load early WordPress files. // Attach the default filters.
require( ABSPATH . WPINC . '/default-filters.php' ); require( ABSPATH . WPINC . '/default-filters.php' );
require( ABSPATH . WPINC . '/pomo/mo.php' );
// Initialize multisite if enabled. // Initialize multisite if enabled.
if ( is_multisite() ) { if ( is_multisite() ) {
@ -100,7 +100,7 @@ if ( SHORTINIT )
return false; return false;
// Load the L10n library. // Load the L10n library.
require( ABSPATH . WPINC . '/l10n.php' ); require_once( ABSPATH . WPINC . '/l10n.php' );
// Run the installer if WordPress is not installed. // Run the installer if WordPress is not installed.
wp_not_installed(); wp_not_installed();
@ -268,7 +268,7 @@ if ( ( 0 === validate_file( $locale ) ) && is_readable( $locale_file ) )
unset($locale_file); unset($locale_file);
// Pull in locale data after loading text domain. // Pull in locale data after loading text domain.
require( ABSPATH . WPINC . '/locale.php' ); require_once( ABSPATH . WPINC . '/locale.php' );
/** /**
* WordPress Locale object for loading locale domain date and various strings. * WordPress Locale object for loading locale domain date and various strings.