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

nb · nb · commit 7fcffb8d1284 · 2010-03-22T06:51:49.000Z
git-svn-id: https://develop.svn.wordpress.org/trunk@13797 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
@@ -1831,7 +1831,7 @@ function is_blog_installed() {
 			if ( defined('WP_REPAIRING') )
 				return true;
 			// 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();
 		}
 	}
@@ -4081,5 +4081,4 @@ function __return_true() {
  */
 function __return_false() {
 	return false;
-}
-?>
+}
diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php
@@ -43,23 +43,23 @@ function ms_site_check() {
 			return WP_CONTENT_DIR . '/blog-deleted.php';
 		} else {
 			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*/ );
 		}
 	}
 
 	if ( '2' == $current_blog->deleted ) {
 		if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) )
 			return WP_CONTENT_DIR . '/blog-inactive.php';
 		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 ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) {
 			return WP_CONTENT_DIR . '/blog-suspended.php';
 		} else {
 			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.
 	// @todo Update or remove WPMU codex link.
 	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
-		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() {
 	global $wpdb, $domain, $path;
 
-	$msg = '<h1>' . 'Fatal Error' . '</h1>';
-	$msg .= '<p>' . 'If your site does not display, please contact the owner of this network.' . '</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>';
-	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 = '<h1>' . /*WP_I18N_FATAL_ERROR*/'Fatal Error'/*/WP_I18N_FATAL_ERROR*/ . '</h1>';
+	$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>' . /*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'" ) )
+		$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
-		$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 .= '<h1>' . 'What do I do now?' . '</h1>';
+		$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>' . /*WP_I18N_WHAT_DO_I_DO*/'What do I do now?'/*WP_I18N_WHAT_DO_I_DO*/ . '</h1>';
 	// @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>' . "If you're still stuck with this message, then check that your database contains the following tables:" . '</p><ul>';
+	$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>' . /*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 ) {
 		$msg .= '<li>' . $wpdb->prefix . $table . '</li>';
 	}
 	$msg .= '</ul>';
 	// @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 );
-}
-
-?>
+}
diff --git a/wp-includes/ms-settings.php b/wp-includes/ms-settings.php
@@ -11,7 +11,7 @@
 
 // $base sanity check.
 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 */
 require( ABSPATH . WPINC . '/ms-load.php' );
@@ -31,7 +31,7 @@
 			$domain = substr( $domain, 0, -4 );
 			$_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 );
 		} 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 ( defined( 'WP_INSTALLING' ) ) {
 			$current_blog->blog_id = $blog_id = 1;
 		} else {
-			$msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . __( 'Database tables are missing.' ) : '';
-			wp_die( 'No blog by that name on this system.' . $msg );
+			$msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . /*WP_I18N_TABLES_MISSING*/'Database tables are missing.'/*/WP_I18N_TABLES_MISSING*/ : '';
+			wp_die( /*WP_I18N_NO_BLOG*/'No blog by that name on this system.'/*/WP_I18N_NO_BLOG*/ . $msg );
 		}
 	}
 }
@@ -127,5 +127,3 @@
 
 // Define upload directory constants
 ms_upload_constants();
-
-?>

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`// $base sanity check.`
`13`	`13`	`if ( 'BASE' == $base )`
`14`		`- 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/".' );`
	`14`	`+ 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/ );`
`15`	`15`
`16`	`16`	`/** Include Multisite initialization functions */`
`17`	`17`	`require( ABSPATH . WPINC . '/ms-load.php' );`
`@@ -31,7 +31,7 @@`
`31`	`31`	`$domain = substr( $domain, 0, -4 );`
`32`	`32`	`$_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 );`
`33`	`33`	`} else {`
`34`		`- wp_die( 'Multisite only works without the port number in the URL.' );`
	`34`	`+ wp_die( /WP_I18N_NO_PORT_NUMBER/'Multisite only works without the port number in the URL.'//WP_I18N_NO_PORT_NUMBER/ );`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
`@@ -113,8 +113,8 @@`
`113`	`113`	`if ( defined( 'WP_INSTALLING' ) ) {`
`114`	`114`	`$current_blog->blog_id = $blog_id = 1;`
`115`	`115`	`} else {`
`116`		`- $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . __( 'Database tables are missing.' ) : '';`
`117`		`- wp_die( 'No blog by that name on this system.' . $msg );`
	`116`	`+ $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . /WP_I18N_TABLES_MISSING/'Database tables are missing.'//WP_I18N_TABLES_MISSING/ : '';`
	`117`	`+ wp_die( /WP_I18N_NO_BLOG/'No blog by that name on this system.'//WP_I18N_NO_BLOG/ . $msg );`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`	`}`
`@@ -127,5 +127,3 @@`
`127`	`127`
`128`	`128`	`// Define upload directory constants`
`129`	`129`	`ms_upload_constants();`
`130`		`-`
`131`		`-?>`