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

Timestamp:

06/23/2008 03:40:43 PM (17 years ago)

Author:

ryan

Message:

Mark string that cannot be gettexted. Props nbachiyski. fixes #7074

File:

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

trunk/wp-includes/wp-db.php

@@ -318 +318 @@
         $this->dbh = @mysql_connect($dbhost, $dbuser, $dbpassword, true);
         if (!$this->dbh) {
-            $this->bail("
+            $this->bail(sprintf(/*WP_I18N_DB_CONN_ERROR*/"
 <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>$dbhost</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>
     <li>Are you sure you have the correct username and password?</li>
@@ -327 +327 @@
 </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*/, $dbhost));
             return;
         }
@@ -374 +374 @@
 
         if ( preg_match('|[^a-z0-9_]|i', $prefix) )
-            return new WP_Error('invalid_db_prefix', 'Invalid database prefix'); // No gettext here
+            return new WP_Error('invalid_db_prefix', /*WP_I18N_DB_BAD_PREFIX*/'Invalid database prefix'/*/WP_I18N_DB_BAD_PREFIX*/);
 
         $old_prefix = $this->prefix;
@@ -405 +405 @@
         if (!@mysql_select_db($db, $this->dbh)) {
             $this->ready = false;
-            $this->bail("
+            $this->bail(sprintf(/*WP_I18N_DB_SELECT_DB*/'
 <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>$db</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>
 <li>Are you sure it exists?</li>
-<li>Does the user <code>".DB_USER."</code> have permission to use the <code>$db</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 username_wordpress. Could that be the problem?</li>
 </ul>
-<p>If you don't know how to setup 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>");
+<p>If you don\'t know how to setup 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, DB_USER));
             return;
         }
@@ -488 +488 @@
             return false;
 
-        $error_str = "WordPress database error $str for query $this->last_query";
         if ( $caller = $this->get_caller() )
-            $error_str .= " made by $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);
+        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);
 
         $log_error = true;
@@ -746 +747 @@
             return $this->last_result[$y] ? array_values(get_object_vars($this->last_result[$y])) : null;
         } else {
-            $this->print_error(" \$db->get_row(string query, output type, int offset) -- Output type must be one of: OBJECT, ARRAY_A, ARRAY_N");
+            $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*/);
         }
     }