WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

i18n fixes from nbachiyski. fixes #6226 

git-svn-id: http://svn.automattic.com/wordpress/trunk@7300 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-03-14 19:56:43 +00:00
parent 7741d8ea53
commit 4be6f03439
5 changed files with 9 additions and 10 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

@ -95,12 +95,12 @@ class WP_Filesystem_FTPext{
if( empty( $base ) ) $base = '/';
if( '/' != substr($base, -1) ) $base .= '/';
if($echo) echo __('Changing to ') . $base .'<br>';
if($echo) printf( __('Changing to %s') . '<br/>', $base );
if( false === $this->chdir($base) )
return false;
if( $this->exists($base . 'wp-settings.php') ){
if($echo) echo __('Found ') . $base . 'wp-settings.php<br>';
if($echo) printf( __('Found %s'), $base . 'wp-settings.php<br/>' );
$this->wp_base = $base;
return $this->wp_base;
}
@ -115,7 +115,7 @@ class WP_Filesystem_FTPext{
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') . '<br/>', $base . $folder . '/' );
return $this->find_base_dir($base . $folder . '/',$echo);
}
}

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

@ -97,12 +97,12 @@ class WP_Filesystem_ftpsockets{
if( empty( $base ) ) $base = '/';
if( '/' != substr($base, -1) ) $base .= '/';
if($echo) echo __('Changing to ') . $base .'<br>';
if($echo) printf( __('Changing to %s') . '<br/>', $base );
if( false === $this->chdir($base) )
return false;
if( $this->exists($base . 'wp-settings.php') ){
if($echo) echo __('Found ') . $base . 'wp-settings.php<br>';
if($echo) printf( __('Found %s'), $base . 'wp-settings.php<br/>' );
$this->wp_base = $base;
return $this->wp_base;
}
@ -117,7 +117,7 @@ class WP_Filesystem_ftpsockets{
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') . '<br/>', $base . $folder . '/' );
return $this->find_base_dir($base . $folder . '/',$echo);
}
}

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

@ -830,7 +830,7 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0 ) {
$year = '<input type="text" id="aa" name="aa" value="' . $aa . '" size="4" maxlength="5" onchange="edit_date.checked=true"' . $tab_index_attribute . ' autocomplete="off" />';
$hour = '<input type="text" id="hh" name="hh" value="' . $hh . '" size="2" maxlength="2" onchange="edit_date.checked=true"' . $tab_index_attribute . ' autocomplete="off" />';
$minute = '<input type="text" id="mn" name="mn" value="' . $mn . '" size="2" maxlength="2" onchange="edit_date.checked=true"' . $tab_index_attribute . ' autocomplete="off" />';
printf(__('%1$s%2$s%3$s @ %4$s : %5$s'), $month, $day, $year, $hour, $minute);
printf(_c('%1$s%2$s%3$s @ %4$s : %5$s|1: month input, 2: day input, 3: year input, 4: hour input, 5: minute input'), $month, $day, $year, $hour, $minute);
?>
<input type="hidden" id="ss" name="ss" value="<?php echo $ss ?>" size="2" maxlength="2" onchange="edit_date.checked=true" />
<?php

3
wp-admin/includes/widgets.php
View File

@ -199,11 +199,10 @@ function wp_widget_control( $sidebar_args ) {
unset($wp_registered_widgets[$widget_id]['_callback']);
if ( $widget_title )
$widget_title = sprintf( _c('%1$s: %2$s|widget_admin_title' ), $sidebar_args['widget_name'], $widget_title );
$widget_title = sprintf( _c('%1$s: %2$s|1: widget name, 2: widget title' ), $sidebar_args['widget_name'], $widget_title );
else
$widget_title = wp_specialchars( strip_tags( $sidebar_args['widget_name'] ) );
if ( empty($sidebar_args['_display']) || 'template' != $sidebar_args['_display'] )
echo $sidebar_args['before_widget'];
?>

2
wp-admin/theme-editor.php
View File

@ -92,7 +92,7 @@ $desc_header = ( $description != $file_show ) ? "$description</strong> (%s)" : "
<div class="bordertitle">
<h2 style="border: none; padding-bottom: 0px;"><?php _e('Theme Editor'); ?></h2>
<form id="themeselector" name="theme" action="theme-editor.php" method="post">
<strong><?php _e('Select theme to edit: '); ?></strong>
<strong><?php _e('Select theme to edit:'); ?> </strong>
<select name="theme" id="theme" style="margin: 0; padding: 0;">
<?php
foreach ($themes as $a_theme) {