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

Wrap transtable strings used in Network install in WP_I18N_SOMETHING, because translations still aren't loaded. Fixes #12357 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13797 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nbachiyski 2010-03-22 06:51:49 +00:00
parent 55ebce714a
commit 70b7755535
3 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/functions.php
View File

@ -1831,7 +1831,7 @@ function is_blog_installed() {
if ( defined('WP_REPAIRING') ) if ( defined('WP_REPAIRING') )
return true; return true;
// Die with a DB error. // Die with a DB error.
$wpdb->error = __('One or more database tables are unavailable. The database may need to be <a href="maint/repair.php?referrer=is_blog_installed">repaired</a>.'); $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' );
dead_db(); dead_db();
} }
} }
@ -4081,5 +4081,4 @@ function __return_true() {
*/ */
function __return_false() { function __return_false() {
return false; return false;
} }
?>

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

@ -43,7 +43,7 @@ function ms_site_check() {
return WP_CONTENT_DIR . '/blog-deleted.php'; return WP_CONTENT_DIR . '/blog-deleted.php';
} else { } else {
header( 'HTTP/1.1 410 Gone' ); header( 'HTTP/1.1 410 Gone' );
wp_die( __( 'This user has elected to delete their account and the content is no longer available.' ) ); wp_die( /*WP_I18N_USER_DELETED_BLOG*/'This user has elected to delete their account and the content is no longer available.'/*/WP_I18N_USER_DELETED_BLOG*/ );
} }
} }
@ -51,7 +51,7 @@ function ms_site_check() {
if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) ) if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) )
return WP_CONTENT_DIR . '/blog-inactive.php'; return WP_CONTENT_DIR . '/blog-inactive.php';
else else
wp_die( sprintf( __( 'This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', "support@{$current_site->domain}" ) ) ) ); wp_die( sprintf( /*WP_I18N_BLOG_NOT_ACTIVATED*/'This site has not been activated yet. If you are having problems activating your site, please contact <a href="mailto:%1$s">%1$s</a>.'/*/WP_I18N_BLOG_NOT_ACTIVATED*/, str_replace( '@', ' AT ', get_site_option( 'admin_email', "support@{$current_site->domain}" ) ) ) );
} }
if ( $current_blog->archived == '1' || $current_blog->spam == '1' ) { if ( $current_blog->archived == '1' || $current_blog->spam == '1' ) {
@ -59,7 +59,7 @@ function ms_site_check() {
return WP_CONTENT_DIR . '/blog-suspended.php'; return WP_CONTENT_DIR . '/blog-suspended.php';
} else { } else {
header( 'HTTP/1.1 410 Gone' ); header( 'HTTP/1.1 410 Gone' );
wp_die( __( 'This blog has been archived or suspended.' ) ); wp_die( /*WP_I18N_ARCHIVED*/'This blog has been archived or suspended.'/*/WP_I18N_ARCHIVED*/ );
} }
} }
@ -172,9 +172,9 @@ function wpmu_current_site() {
// Still no dice. // Still no dice.
// @todo Update or remove WPMU codex link. // @todo Update or remove WPMU codex link.
if ( 1 == count( $sites ) ) if ( 1 == count( $sites ) )
wp_die( sprintf( 'That blog does not exist. Please try <a href="%s">%s</a>.', $sites[0]->domain . $sites[0]->path ) ); wp_die( sprintf( /*WP_I18N_BLOG_DOESNT_EXIST*/'That blog does not exist. Please try <a href="%s">%s</a>.'/*/WP_I18N_BLOG_DOESNT_EXIST*/, $sites[0]->domain . $sites[0]->path ) );
else else
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_WPMU">Debugging WPMU</a> for further assistance.' ); 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_WPMU">Debugging WPMU</a> for further assistance.'/*/WP_I18N_NO_SITE_DEFINED*/ );
} }
/** /**
@ -190,25 +190,23 @@ function wpmu_current_site() {
function ms_not_installed() { function ms_not_installed() {
global $wpdb, $domain, $path; global $wpdb, $domain, $path;
$msg = '<h1>' . 'Fatal Error' . '</h1>'; $msg = '<h1>' . /*WP_I18N_FATAL_ERROR*/'Fatal Error'/*/WP_I18N_FATAL_ERROR*/ . '</h1>';
$msg .= '<p>' . 'If your site does not display, please contact the owner of this network.' . '</p>'; $msg .= '<p>' . /*WP_I18N_CONTACT_OWNER*/'If your site does not display, please contact the owner of this network.'/*/WP_I18N_CONTACT_OWNER*/ . '</p>';
$msg .= '<p>' . 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' . '</p>'; $msg .= '<p>' . /*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>';
if ( ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ) if ( !$wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) )
$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 <em>should</em> look at your database now.', $wpdb->site ) . '</p>'; $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 <em>should</em> look at your database now.'/*/WP_I18N_TABLES_MISSING_LONG*/, $wpdb->site ) . '</p>';
else else
$msg .= '<p>' . sprintf( '<strong>Could Not Find Site!</strong> Searched for table <em>%1$s</em> in <code>%2$s</code>. Is that right?', $domain . $path, DB_NAME, $wpdb->blogs ) . '</p>'; $msg .= '<p>' . sprintf( /*WP_I18N_NO_SITE_FOUND*/'<strong>Could Not Find Site!</strong> Searched for table <em>%1$s</em> in <code>%2$s</code>. Is that right?'/*/WP_I18N_NO_SITE_FOUND*/, $domain . $path, DB_NAME, $wpdb->blogs ) . '</p>';
$msg .= '<h1>' . 'What do I do now?' . '</h1>'; $msg .= '<h1>' . /*WP_I18N_WHAT_DO_I_DO*/'What do I do now?'/*WP_I18N_WHAT_DO_I_DO*/ . '</h1>';
// @todo Update WPMU codex link. // @todo Update WPMU codex link.
$msg .= '<p>' . 'Read the <a target="_blank" href="http://codex.wordpress.org/Debugging_WPMU">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.' . '</p>'; $msg .= '<p>' . /*WP_I18N_RTFM*/'Read the <a target="_blank" href="http://codex.wordpress.org/Debugging_WPMU">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.'/*/WP_I18N_RTFM*/ . '</p>';
$msg .= '<p>' . "If you're still stuck with this message, then check that your database contains the following tables:" . '</p><ul>'; $msg .= '<p>' . /*WP_I18N_STUCK*/"If you're still stuck with this message, then check that your database contains the following tables:"/*/WP_I18N_STUCK*/ . '</p><ul>';
foreach ( $wpdb->global_tables as $table ) { foreach ( $wpdb->global_tables as $table ) {
$msg .= '<li>' . $wpdb->prefix . $table . '</li>'; $msg .= '<li>' . $wpdb->prefix . $table . '</li>';
} }
$msg .= '</ul>'; $msg .= '</ul>';
// @todo Update WPMU codex link and support instructions. // @todo Update WPMU codex link and support instructions.
$msg .= '<p>' . 'If you suspect a problem please report it to the support forums but you must include the information asked for in the <a target="_blank" href="http://codex.wordpress.org/Debugging_WPMU">WPMU bug reporting guidelines</a>! ' . '</p>'; $msg .= '<p>' . /*WP_I18N_MS_FORUMS*/'If you suspect a problem please report it to the support forums but you must include the information asked for in the <a target="_blank" href="http://codex.wordpress.org/Debugging_WPMU">WPMU bug reporting guidelines</a>!'/*/WP_I18N_MS_FORUMS*/ . '</p>';
die( $msg ); die( $msg );
} }
?>

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

