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

Merge two strings in JS, which were merged elsewhere some time ago.

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@16248 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2010-11-09 00:52:02 +00:00
parent b5178cd956
commit 7be12299b7
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/js/post.dev.js
View File

@ -383,10 +383,7 @@ jQuery(document).ready( function($) {
$('#publish').val( postL10n.publish ); $('#publish').val( postL10n.publish );
} else { } else {
publishOn = postL10n.publishOnPast; publishOn = postL10n.publishOnPast;
if ( page ) $('#publish').val( postL10n.update );
$('#publish').val( postL10n.updatePage );
else
$('#publish').val( postL10n.updatePost );
} }
if ( originalDate.toUTCString() == attemptedDate.toUTCString() ) { //hack if ( originalDate.toUTCString() == attemptedDate.toUTCString() ) { //hack
$('#timestamp').html(stamp); $('#timestamp').html(stamp);

2
wp-admin/js/post.js
View File

File diff suppressed because one or more lines are too long

5
wp-includes/script-loader.php
View File

@ -301,7 +301,7 @@ function wp_default_scripts( &$scripts ) {
$scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), '20091012' ); $scripts->add( 'postbox', "/wp-admin/js/postbox$suffix.js", array('jquery-ui-sortable'), '20091012' );
$scripts->add_data( 'postbox', 'group', 1 ); $scripts->add_data( 'postbox', 'group', 1 );
$scripts->add( 'post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox'), '20101104b' ); $scripts->add( 'post', "/wp-admin/js/post$suffix.js", array('suggest', 'wp-lists', 'postbox'), '20101108' );
$scripts->add_data( 'post', 'group', 1 ); $scripts->add_data( 'post', 'group', 1 );
$scripts->localize( 'post', 'postL10n', array( $scripts->localize( 'post', 'postL10n', array(
'tagsUsed' => __('Tags used on this post:'), 'tagsUsed' => __('Tags used on this post:'),
@ -318,8 +318,7 @@ function wp_default_scripts( &$scripts ) {
'endcomm' => __('No more comments found.'), 'endcomm' => __('No more comments found.'),
'publish' => __('Publish'), 'publish' => __('Publish'),
'schedule' => __('Schedule'), 'schedule' => __('Schedule'),
'updatePost' => __('Update Post'), 'update' => __('Update'),
'updatePage' => __('Update Page'),
'savePending' => __('Save as Pending'), 'savePending' => __('Save as Pending'),
'saveDraft' => __('Save Draft'), 'saveDraft' => __('Save Draft'),
'private' => __('Private'), 'private' => __('Private'),