Robert Vogel has submitted this change and it was merged.
Change subject: Backport fixes from master to REL1_22 branch
......................................................................
Backport fixes from master to REL1_22 branch
added missing icon definitions
fixed email-batch-messages in Echo notification definitions
Change-Id: If83064ac506e4749e6dde73d52765954f819d752
---
M Notifications/Notifications.class.php
M Notifications/Notifications.i18n.php
2 files changed, 67 insertions(+), 42 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Notifications/Notifications.class.php
b/Notifications/Notifications.class.php
index b377cc6..e4d4b99 100644
--- a/Notifications/Notifications.class.php
+++ b/Notifications/Notifications.class.php
@@ -185,7 +185,28 @@
return true;
}
- public function onBeforeCreateEchoEvent( &$notifications,
&$notificationCategories ) {
+ public function onBeforeCreateEchoEvent( &$notifications,
&$notificationCategories, &$icons ) {
+ $sIconPath = 'BlueSpiceExtensions/Notifications/icons/';
+ $icons = array_merge( $icons, array(
+ 'bs-edit' => array(
+ 'path' => $sIconPath.'edit.png'
+ ),
+ 'bs-create' => array(
+ 'path' => $sIconPath.'create.png'
+ ),
+ 'bs-delete' => array(
+ 'path' => $sIconPath.'delete.png'
+ ),
+ 'bs-move' => array(
+ 'path' => $sIconPath.'move.png'
+ ),
+ 'bs-newuser' => array(
+ 'path' => $sIconPath.'newuser.png'
+ ),
+ 'bs-shoutbox' => array(
+ 'path' => $sIconPath.'shoutbox.png'
+ ),
+ ) );
// category definition via self::$aNotificationCategories
// HINT:
http://www.mediawiki.org/wiki/Echo_(Notifications)/Developer_guide#Notification_category_parameters
foreach( self::$aNotificationCategories as $sCategory =>
$aCategoryDefinition ) {
@@ -204,9 +225,9 @@
'email-subject-params' => array( 'title', 'agent' ),
'email-body-message' => 'bs-notifications-email-edit',
'email-body-params' => array( 'title', 'agent',
'summary', 'titlelink', 'difflink' ),
- 'email-body-batch-message' => 'hello again',
- 'icon' => 'edit',
-// 'bundle' => array( 'web' => true, 'email' => true ),
+ 'email-body-batch-message' =>
'bs-notifications-email-edit',
+ 'email-body-batch-params' => array( 'title', 'agent',
'summary', 'titlelink', 'difflink' ),
+ 'icon' => 'bs-edit',
);
$notifications['bs-create'] = array(
@@ -221,9 +242,9 @@
'email-subject-params' => array( 'title', 'agent' ),
'email-body-message' => 'bs-notifications-email-new',
'email-body-params' => array( 'title', 'agent',
'summary', 'titlelink', 'difflink' ),
- 'email-body-batch-message' => 'hello again',
- 'icon' => 'create',
-// 'bundle' => array( 'web' => true, 'email' => true ),
+ 'email-body-batch-message' =>
'bs-notifications-email-new',
+ 'email-body-batch-params' => array( 'title', 'agent',
'summary', 'titlelink', 'difflink' ),
+ 'icon' => 'bs-create',
);
$notifications['bs-delete'] = array(
@@ -238,9 +259,9 @@
'email-subject-params' => array( 'title', 'agent' ),
'email-body-message' => 'bs-notifications-email-delete',
'email-body-params' => array( 'titlelink', 'agent',
'deletereason' ),
- 'email-body-batch-message' => 'hello again',
- 'icon' => 'delete',
-// 'bundle' => array( 'web' => true, 'email' => true ),
+ 'email-body-batch-message' =>
'bs-notifications-email-delete',
+ 'email-body-batch-params' => array( 'titlelink',
'agent', 'deletereason' ),
+ 'icon' => 'bs-delete',
);
$notifications['bs-move'] = array(
@@ -255,8 +276,9 @@
'email-subject-params' => array( 'title', 'agent',
'newtitle' ),
'email-body-message' => 'bs-notifications-email-move',
'email-body-params' => array( 'title', 'agent',
'newtitle', 'newtitlelink' ),
- 'email-body-batch-message' => 'hello again',
- 'icon' => 'move',
+ 'email-body-batch-message' =>
'bs-notifications-email-move',
+ 'email-body-batch-params' => array( 'title', 'agent',
'newtitle', 'newtitlelink' ),
+ 'icon' => 'bs-move',
);
$notifications['bs-newuser'] = array(
@@ -271,8 +293,9 @@
'email-subject-params' => array( 'user' ),
'email-body-message' =>
'bs-notifications-email-addaccount',
'email-body-params' => array( 'userlink' ),
- 'email-body-batch-message' => 'hello again',
- 'icon' => 'newuser',
+ 'email-body-batch-message' =>
'bs-notifications-email-addaccount',
+ 'email-body-batch-params' => array( 'userlink' ),
+ 'icon' => 'bs-newuser',
);
$notifications['bs-shoutbox'] = array(
@@ -287,8 +310,9 @@
'email-subject-params' => array( 'title', 'agent' ),
'email-body-message' => 'bs-notifications-email-shout',
'email-body-params' => array( 'title', 'agent',
'shoutmsg', 'titlelink' ),
- 'email-body-batch-message' => 'hello again',
- 'icon' => 'shoutbox',
+ 'email-body-batch-message' =>
'bs-notifications-email-shout',
+ 'email-body-batch-params' => array( 'title', 'agent',
'shoutmsg', 'titlelink' ),
+ 'icon' => 'bs-shoutbox',
);
return true;
}
diff --git a/Notifications/Notifications.i18n.php
b/Notifications/Notifications.i18n.php
index d8d171e..18e0c7f 100644
--- a/Notifications/Notifications.i18n.php
+++ b/Notifications/Notifications.i18n.php
@@ -46,7 +46,7 @@
'bs-echo-flyout-page-newuser' => 'The User
[[$1]] was created.',
'bs-echo-page-shoutbox' => 'On
the site [[$1]] was a new ShoutBox-Message created .',
'bs-echo-flyout-page-shoutbox' => 'On the site
[[$1]] was a new ShoutBox-Message created .',
-
+
// Email subject
'bs-echo-email-subject-page-edit' => 'The site
[[$1]] has been changed by [[$2]]',
'bs-echo-email-subject-page-create' => 'The site
[[$1]] has been created',
@@ -66,19 +66,19 @@
// Email batch
'bs-echo-emailbatch-subject-page-edit' => 'The wiki pages were
edited',
'bs-echo-emailbatch-body-page-edit' => 'The site
[[$1]] was edited by $2', // entspricht bs-echo-flyout-*******
-
+
'bs-echo-emailbatch-subject-page-create' => 'The wiki pages were
created',
'bs-echo-emailbatch-body-page-create' => 'The site [[$1]] was
created by $2',
-
+
'bs-echo-emailbatch-subject-page-delete' => 'The wiki pages were
deleted',
'bs-echo-emailbatch-body-page-delete' => 'The site [[$1]] was
deleted by $2',
-
+
'bs-echo-emailbatch-subject-page-move' => 'The wiki pages were
moved',
'bs-echo-emailbatch-body-page-move' => 'The site
[[$1]] was moved by $2',
-
+
'bs-echo-emailbatch-subject-page-newuser' => 'A new User was
created',
'bs-echo-emailbatch-body-page-newuser' => 'On the site [[$1]]
was a new user created by $2',
-
+
'bs-echo-emailbatch-subject-page-shoutbox' => 'On the site was a
new ShoutBox-Message created',
'bs-echo-emailbatch-body-page-shoutbox' => 'On the site [[$1]]
was a new ShoutBox-Message created by $2',
// END HERE
-------------------------------------------------------------- //
@@ -97,15 +97,16 @@
'bs-notifications-email-shout-subject' => "$2 posted a message on
page $1",
'bs-notifications-email-shout' => "$2 posted a message on
page $1.\n\nMessage:\n$3\n\n You can visit the page following this
link:\n$4.\n",
'prefs-Notifications' => 'Notifications',
- 'bs-notifications-pref-notifynew' => 'Notification for new
pages',
- 'bs-notifications-pref-notifyedit' => 'Notification for edits',
- 'bs-notifications-pref-notifymove' => 'Notification for moves',
- 'bs-notifications-pref-notifydelete' => 'Notification for
deletion',
+ 'echo-category-title-bs-create-cat' => 'Notification for new
pages',
+ 'echo-category-title-bs-edit-cat' => 'Notification for edits',
+ 'echo-category-title-bs-move-cat' => 'Notification for moves',
+ 'echo-category-title-bs-delete-cat' => 'Notification for
deletion',
'bs-notifications-pref-notifynominor' => 'No notification for
minor changes',
- 'bs-notifications-pref-notifyuser' => 'Notification for new
users (only for sysops)',
+ 'echo-category-title-bs-newuser-cat' => 'Notification for new
users (only for sysops)',
'bs-notifications-pref-notifyns' => 'Only notify for changes
in these namespaces',
- 'bs-notifications-pref-notifyshout' => 'Notification for
messages on watched pages(shoutbox)',
- 'bs-notifications-pref-active' => 'Enable Notification'
+ 'echo-category-title-bs-shoutbox-cat' => 'Notification for
messages on watched pages(shoutbox)',
+ 'bs-notifications-pref-active' => 'Enable Notification',
+
);
$messages['de'] = array(
@@ -124,7 +125,7 @@
'echo-dismiss-title-bs-move' => 'Seiten
verschoben',
'echo-dismiss-title-bs-newuser' => 'Neue
Benutzer ',
'echo-dismiss-title-bs-shoutbox' => 'Shoutbox
Messages',
-
+
'bs-echo-anon-user'
=> "'''Anonym'''",
'bs-echo-unknown-user' =>
"'''Unbekannt'''",
'bs-echo-page-edit'
=> 'Die Seite [[$1]] wurde bearbeitet',
@@ -159,19 +160,19 @@
// Email batch
'bs-echo-emailbatch-subject-page-edit' => 'Im Wiki wurden
Seiten bearbeitet',
'bs-echo-emailbatch-body-page-edit' => 'Die Seite
[[$1]] wurde von $2 bearbeitet', // entspricht bs-echo-flyout-*******
-
+
'bs-echo-emailbatch-subject-page-create' => 'Im Wiki wurden neue
Seiten angelegt',
'bs-echo-emailbatch-body-page-create' => 'Die Seite [[$1]]
wurde von $2 neu angelegt',
-
+
'bs-echo-emailbatch-subject-page-delete'=> 'Im Wiki wurden Seiten
gelöscht',
'bs-echo-emailbatch-body-page-delete' => 'Die Seite [[$1]] wurde von
$2 gelöscht',
-
+
'bs-echo-emailbatch-subject-page-move' => 'Im Wiki wurden Seiten
bewegt',
'bs-echo-emailbatch-body-page-move' => 'Die Seite [[$1]]
wurde von $2 bewegt',
-
+
'bs-echo-emailbatch-subject-page-newuser'=> 'Auf der Seite wurde ein
neuer Benutzer angelegt',
'bs-echo-emailbatch-body-page-newuser' => 'Auf der Seite [[$1]] wurde
von $2 ein neuer Benutzer angelegt',
-
+
'bs-echo-emailbatch-subject-page-shoutbox'=> 'Auf der Seite wurde eine
ShoutBox-Mitteilung verfasst',
'bs-echo-emailbatch-body-page-shoutbox' => 'Auf der Seite [[$1]] wurde
von $2 eine ShoutBox-Mitteilung verfasst',
// END HERE
-------------------------------------------------------------- //
@@ -190,16 +191,16 @@
'bs-notifications-email-shout-subject' => "$2 hat auf der Seite $1
eine Nachricht hinterlassen",
'bs-notifications-email-shout' => "$2 hat auf der Seite $1
eine Nachricht hinterlassen.\n\nNachricht:\n$3\n\nDu kannst den Artikel über
diese URL aufrufen:\n$4\n",
'prefs-Notifications' => 'Benachrichtigungen',
- 'bs-notifications-pref-notifynew' => 'Benachrichtigung bei
neuen Seiten',
- 'bs-notifications-pref-notifyedit' => 'Benachrichtigung beim
Bearbeiten von Seiten',
- 'bs-notifications-pref-notifymove' => 'Benachrichtigung beim
Verschieben von Seiten',
- 'bs-notifications-pref-notifydelete' => 'Benachrichtigung beim
Löschen von Seiten',
+ 'echo-category-title-bs-create-cat' => 'Benachrichtigung bei
neuen Seiten',
+ 'echo-category-title-bs-edit-cat' => 'Benachrichtigung beim
Bearbeiten von Seiten',
+ 'echo-category-title-bs-move-cat' => 'Benachrichtigung beim
Verschieben von Seiten',
+ 'echo-category-title-bs-delete-cat' => 'Benachrichtigung beim
Löschen von Seiten',
'bs-notifications-pref-notifynominor' => 'Keine Benachrichtigung
bei geringfügigen Änderungen',
- 'bs-notifications-pref-notifyuser' => 'Benachrichtigung bei
Anmeldung neuer Nutzer (nur für Administratoren)',
+ 'echo-category-title-bs-newuser-cat' => 'Benachrichtigung bei
Anmeldung neuer Nutzer (nur für Administratoren)',
'bs-notifications-pref-notifyns' => 'Nur bei Bearbeitungen
in diesen Namespaces benachrichtigen',
- 'bs-notifications-pref-notifyshout' => 'Benachrichtigung bei
Mitteilungen auf beobachteten Seiten (Shoutbox)',
+ 'echo-category-title-bs-shoutbox-cat' => 'Benachrichtigung bei
Mitteilungen auf beobachteten Seiten (Shoutbox)',
'bs-notifications-pref-active' => 'Benachrichtigungen
aktivieren'
-
+
);
$messages['de-formal'] = array(
--
To view, visit https://gerrit.wikimedia.org/r/187110
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If83064ac506e4749e6dde73d52765954f819d752
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_22
Gerrit-Owner: Tr4nt0r <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pigpen <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
