sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gettext fixes from takayukister. fixes #6018

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@7063 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2008-02-27 17:19:58 +00:00
parent 34099bccd7
commit a2af257bf4
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/includes/class-wp-filesystem-ftpext.php
View File

@ -89,12 +89,12 @@ class WP_Filesystem_FTPext{
if( empty( $base ) ) $base = '/'; if( empty( $base ) ) $base = '/';
if( '/' != substr($base, -1) ) $base .= '/'; 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) ) if( false === ftp_chdir($this->link, $base) )
return false; return false;
if( $this->exists($base . 'wp-settings.php') ){ 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; $this->wp_base = $base;
return $this->wp_base; return $this->wp_base;
} }
@ -109,7 +109,7 @@ class WP_Filesystem_FTPext{
foreach($arrPath as $key=>$folder){ foreach($arrPath as $key=>$folder){
if( $this->is_dir($base . $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); return $this->find_base_dir($base . $folder . '/',$echo);
} }
} }

2
wp-admin/includes/dashboard.php
View File

@ -272,7 +272,7 @@ function wp_dashboard_recent_comments( $sidebar_args ) {
$comment_post_title = get_the_title( $comment->comment_post_ID ); $comment_post_title = get_the_title( $comment->comment_post_ID );
$comment_post_link = "<a href='$comment_post_url'>$comment_post_title</a>"; $comment_post_link = "<a href='$comment_post_url'>$comment_post_title</a>";
$comment_link = '<a class="comment-link" href="' . get_comment_link() . '">#</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; if ( $is_first ) : $is_first = false;
?> ?>

8
wp-includes/functions.php
View File

@ -1638,9 +1638,9 @@ function _deprecated_function($function, $version, $replacement=null) {
// Allow plugin to filter the output error trigger // Allow plugin to filter the output error trigger
if( defined('WP_DEBUG') && ( true === WP_DEBUG ) && apply_filters( 'deprecated_function_trigger_error', true )) { if( defined('WP_DEBUG') && ( true === WP_DEBUG ) && apply_filters( 'deprecated_function_trigger_error', true )) {
if( !is_null($replacement) ) 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 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 ) );
} }
} }
@ -1673,9 +1673,9 @@ function _deprecated_file($file, $version, $replacement=null) {
// Allow plugin to filter the output error trigger // Allow plugin to filter the output error trigger
if( defined('WP_DEBUG') && ( true === WP_DEBUG ) && apply_filters( 'deprecated_file_trigger_error', true )) { if( defined('WP_DEBUG') && ( true === WP_DEBUG ) && apply_filters( 'deprecated_file_trigger_error', true )) {
if( !is_null($replacement) ) 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 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 ) );
} }
} }
?> ?>