| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -3487,7 +3487,6 @@ |
| 3488 | 3488 | 'ajax-edit-category-summary', |
| 3489 | 3489 | 'ajax-remove-category-summary', |
| 3490 | 3490 | 'ajax-category-question', |
| 3491 | | - 'ajax-category-and', |
| 3492 | 3491 | 'ajax-error-title', |
| 3493 | 3492 | 'ajax-remove-category-error', |
| 3494 | 3493 | 'ajax-edit-category-error', |
| Index: trunk/phase3/languages/messages/MessagesQqq.php |
| — | — | @@ -4246,13 +4246,10 @@ |
| 4247 | 4247 | 'ajax-confirm-title' => 'Title for a dialog box in which the user is asked for an edit summary', |
| 4248 | 4248 | 'ajax-confirm-save' => 'Submit button {{Identical|Save}}', |
| 4249 | 4249 | 'ajax-confirm-save-all' => 'Submit button to save all changes', |
| 4250 | | -'ajax-add-category-summary' => 'See {{msg-mw|ajax-category-question}}. $1 is a category name. This is used inside a sentence, make sure that the case is correct.', |
| 4251 | | -'ajax-edit-category-summary' => 'See {{msg-mw|ajax-category-question}}. $1 and $2 are both category names. This is used inside a sentence, make sure that the case is correct.', |
| 4252 | | -'ajax-remove-category-summary' => 'See {{msg-mw|ajax-category-question}}. $1 is a category name. This is used inside a sentence, make sure that the case is correct.', |
| 4253 | | -'ajax-category-question' => 'Question the user is asked before submit. $1 is filled with a list of one or more of the following messages; |
| 4254 | | -{{msg-mw|ajax-add-category-summary}}, {{msg-mw|ajax-remove-category-summary}}, {{msg-mw|ajax-edit-category-summary}}. |
| 4255 | | -The last of the inserted messages is prefaced by {{msg-mw|ajax-category-and}}. The result would be something like: |
| 4256 | | -Why do you want to remove Category:A and add Category:C ?', |
| | 4250 | +'ajax-add-category-summary' => 'See {{msg-mw|ajax-category-question}}. $1 is a category name.', |
| | 4251 | +'ajax-edit-category-summary' => 'See {{msg-mw|ajax-category-question}}. $1 and $2 are both category names.', |
| | 4252 | +'ajax-remove-category-summary' => 'See {{msg-mw|ajax-category-question}}. $1 is a category name. ', |
| | 4253 | +'ajax-category-question' => 'Question the user is asked before submit. It\'s followed by a list of the changes.', |
| 4257 | 4254 | 'ajax-category-and' => 'Used to join multiple list items. Eg. "Edit foo, move bar and add foobar"', |
| 4258 | 4255 | 'ajax-error-title' => '{{Identical|Error}}', |
| 4259 | 4256 | 'ajax-category-already-present' => 'Error message. $1 is the category name', |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -4611,11 +4611,10 @@ |
| 4612 | 4612 | 'ajax-confirm-save-all' => 'Save all changes', |
| 4613 | 4613 | 'ajax-cancel' => 'Cancel edit', |
| 4614 | 4614 | 'ajax-cancel-all' => 'Cancel all changes', |
| 4615 | | -'ajax-add-category-summary' => 'add category "$1"', |
| 4616 | | -'ajax-edit-category-summary' => 'change category "$1" to "$2"', |
| 4617 | | -'ajax-remove-category-summary' => 'remove category "$1"', |
| 4618 | | -'ajax-category-question' => '<strong>Why</strong> do you want to $1?', |
| 4619 | | -'ajax-category-and' => ' and ', |
| | 4615 | +'ajax-add-category-summary' => 'Add category "$1"', |
| | 4616 | +'ajax-edit-category-summary' => 'Change category "$1" to "$2"', |
| | 4617 | +'ajax-remove-category-summary' => 'Remove category "$1"', |
| | 4618 | +'ajax-category-question' => 'Why do you want to make the following changes:', |
| 4620 | 4619 | 'ajax-error-title' => 'Error', |
| 4621 | 4620 | 'ajax-remove-category-error' => 'It was not possible to remove category "$1". |
| 4622 | 4621 | This usually occurs when the category has been added to the page in a template.', |
| Index: trunk/phase3/resources/mediawiki.page/mediawiki.page.ajaxCategories.js |
| — | — | @@ -328,7 +328,7 @@ |
| 329 | 329 | |
| 330 | 330 | // Summary of the action to be taken |
| 331 | 331 | var summaryHolder = $( '<p/>' ); |
| 332 | | - summaryHolder.html( mw.msg( 'ajax-category-question', actionSummary ) ); |
| | 332 | + summaryHolder.html( '<strong>' + mw.msg( 'ajax-category-question' ) + '</strong><br>' + actionSummary ); |
| 333 | 333 | dialog.append( summaryHolder ); |
| 334 | 334 | |
| 335 | 335 | // Reason textbox. |
| — | — | @@ -388,13 +388,8 @@ |
| 389 | 389 | _saveAllButton.hide(); |
| 390 | 390 | _cancelAllButton.hide(); |
| 391 | 391 | return; |
| 392 | | - } else if ( summary.length == 1 ) { |
| 393 | | - summary = summary.pop(); |
| 394 | 392 | } else { |
| 395 | | - var lastSummary = summary.pop(); |
| 396 | | - summary = summary.join( ', '); |
| 397 | | - summary += mw.msg( 'ajax-category-and' ) + lastSummary; |
| 398 | | - summary = summary.substring( 0, summary.length - 2 ); |
| | 393 | + summary = summary.join( '<br>' ); |
| 399 | 394 | } |
| 400 | 395 | // Remove "holes" in array |
| 401 | 396 | summaryShort = $.grep( _stash.shortSum, function( n,i ) { |
| — | — | @@ -417,7 +412,7 @@ |
| 418 | 413 | }; |
| 419 | 414 | var doneFn = function() { that.resetAll( true ); }; |
| 420 | 415 | |
| 421 | | - that._confirmEdit( combinedFn, summary, shortSummary, doneFn, '', 'all' ); |
| | 416 | + that._confirmEdit( combinedFn, summary, summaryShort, doneFn, '', 'all' ); |
| 422 | 417 | }; |
| 423 | 418 | |
| 424 | 419 | /** |