diff --git a/Hooks.php b/Hooks.php index 51c29d2d3..c76eabe88 100644 --- a/Hooks.php +++ b/Hooks.php @@ -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, ], ]; diff --git a/tests/browser/features/notifications.feature b/tests/browser/features/notifications.feature index 33ac80929..63f7dbe00 100644 --- a/tests/browser/features/notifications.feature +++ b/tests/browser/features/notifications.feature @@ -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