wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-12 09:26:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use words for describing notification counts in HTML text node"

Browse source
This commit is contained in:
jenkins-bot 2017-03-14 18:09:13 +00:00 committed by Gerrit Code Review
parent fbafc84e59 d4d325e7e6
commit 705dd1d9d4
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Hooks.php
View file

@ -921,8 +921,11 @@ class EchoHooks {
$sk->getOutput()->addJsConfigVars( 'wgEchoShowSpecialPageInvitation', true );
}
$msgText = EchoNotificationController::formatNotificationCount( $msgCount );
$alertText = EchoNotificationController::formatNotificationCount( $alertCount );
$msgFormattedCount = EchoNotificationController::formatNotificationCount( $msgCount );
$alertFormattedCount = EchoNotificationController::formatNotificationCount( $alertCount );
$msgText = wfMessage( 'echo-notification-notice', $msgCount );
$alertText = wfMessage( 'echo-notification-alert', $alertCount );
$url = SpecialPage::getTitleFor( 'Notifications' )->getLocalURL();
@ -971,7 +974,7 @@ class EchoHooks {
'class' => $alertLinkClasses,
'data' => [
'counter-num' => $alertCount,
'counter-text' => $alertText,
'counter-text' => $alertFormattedCount,
],
];
@ -986,7 +989,7 @@ class EchoHooks {
'class' => $msgLinkClasses,
'data' => [
'counter-num' => $msgCount,
'counter-text' => $msgText,
'counter-text' => $msgFormattedCount,
],
];

4
tests/browser/features/notifications.feature
View file

@ -9,14 +9,14 @@ Feature: Testing notification types
Given another user mentions me
When I refresh the page
Then the alert badge is showing unseen notifications
And the alert badge value is "1"
And the alert badge value is "Alert (1)"
@skip
Scenario: Someone writes on my talk page
Given another user writes on my talk page
When I refresh the page
Then the alert badge is showing unseen notifications
And the alert badge value is "1"
And the alert badge value is "Alert (1)"
When I click the alert badge
And I see the alert popup
Then there are "1" unread notifications in the alert popup