wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-24 16:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Merge the text of the welcome message into the title."

Browse source
This commit is contained in:
Kaldari 2013-04-04 17:40:19 +00:00 committed by Gerrit Code Review
parent 62c5a54547 54af0449d8
commit 002d816de1
3 changed files with 2 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Echo.i18n.php
View file

@ -73,8 +73,7 @@ $messages['en'] = array(
'notification-user-rights-add' => 'You are now a member of {{PLURAL:$2|this group|these groups}}: $1', 'notification-user-rights-add' => 'You are now a member of {{PLURAL:$2|this group|these groups}}: $1',
'notification-user-rights-remove' => 'You are no longer a member of {{PLURAL:$2|this group|these groups}}: $1', 'notification-user-rights-remove' => 'You are no longer a member of {{PLURAL:$2|this group|these groups}}: $1',
'notification-talkpage-content' => '$1', ## Do not translate unless you deliberately want to change behaviour 'notification-talkpage-content' => '$1', ## Do not translate unless you deliberately want to change behaviour
'notification-new-user' => 'Welcome to {{SITENAME}}, $1!', 'notification-new-user' => "Welcome to {{SITENAME}}, $1! We're glad you're here.",
'notification-new-user-content' => "We're glad you're here.",
'notification-reverted2' => 'Your {{PLURAL:$4|edit on [[$2]] has|edits on [[$2]] have}} been {{GENDER:$1|reverted}} by [[User:$1|$1]] $3', 'notification-reverted2' => 'Your {{PLURAL:$4|edit on [[$2]] has|edits on [[$2]] have}} been {{GENDER:$1|reverted}} by [[User:$1|$1]] $3',
'notification-reverted-flyout2' => 'Your {{PLURAL:$4|edit on $2 has|edits on $2 have}} been {{GENDER:$1|reverted}} by $1 $3', 'notification-reverted-flyout2' => 'Your {{PLURAL:$4|edit on $2 has|edits on $2 have}} been {{GENDER:$1|reverted}} by $1 $3',
'notification-edit-talk-page-email-subject2' => 'You have a new talkpage message', 'notification-edit-talk-page-email-subject2' => 'You have a new talkpage message',
@ -362,11 +361,10 @@ Parameters:
* $1 is the content of the talk page post. * $1 is the content of the talk page post.
{{optional}}', {{optional}}',
'notification-new-user' => 'Title for the welcome notification. Parameters: 'notification-new-user' => 'Text of the welcome notification. Parameters:
* $1 - the name of the new user * $1 - the name of the new user
See also: See also:
* {{msg-mw|Guidedtour-tour-gettingstarted-start-title}}', * {{msg-mw|Guidedtour-tour-gettingstarted-start-title}}',
'notification-new-user-content' => 'The content shown to users on their welcome notification.',
'notification-reverted2' => "Format for displaying notifications of a user's edit being reverted. 'notification-reverted2' => "Format for displaying notifications of a user's edit being reverted.
* $1 is the username of the person who reverted, plain text. Can be used for GENDER. * $1 is the username of the person who reverted, plain text. Can be used for GENDER.
* $2 is the page that was reverted, formatted. * $2 is the page that was reverted, formatted.

1
Echo.php
View file

@ -273,7 +273,6 @@ $wgEchoNotifications = array(
'group' => 'positive', 'group' => 'positive',
'title-message' => 'notification-new-user', 'title-message' => 'notification-new-user',
'title-params' => array( 'agent' ), 'title-params' => array( 'agent' ),
'payload' => array( 'welcome' ),
'icon' => 'w', 'icon' => 'w',
), ),
'edit-user-talk' => array( 'edit-user-talk' => array(

7
formatters/BasicFormatter.php
View file

@ -247,13 +247,6 @@ class EchoBasicFormatter extends EchoNotificationFormatter {
case 'summary': case 'summary':
return $this->formatSummary( $event, $user ); return $this->formatSummary( $event, $user );
break; break;
case 'welcome':
$details = array(
'message' => 'notification-new-user-content',
'params' => array( 'agent' )
);
return $this->formatFragment( $details, $event, $user )->parse();
break;
default: default:
return ''; return '';
} }