Merge "Localize numbers before passing to mw.msg"

This commit is contained in:
jenkins-bot 2020-03-30 08:16:56 +00:00 committed by Gerrit Code Review
commit ce1640bae9
2 changed files with 3 additions and 4 deletions

View file

@ -108,7 +108,7 @@
"wikieditor-toolbar-tool-table-insert": "Insert",
"wikieditor-toolbar-tool-table-cancel": "Cancel",
"wikieditor-toolbar-tool-table-example-text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut nec purus diam. Sed aliquam imperdiet nunc quis lacinia. Donec rutrum consectetur placerat. Sed volutpat neque non purus faucibus id ultricies enim euismod.",
"wikieditor-toolbar-tool-table-toomany": "Inserting a table with more than $1 {{PLURAL:$1|cells}} is not possible with this dialog.",
"wikieditor-toolbar-tool-table-toomany": "Inserting a table with more than $1 {{PLURAL:$1|cell|cells}} is not possible with this dialog.",
"wikieditor-toolbar-tool-table-invalidnumber": "You have not entered a valid number of rows or columns.",
"wikieditor-toolbar-tool-table-zero": "You cannot insert a table with zero rows or columns.",
"wikieditor-toolbar-tool-replace": "Search and replace",

View file

@ -850,9 +850,8 @@
return;
}
if ( ( rows * cols ) > 1000 ) {
// 1000 is in the English message. The parameter replacement is kept for BC.
// eslint-disable-next-line no-alert
alert( mw.msg( 'wikieditor-toolbar-tool-table-toomany', 1000 ) );
alert( mw.msg( 'wikieditor-toolbar-tool-table-toomany', mw.language.convertNumber( 1000 ) ) );
return;
}
headerText = mw.msg( 'wikieditor-toolbar-tool-table-example-header' );
@ -1021,7 +1020,7 @@
} else if ( mode === 'replaceAll' ) {
$textarea.textSelection( 'setContents', text.replace( regex, replaceStr ) );
$( '#wikieditor-toolbar-replace-success' )
.text( mw.msg( 'wikieditor-toolbar-tool-replace-success', match.length ) )
.text( mw.msg( 'wikieditor-toolbar-tool-replace-success', mw.language.convertNumber( match.length ) ) )
.show();
$( this ).data( 'offset', 0 );
} else {