Changeset 7300

Timestamp:

03/14/2008 07:56:43 PM (18 years ago)

Author:

ryan

Message:

i18n fixes from nbachiyski. fixes #6226

Location:

trunk/wp-admin

Files:

• includes/class-wp-filesystem-ftpext.php (modified) (2 diffs)
• includes/class-wp-filesystem-ftpsockets.php (modified) (2 diffs)
• includes/template.php (modified) (1 diff)
• includes/widgets.php (modified) (1 diff)
• theme-editor.php (modified) (1 diff)

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

@@ -96 +96 @@
                 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;
@@ -116 +116 @@
                 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);
                         }

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

@@ -98 +98 @@
                 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;
@@ -118 +118 @@
                 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);
                         }

trunk/wp-admin/includes/template.php

@@ -831 +831 @@
         $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" />

trunk/wp-admin/includes/widgets.php

@@ -200 +200 @@
 
         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'] )

trunk/wp-admin/theme-editor.php

@@ -93 +93 @@
         <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