Changeset 19760 for trunk/wp-includes/wp-db.php

Timestamp:

01/26/2012 08:34:27 PM (13 years ago)

Author:

nacin

Message:

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.

File:

• trunk/wp-includes/wp-db.php (modified) (8 diffs)

trunk/wp-includes/wp-db.php

@@ -574 +574 @@
 
         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;
@@ -746 +746 @@
         if ( !@mysql_select_db( $db, $dbh ) ) {
             $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>
 <ul>
@@ -753 +754 @@
 <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>
-<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;
         }
@@ -924 +925 @@
             return false;
 
+        wp_load_translations_early();
+
         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
-            $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' )
@@ -1038 +1041 @@
 
         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>
 <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>
@@ -1047 +1051 @@
 </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>
-"/*/WP_I18N_DB_CONN_ERROR*/, $this->dbhost ), 'db_connect_fail' );
+" ), $this->dbhost ), 'db_connect_fail' );
 
             return;
@@ -1074 +1078 @@
 
         // 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;
@@ -1327 +1330 @@
             return $this->last_result[$y] ? array_values( get_object_vars( $this->last_result[$y] ) ) : null;
         } 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" );
         }
     }