Changeset 7063

Timestamp:

02/27/2008 05:19:58 PM (16 years ago)

Author:

ryan

Message:

gettext fixes from takayukister. fixes #6018

Location:

trunk

Files:

• wp-admin/includes/class-wp-filesystem-ftpext.php (modified) (2 diffs)
• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)

trunk/wp-admin/includes/class-wp-filesystem-ftpext.php

@@ -90 +90 @@
         if( '/' != substr($base, -1) ) $base .= '/';
         
-        if($echo) echo __('Changing to ') . $base  .'<br>';
+        if($echo) echo sprintf(__('Changing to %s'), $base) .'<br>';
         if( false === ftp_chdir($this->link, $base) )
             return false;
 
         if( $this->exists($base . 'wp-settings.php') ){
-            if($echo) echo __('Found ') . $base . 'wp-settings.php<br>';
+            if($echo) echo sprintf(__('Found %s'), $base . 'wp-settings.php') . '<br>';
             $this->wp_base = $base;
             return $this->wp_base;
@@ -110 +110 @@
         foreach($arrPath as $key=>$folder){
             if( $this->is_dir($base . $folder) ){
-                if($echo) echo __('Found ') . $folder . ' ' . __('Changing to') . ' ' . $base . $folder . '/<br>';
+                if($echo) echo sprintf(__('Found %s'), $folder) . ' ' . sprintf(__('Changing to %s'), $base . $folder . '/') . '<br>';
                 return $this->find_base_dir($base .  $folder . '/',$echo);
             }

trunk/wp-admin/includes/dashboard.php

@@ -273 +273 @@
             $comment_post_link = "<a href='$comment_post_url'>$comment_post_title</a>";
             $comment_link = '<a class="comment-link" href="' . get_comment_link() . '">#</a>';
-            $comment_meta = sprintf( __( 'From <strong>%s</strong> on %s %s' ), get_comment_author(), $comment_post_link, $comment_link );
+            $comment_meta = sprintf( __( 'From <strong>%1$s</strong> on %2$s %3$s' ), get_comment_author(), $comment_post_link, $comment_link );
 
             if ( $is_first ) : $is_first = false;

trunk/wp-includes/functions.php

@@ -1639 +1639 @@
     if( defined('WP_DEBUG') && ( true === WP_DEBUG ) && apply_filters( 'deprecated_function_trigger_error', true )) {
         if( !is_null($replacement) )
-            trigger_error( printf( __("%s is <strong>deprecated</strong> since version %s! Use %s instead."), $function, $version, $replacement ) );
+            trigger_error( printf( __("%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead."), $function, $version, $replacement ) );
         else
-            trigger_error( printf( __("%s is <strong>deprecated</strong> since version %s with no alternative available."), $function, $version ) );
+            trigger_error( printf( __("%1$s is <strong>deprecated</strong> since version %2$s with no alternative available."), $function, $version ) );
     }
 }
@@ -1674 +1674 @@
     if( defined('WP_DEBUG') && ( true === WP_DEBUG ) && apply_filters( 'deprecated_file_trigger_error', true )) {
         if( !is_null($replacement) )
-            trigger_error( printf( __("%s is <strong>deprecated</strong> since version %s! Use %s instead."), $file, $version, $replacement ) );
+            trigger_error( printf( __("%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead."), $file, $version, $replacement ) );
         else
-            trigger_error( printf( __("%s is <strong>deprecated</strong> since version %s with no alternative available."), $file, $version ) );
+            trigger_error( printf( __("%1$s is <strong>deprecated</strong> since version %2$s with no alternative available."), $file, $version ) );
     }
 }