Merge "thanks-thanked message needs GENDER support"

This commit is contained in:
jenkins-bot 2013-04-26 17:54:58 +00:00 committed by Gerrit Code Review
commit 111d93ff85
2 changed files with 4 additions and 3 deletions

View file

@ -13,7 +13,7 @@ $messages = array();
$messages['en'] = array( $messages['en'] = array(
'thanks-desc' => 'Adds thank links to history and diff views', 'thanks-desc' => 'Adds thank links to history and diff views',
'thanks-thank' => 'thank', 'thanks-thank' => 'thank',
'thanks-thanked' => 'thanked', 'thanks-thanked' => '{{GENDER:$1|thanked}}',
'thanks-error-undefined' => 'Thank action failed. Please try again.', 'thanks-error-undefined' => 'Thank action failed. Please try again.',
'thanks-error-invalidrevision' => 'Revision ID is not valid.', 'thanks-error-invalidrevision' => 'Revision ID is not valid.',
'thanks-error-ratelimited' => "You've exceeded your rate limit. Please wait some time and try again.", 'thanks-error-ratelimited' => "You've exceeded your rate limit. Please wait some time and try again.",
@ -44,7 +44,8 @@ $4',
$messages['qqq'] = array( $messages['qqq'] = array(
'thanks-desc' => '{{desc|name=Thanks|url=http://www.mediawiki.org/wiki/Extension:Thanks}}', 'thanks-desc' => '{{desc|name=Thanks|url=http://www.mediawiki.org/wiki/Extension:Thanks}}',
'thanks-thank' => 'Link to thank another user. This is a verb.', 'thanks-thank' => 'Link to thank another user. This is a verb.',
'thanks-thanked' => 'Message that replaces the link to thank another user after they have been thanked (Echo-thank). This is short for "the user that created this revision has been thanked for it".', 'thanks-thanked' => 'Message that replaces the link to thank another user after they have been thanked (Echo-thank). This is short for "You thanked the user for their edit.". Parameters:
* $1 is the current user, for GENDER support.',
'thanks-error-undefined' => 'Error message that is displayed when the thank action fails. 'thanks-error-undefined' => 'Error message that is displayed when the thank action fails.
{{Identical|Please try again}}', {{Identical|Please try again}}',
'thanks-error-invalidrevision' => 'Error message that is displayed when the revision ID is not valid', 'thanks-error-invalidrevision' => 'Error message that is displayed when the revision ID is not valid',

View file

@ -16,7 +16,7 @@
'token' : mw.user.tokens.values.editToken 'token' : mw.user.tokens.values.editToken
} ) } )
.done( function( data ) { .done( function( data ) {
$thankLink.before( mw.msg( 'thanks-thanked' ) ); $thankLink.before( mw.message( 'thanks-thanked', mw.user ).escaped() );
$thankLink.remove(); $thankLink.remove();
} ) } )
.fail( function( errorCode, details ) { .fail( function( errorCode, details ) {