UltrasonicNXT has submitted this change and it was merged. Change subject: MediaWikiChat: Add GENDER. ......................................................................
MediaWikiChat: Add GENDER. See: https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Chat-mentioned-by/en https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Chat-kicked/en_(2) Change-Id: If1390cb2c5bb79729ba6bfa75a8229b2d2f9f0dd --- M MediaWikiChat.js M i18n/en.json M i18n/qqq.json 3 files changed, 13 insertions(+), 13 deletions(-) Approvals: UltrasonicNXT: Verified; Looks good to me, approved diff --git a/MediaWikiChat.js b/MediaWikiChat.js index e522e55..1898afb 100644 --- a/MediaWikiChat.js +++ b/MediaWikiChat.js @@ -241,7 +241,7 @@ } else if ( from.name == mw.config.get( 'wgUserName' ) ) { message = mw.message( 'chat-you-kicked', to.name, mw.user ).text(); } else { - message = mw.message( 'chat-kicked', from.name, to.name, from.gender ).text(); + message = mw.message( 'chat-kicked', from.name, to.name, from.gender, to.gender ).text(); } MediaWikiChat.addSystemMessage( message, timestamp ); }, @@ -293,10 +293,10 @@ if ( message.toLowerCase().indexOf( mw.user.getName().toLowerCase() ) != -1 ) { mention = true; - MediaWikiChat.flashMention( mw.message( 'chat-mentioned-by', user.name).text(), message ); + MediaWikiChat.flashMention( mw.message( 'chat-mentioned-by', user.name, user.gender ).text(), message ); } else { if ( userId != mw.user.getId() ) { // don't flash if we sent the message - MediaWikiChat.flash( mw.message( 'chat-message-from', user.name).text(), message ); + MediaWikiChat.flash( mw.message( 'chat-message-from', user.name, user.gender ).text(), message ); } } @@ -371,7 +371,7 @@ } if ( userId != mw.user.getId() ) { // don't flash if we sent the message - MediaWikiChat.flashPrivate(mw.message('chat-private-message-from', user.name).text(), message); + MediaWikiChat.flashPrivate(mw.message( 'chat-private-message-from', user.name, user.gender ).text(), message); } }, @@ -774,4 +774,4 @@ $( window ).focus( function() { MediaWikiChat.focussed = true; document.title = MediaWikiChat.title; // restore title -} ); \ No newline at end of file +} ); diff --git a/i18n/en.json b/i18n/en.json index 1fa6983..914cb49 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -23,7 +23,7 @@ "chat-youve-been-kicked": "You have been {{GENDER:$2|kicked}} by $1. Refresh the page to chat.", "chat-you-kicked": "You {{GENDER:$2|kicked}} $1.", - "chat-kicked": "$1 {{GENDER:$3|kicked}} $2.", + "chat-kicked": "$1 {{GENDER:$3|{{GENDER:$4|kicked}}}} $2.", "chat-youve-been-blocked": "You have been {{GENDER:$2|blocked}} by $1.", "chat-you-blocked": "You {{GENDER:$2|blocked}} $1.", "chat-blocked": "$1 {{GENDER:$3|blocked}} $2.", @@ -94,7 +94,7 @@ "apihelp-chatsendpm-param-message": "The message to send", "apihelp-chatsendpm-example-1": "Send \"Hello World!\" to user with ID 5", - "chat-message-from": "Message from $1", - "chat-private-message-from": "Private message from $1", - "chat-mentioned-by": "Mentioned by $1" + "chat-message-from": "Message {{GENDER:$2|from}} $1", + "chat-private-message-from": "Private message {{GENDER:$2|from}} $1", + "chat-mentioned-by": "Mentioned {{GENDER:$2|by}} $1" } diff --git a/i18n/qqq.json b/i18n/qqq.json index cca71cc..13984d1 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -25,7 +25,7 @@ "chat-block": "The link shown to chatmods to block a user.\n{{Identical|Block}}", "chat-youve-been-kicked": "Shown to users who have been kicked from the chat. Parameters:\n* $1 - the user who kicked from the chat\n* $2 - GENDER of the user who kicked\nSee also:\n* {{msg-mw|Chat-youve-been-blocked}}", "chat-you-kicked": "Shown when the current user kicked the user $1. Parameters:\n* $1 - username\n* $2 - GENDER\nSee also:\n* {{msg-mw|Chat-you-blocked}}\n* {{msg-mw|Chat-you-unblocked}}", - "chat-kicked": "Shown when the user $1 kicked the user $2. Parameters:\n* $1 - the user who kicked\n* $2 - the user who was kicked\n* $3 - GENDER of the user who kicked\nSee also:\n* {{msg-mw|Chat-blocked}}\n* {{msg-mw|Chat-unblocked}}\n{{Identical|Kicked}}", + "chat-kicked": "Shown when the user $1 kicked the user $2. Parameters:\n* $1 - the user who kicked\n* $2 - the user who was kicked\n* $3 - GENDER of the user who kicked\n* $3 - GENDER of the user who was kicked\nSee also:\n* {{msg-mw|Chat-blocked}}\n* {{msg-mw|Chat-unblocked}}\n{{Identical|Kicked}}", "chat-youve-been-blocked": "Shown when the current user has been blocked, by the user $1. Parameters:\n* $1 - the user who has blocked\n* $2 - GENDER of the user who has blocked\nSee also:\n* {{msg-mw|Chat-youve-been-kicked}}", "chat-you-blocked": "Shown when the current user blocked the user $1. Parameters:\n* $1 - username\n* $2 - GENDER\nSee also:\n* {{msg-mw|Chat-you-kicked}}\n* {{msg-mw|Chat-you-unblocked}}", "chat-blocked": "Shown when the user $1 blocked the user $2. Parameters:\n* $1 - the user who blocked\n* $2 - the user who was blocked\n* $3 - GENDER of the user who blocked\nSee also:\n* {{msg-mw|Chat-kicked}}\n* {{msg-mw|Chat-unblocked}}\n{{Identical|Blocked}}", @@ -86,7 +86,7 @@ "apihelp-chatsendpm-param-id": "{{doc-apihelp-param|chatsendpm|id}}", "apihelp-chatsendpm-param-message": "{{doc-apihelp-param|chatsendpm|message}}", "apihelp-chatsendpm-example-1": "{{doc-apihelp-example|chatsendpm}}", - "chat-message-from": "Notification for receiving message", - "chat-private-message-from": "Notification for receiving private message", - "chat-mentioned-by": "Notification for being mentioned" + "chat-message-from": "Notification for receiving message\n$1 sending user\n$2 sending users gender", + "chat-private-message-from": "Notification for receiving private message\n$1 sending user\n$2 sending users gender", + "chat-mentioned-by": "Notification for being mentioned\n$1 mentioning user\n$2 mentioning users gender" } -- To view, visit https://gerrit.wikimedia.org/r/214259 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If1390cb2c5bb79729ba6bfa75a8229b2d2f9f0dd Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MediaWikiChat Gerrit-Branch: master Gerrit-Owner: Purodha <[email protected]> Gerrit-Reviewer: Siebrand <[email protected]> Gerrit-Reviewer: UltrasonicNXT <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