@ -11,7 +11,7 @@
// $base sanity check. // $base sanity check.
if ( 'BASE' == $base ) if ( 'BASE' == $base )
die( 'Configuration error in <code>wp-config.php</code>. <code>$base</code> is set to "BASE" when it should be the path like "/" or "/blogs/".' ); die( /*WP_I18N_BASE_ERROR*/'Configuration error in <code>wp-config.php</code>. <code>$base</code> is set to "BASE" when it should be the path like "/" or "/blogs/".'/*/WP_I18N_BASE_ERROR*/ );
/** Include Multisite initialization functions */ /** Include Multisite initialization functions */
require( ABSPATH . WPINC . '/ms-load.php' ); require( ABSPATH . WPINC . '/ms-load.php' );
@ -31,7 +31,7 @@ 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( 'Multisite only works without the port number in the URL.' ); wp_die( /*WP_I18N_NO_PORT_NUMBER*/'Multisite only works without the port number in the URL.'/*/WP_I18N_NO_PORT_NUMBER*/ );
} }
} }
@ -113,8 +113,8 @@ 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'" ) ? ' ' . __( 'Database tables are missing.' ) : ''; $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . /*WP_I18N_TABLES_MISSING*/'Database tables are missing.'/*/WP_I18N_TABLES_MISSING*/ : '';
wp_die( 'No blog by that name on this system.' . $msg ); wp_die( /*WP_I18N_NO_BLOG*/'No blog by that name on this system.'/*/WP_I18N_NO_BLOG*/ . $msg );
} }
} }
} }
@ -127,5 +127,3 @@ wp_start_object_cache();
// Define upload directory constants // Define upload directory constants
ms_upload_constants(); ms_upload_constants();
?>