Changeset 7063

Show
Ignore:
Timestamp:
02/27/08 17:19:58 (9 months ago)
Author:
ryan
Message:

gettext fixes from takayukister. fixes #6018

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r7039 r7063  
    9090        if( '/' != substr($base, -1) ) $base .= '/'; 
    9191         
    92         if($echo) echo __('Changing to ') . $base .'<br>'; 
     92        if($echo) echo sprintf(__('Changing to %s'), $base) .'<br>'; 
    9393        if( false === ftp_chdir($this->link, $base) ) 
    9494            return false; 
    9595 
    9696        if( $this->exists($base . 'wp-settings.php') ){ 
    97             if($echo) echo __('Found ') . $base . 'wp-settings.php<br>'; 
     97            if($echo) echo sprintf(__('Found %s'), $base . 'wp-settings.php') . '<br>'; 
    9898            $this->wp_base = $base; 
    9999            return $this->wp_base; 
    …… 
    110110        foreach($arrPath as $key=>$folder){ 
    111111            if( $this->is_dir($base . $folder) ){ 
    112                 if($echo) echo __('Found ') . $folder . ' ' . __('Changing to') . ' ' . $base . $folder . '/<br>'; 
     112                if($echo) echo sprintf(__('Found %s'), $folder) . ' ' . sprintf(__('Changing to %s'), $base . $folder . '/') . '<br>'; 
    113113                return $this->find_base_dir($base .  $folder . '/',$echo); 
    114114            } 

  • trunk/wp-admin/includes/dashboard.php

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

  • trunk/wp-includes/functions.php

    r7045 r7063  
    16391639    if( defined('WP_DEBUG') && ( true === WP_DEBUG ) && apply_filters( 'deprecated_function_trigger_error', true )) { 
    16401640        if( !is_null($replacement) ) 
    1641             trigger_error( printf( __("%s is <strong>deprecated</strong> since version %s! Use %s instead."), $function, $version, $replacement ) ); 
     1641            trigger_error( printf( __("%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead."), $function, $version, $replacement ) ); 
    16421642        else 
    1643             trigger_error( printf( __("%s is <strong>deprecated</strong> since version %s with no alternative available."), $function, $version ) ); 
     1643            trigger_error( printf( __("%1$s is <strong>deprecated</strong> since version %2$s with no alternative available."), $function, $version ) ); 
    16441644    } 
    16451645} 
    …… 
    16741674    if( defined('WP_DEBUG') && ( true === WP_DEBUG ) && apply_filters( 'deprecated_file_trigger_error', true )) { 
    16751675        if( !is_null($replacement) ) 
    1676             trigger_error( printf( __("%s is <strong>deprecated</strong> since version %s! Use %s instead."), $file, $version, $replacement ) ); 
     1676            trigger_error( printf( __("%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead."), $file, $version, $replacement ) ); 
    16771677        else 
    1678             trigger_error( printf( __("%s is <strong>deprecated</strong> since version %s with no alternative available."), $file, $version ) ); 
     1678            trigger_error( printf( __("%1$s is <strong>deprecated</strong> since version %2$s with no alternative available."), $file, $version ) ); 
    16791679    } 
    16801680}