golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@16248 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-11-09 00:52:02 +00:00
parent 0c0fec0abc
commit 7e8670bb01
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 );
} else {
publishOn = postL10n.publishOnPast;
if ( page )
$('#publish').val( postL10n.updatePage );
else
$('#publish').val( postL10n.updatePost );
$('#publish').val( postL10n.update );
}
if ( originalDate.toUTCString() == attemptedDate.toUTCString() ) { //hack
$('#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_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->localize( 'post', 'postL10n', array(
'tagsUsed' => __('Tags used on this post:'),
@ -318,8 +318,7 @@ function wp_default_scripts( &$scripts ) {
'endcomm' => __('No more comments found.'),
'publish' => __('Publish'),
'schedule' => __('Schedule'),
'updatePost' => __('Update Post'),
'updatePage' => __('Update Page'),
'update' => __('Update'),
'savePending' => __('Save as Pending'),
'saveDraft' => __('Save Draft'),
'private' => __('Private'),