Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

i18n fixes from nbachiyski. fixes #8142

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@9589 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-11-10 17:42:51 +00:00
parent fb0c4d0bef
commit d699f0d00d
11 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-admin/categories.php
View File

@ -295,8 +295,7 @@ if ( $page_links )
$(document).ready(function(){ $(document).ready(function(){
$('#doaction, #doaction2').click(function(){ $('#doaction, #doaction2').click(function(){
if ( $('select[name^="action"]').val() == 'delete' ) { if ( $('select[name^="action"]').val() == 'delete' ) {
var n = $('#the-list input[type="checkbox"]:checked').length; var m = '<?php echo js_escape(__("You are about to delete the selected categories.\n 'Cancel' to stop, 'OK' to delete.")); ?>';
var m = n > 1 ? '<?php echo js_escape(__("You are about to delete the selected categories.\n 'Cancel' to stop, 'OK' to delete.")); ?>' : '<?php echo js_escape(__("You are about to delete the selected category.\n 'Cancel' to stop, 'OK' to delete.")); ?>';
return showNotice.warn(m); return showNotice.warn(m);
} }
}); });

5
wp-admin/edit-comments.php
View File

@ -190,7 +190,7 @@ $page_links = paginate_links( array(
<div class="tablenav"> <div class="tablenav">
<?php if ( $page_links ) : ?> <?php if ( $page_links ) : ?>
<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>' . __( '%s' ), <div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
number_format_i18n( $start + 1 ), number_format_i18n( $start + 1 ),
number_format_i18n( min( $page * $comments_per_page, $total ) ), number_format_i18n( min( $page * $comments_per_page, $total ) ),
number_format_i18n( $total ), number_format_i18n( $total ),
@ -344,8 +344,7 @@ if ( $page_links )
$(document).ready(function(){ $(document).ready(function(){
$('#doaction, #doaction2').click(function(){ $('#doaction, #doaction2').click(function(){
if ( $('select[name^="action"]').val() == 'delete' ) { if ( $('select[name^="action"]').val() == 'delete' ) {
var n = $('#the-comment-list input[type="checkbox"]:checked').length; var m = '<?php echo js_escape(__("You are about to delete the selected comments.\n 'Cancel' to stop, 'OK' to delete.")); ?>';
var m = n > 1 ? '<?php echo js_escape(__("You are about to delete the selected comments.\n 'Cancel' to stop, 'OK' to delete.")); ?>' : '<?php echo js_escape(__("You are about to delete the selected comment.\n 'Cancel' to stop, 'OK' to delete.")); ?>';
return showNotice.warn(m); return showNotice.warn(m);
} }
}); });

3
wp-admin/edit-link-categories.php
View File

@ -229,8 +229,7 @@ if ( $page_links )
$(document).ready(function(){ $(document).ready(function(){
$('#doaction, #doaction2').click(function(){ $('#doaction, #doaction2').click(function(){
if ( $('select[name^="action"]').val() == 'delete' ) { if ( $('select[name^="action"]').val() == 'delete' ) {
var n = $('#the-list input[type="checkbox"]:checked').length; var m = '<?php echo js_escape(__("You are about to delete the selected link categories.\n 'Cancel' to stop, 'OK' to delete.")); ?>';
var m = n > 1 ? '<?php echo js_escape(__("You are about to delete the selected link categories.\n 'Cancel' to stop, 'OK' to delete.")); ?>' : '<?php echo js_escape(__("You are about to delete the selected link category.\n 'Cancel' to stop, 'OK' to delete.")); ?>';
return showNotice.warn(m); return showNotice.warn(m);
} }
}); });

5
wp-admin/edit-pages.php
View File

@ -187,7 +187,7 @@ $page_links = paginate_links( array(
)); ));
if ( $page_links ) : ?> if ( $page_links ) : ?>
<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>' . __( '%s' ), <div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
number_format_i18n( ( $pagenum - 1 ) * $per_page + 1 ), number_format_i18n( ( $pagenum - 1 ) * $per_page + 1 ),
number_format_i18n( min( $pagenum * $per_page, $wp_query->post_count ) ), number_format_i18n( min( $pagenum * $per_page, $wp_query->post_count ) ),
number_format_i18n( $wp_query->post_count ), number_format_i18n( $wp_query->post_count ),
@ -311,8 +311,7 @@ endif; // posts;
$(document).ready(function(){ $(document).ready(function(){
$('#doaction, #doaction2').click(function(){ $('#doaction, #doaction2').click(function(){
if ( $('select[name^="action"]').val() == 'delete' ) { if ( $('select[name^="action"]').val() == 'delete' ) {
var n = $('table.post input[type="checkbox"]:checked').length; var m = '<?php echo js_escape(__("You are about to delete the selected pages.\n 'Cancel' to stop, 'OK' to delete.")); ?>';
var m = n > 1 ? '<?php echo js_escape(__("You are about to delete the selected pages.\n 'Cancel' to stop, 'OK' to delete.")); ?>' : '<?php echo js_escape(__("You are about to delete the selected page.\n 'Cancel' to stop, 'OK' to delete.")); ?>';
return showNotice.warn(m); return showNotice.warn(m);
} }
}); });

3
wp-admin/edit-tags.php
View File

@ -286,8 +286,7 @@ else
$(document).ready(function(){ $(document).ready(function(){
$('#doaction, #doaction2').click(function(){ $('#doaction, #doaction2').click(function(){
if ( $('select[name^="action"]').val() == 'delete' ) { if ( $('select[name^="action"]').val() == 'delete' ) {
var n = $('#the-list input[type="checkbox"]:checked').length; var m = '<?php echo js_escape(__("You are about to delete the selected tags.\n 'Cancel' to stop, 'OK' to delete.")); ?>';
var m = n > 1 ? '<?php echo js_escape(__("You are about to delete the selected tags.\n 'Cancel' to stop, 'OK' to delete.")); ?>' : '<?php echo js_escape(__("You are about to delete the selected tag.\n 'Cancel' to stop, 'OK' to delete.")); ?>';
return showNotice.warn(m); return showNotice.warn(m);
} }
}); });

5
wp-admin/edit.php
View File

@ -225,7 +225,7 @@ do_action('restrict_manage_posts');
</div> </div>
<?php if ( $page_links ) { ?> <?php if ( $page_links ) { ?>
<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>' . __( '%s' ), <div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
number_format_i18n( ( $_GET['paged'] - 1 ) * $wp_query->query_vars['posts_per_page'] + 1 ), number_format_i18n( ( $_GET['paged'] - 1 ) * $wp_query->query_vars['posts_per_page'] + 1 ),
number_format_i18n( min( $_GET['paged'] * $wp_query->query_vars['posts_per_page'], $wp_query->found_posts ) ), number_format_i18n( min( $_GET['paged'] * $wp_query->query_vars['posts_per_page'], $wp_query->found_posts ) ),
number_format_i18n( $wp_query->found_posts ), number_format_i18n( $wp_query->found_posts ),
@ -326,8 +326,7 @@ endif; // posts;
$(document).ready(function(){ $(document).ready(function(){
$('#doaction, #doaction2').click(function(){ $('#doaction, #doaction2').click(function(){
if ( $('select[name^="action"]').val() == 'delete' ) { if ( $('select[name^="action"]').val() == 'delete' ) {
var n = $('table.post input[type="checkbox"]:checked').length; var m = '<?php echo js_escape(__("You are about to delete the selected posts.\n 'Cancel' to stop, 'OK' to delete.")); ?>';
var m = n > 1 ? '<?php echo js_escape(__("You are about to delete the selected posts.\n 'Cancel' to stop, 'OK' to delete.")); ?>' : '<?php echo js_escape(__("You are about to delete the selected post.\n 'Cancel' to stop, 'OK' to delete.")); ?>';
return showNotice.warn(m); return showNotice.warn(m);
} }
}); });

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

@ -666,7 +666,7 @@ class WP_User_Search {
'add_args' => $args 'add_args' => $args
) ); ) );
if ( $this->paging_text ) { if ( $this->paging_text ) {
$this->paging_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>' . __( '%s' ), $this->paging_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
number_format_i18n( ( $this->page - 1 ) * $this->users_per_page + 1 ), number_format_i18n( ( $this->page - 1 ) * $this->users_per_page + 1 ),
number_format_i18n( min( $this->page * $this->users_per_page, $this->total_users_for_query ) ), number_format_i18n( min( $this->page * $this->users_per_page, $this->total_users_for_query ) ),
number_format_i18n( $this->total_users_for_query ), number_format_i18n( $this->total_users_for_query ),

4
wp-admin/options-general.php
View File

@ -153,7 +153,7 @@ foreach ( $offset_range as $offset ) {
echo ' <label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"'; echo ' <label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
checked( $custom, TRUE ); checked( $custom, TRUE );
echo '/> ' . __('Custom') . ': </label><input type="text" name="date_format_custom" value="' . attribute_escape( get_option('date_format') ) . '" class="small-text" /> ' . gmdate( get_option('date_format'), current_time('timestamp') ) . "\n"; echo '/> ' . __('Custom:') . ' </label><input type="text" name="date_format_custom" value="' . attribute_escape( get_option('date_format') ) . '" class="small-text" /> ' . gmdate( get_option('date_format'), current_time('timestamp') ) . "\n";
echo "\t<p>" . __('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date formatting</a>. Click "Save Changes" to update sample output.') . "</p>\n"; echo "\t<p>" . __('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date formatting</a>. Click "Save Changes" to update sample output.') . "</p>\n";
?> ?>
@ -185,7 +185,7 @@ foreach ( $offset_range as $offset ) {
echo ' <label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"'; echo ' <label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
checked( $custom, TRUE ); checked( $custom, TRUE );
echo '/> ' . __('Custom') . ': </label><input type="text" name="time_format_custom" value="' . attribute_escape( get_option('time_format') ) . '" class="small-text" /> ' . gmdate( get_option('time_format'), current_time('timestamp') ) . "\n"; echo '/> ' . __('Custom:') . ' </label><input type="text" name="time_format_custom" value="' . attribute_escape( get_option('time_format') ) . '" class="small-text" /> ' . gmdate( get_option('time_format'), current_time('timestamp') ) . "\n";
?> ?>
</fieldset> </fieldset>
</td> </td>

2
wp-admin/press-this.php
View File

@ -522,7 +522,7 @@ die;
<div class="editor-container"> <div class="editor-container">
<textarea name="content" id="content" style="width:100%;" class="mceEditor" rows="15"> <textarea name="content" id="content" style="width:100%;" class="mceEditor" rows="15">
<?php if ($selection) echo wp_richedit_pre($selection); ?> <?php if ($selection) echo wp_richedit_pre($selection); ?>
<?php if ($url) { ?><p><?php if($selection) _e('via'); ?> <a href="<?php echo $url ?>"><?php echo $title; ?></a>.</p><?php } ?> <?php if ($url) { echo '<p>'; if($selection) printf( __('via %s.'), "<a href='$url'>$title</a>" ); echo '</p>'; } ?>
</textarea> </textarea>
</div> </div>
</div> </div>

2
wp-admin/themes.php
View File

@ -125,7 +125,7 @@ function theme_update_available( $theme ) {
<div class="clear"></div> <div class="clear"></div>
<?php if ( $page_links ) : ?> <?php if ( $page_links ) : ?>
<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>' . __( '%s' ), <div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
number_format_i18n( $start + 1 ), number_format_i18n( $start + 1 ),
number_format_i18n( min( $page * $per_page, $theme_total ) ), number_format_i18n( min( $page * $per_page, $theme_total ) ),
number_format_i18n( $theme_total ), number_format_i18n( $theme_total ),

2
wp-admin/upload.php
View File

@ -236,7 +236,7 @@ $page_links = paginate_links( array(
)); ));
if ( $page_links ) : ?> if ( $page_links ) : ?>
<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>' . __( '%s' ), <div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
number_format_i18n( ( $_GET['paged'] - 1 ) * $wp_query->query_vars['posts_per_page'] + 1 ), number_format_i18n( ( $_GET['paged'] - 1 ) * $wp_query->query_vars['posts_per_page'] + 1 ),
number_format_i18n( min( $_GET['paged'] * $wp_query->query_vars['posts_per_page'], $wp_query->found_posts ) ), number_format_i18n( min( $_GET['paged'] * $wp_query->query_vars['posts_per_page'], $wp_query->found_posts ) ),
number_format_i18n( $wp_query->found_posts ), number_format_i18n( $wp_query->found_posts ),