Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/211298

Change subject: Add extension.json
......................................................................

Add extension.json

Bug: T87910
Change-Id: I945e0b60ff4de88a9ac2144a0af54bd22d291cc6
---
M Echo.alias.php
D Echo.i18n.php
M Hooks.php
D Resources.php
D autoload.php
A extension.json
M i18n/ro.json
7 files changed, 739 insertions(+), 262 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/98/211298/1

diff --git a/Echo.alias.php b/Echo.alias.php
index dce2fe0..29b6402 100644
--- a/Echo.alias.php
+++ b/Echo.alias.php
@@ -134,7 +134,7 @@
        'Notifications' => array( 'Notifikatiounen' ),
 );
 
-/** لوری مینجایی (لوری مینجایی) */
+/** Northern Luri (لوری مینجایی) */
 $specialPageAliases['lrc'] = array(
        'Notifications' => array( 'وارسیاریا' ),
 );
diff --git a/Echo.i18n.php b/Echo.i18n.php
deleted file mode 100644
index c805ec6..0000000
--- a/Echo.i18n.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * This is a backwards-compatibility shim, generated by:
- * 
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
- *
- * Beginning with MediaWiki 1.23, translation strings are stored in json files,
- * and the EXTENSION.i18n.php file only exists to provide compatibility with
- * older releases of MediaWiki. For more information about this migration, see:
- * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
- *
- * This shim maintains compatibility back to MediaWiki 1.17.
- */
-$messages = array();
-if ( !function_exists( 'wfJsonI18nShimf2b01d837887d3da' ) ) {
-       function wfJsonI18nShimf2b01d837887d3da( $cache, $code, &$cachedData ) {
-               $codeSequence = array_merge( array( $code ), 
$cachedData['fallbackSequence'] );
-               foreach ( $codeSequence as $csCode ) {
-                       $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
-                       if ( is_readable( $fileName ) ) {
-                               $data = FormatJson::decode( file_get_contents( 
$fileName ), true );
-                               foreach ( array_keys( $data ) as $key ) {
-                                       if ( $key === '' || $key[0] === '@' ) {
-                                               unset( $data[$key] );
-                                       }
-                               }
-                               $cachedData['messages'] = array_merge( $data, 
$cachedData['messages'] );
-                       }
-
-                       $cachedData['deps'][] = new FileDependency( $fileName );
-               }
-               return true;
-       }
-
-       $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 
'wfJsonI18nShimf2b01d837887d3da';
-}
diff --git a/Hooks.php b/Hooks.php
index 75864e8..afefbaf 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -8,6 +8,20 @@
        const EMAIL_FORMAT_HTML = 'html';
        const EMAIL_FORMAT_PLAIN_TEXT = 'plain-text';
 
+       public static function registerExtension() {
+               global $wgNotificationSender, $wgPasswordSender, 
$wgAllowHTMLEmail, $wgDefaultUserOptions;
+
+               // The email address for both "from" and "reply to" on email 
notifications.
+               // Should be defined in LocalSettings.php
+               $wgNotificationSender = $wgPasswordSender;
+
+               if ( $wgAllowHTMLEmail ) {
+                       $wgDefaultUserOptions['echo-email-format'] = 'html'; 
/*EchoHooks::EMAIL_FORMAT_HTML*/
+               } else {
+                       $wgDefaultUserOptions['echo-email-format'] = 
'plain-text'; /*EchoHooks::EMAIL_FORMAT_PLAIN_TEXT*/
+               }
+       }
+
        /**
         * Initialize Echo extension with necessary data, this function is 
invoked
         * from $wgExtensionFunctions
diff --git a/Resources.php b/Resources.php
deleted file mode 100644
index 7acf5d5..0000000
--- a/Resources.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/**
- * MediaWiki Extension: Echo
- * http://www.mediawiki.org/wiki/Extension:Echo
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to 
deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * This program is distributed WITHOUT ANY WARRANTY.
- */
-
-/**
- *
- * @file
- * @ingroup Extensions
- * @author Andrew Garrett, Benny Situ, Ryan Kaldari, Erik Bernhardson
- * @licence MIT License
- */
-
-$echoResourceTemplate = array(
-       'localBasePath' => __DIR__ . '/modules',
-       'remoteExtPath' => 'Echo/modules',
-);
-
-$mobileReadyTemplate = array(
-       'targets' => array( 'desktop', 'mobile' ),
-);
-
-$wgResourceModules += array(
-       // ext.echo.base is used by mobile notifications as well, so be sure 
not to add any
-       // dependencies that do not target mobile.
-       'ext.echo.base' => $echoResourceTemplate + $mobileReadyTemplate + array(
-               'position' => 'top',
-               'styles' => 'base/ext.echo.base.less',
-               'scripts' => array(
-                       'base/ext.echo.base.js',
-               ),
-               'messages' => array(
-                       'echo-error-preference',
-                       'echo-error-token',
-               ),
-       ),
-       'ext.echo.overlay' => $echoResourceTemplate + $mobileReadyTemplate + 
array(
-               'scripts' => array(
-                       'overlay/ext.echo.overlay.js',
-               ),
-               'skinStyles' => array(
-                       'modern' => 'overlay/ext.echo.overlay.modern.css',
-                       'monobook' => 'overlay/ext.echo.overlay.monobook.css',
-               ),
-               'dependencies' => array(
-                       'mediawiki.util',
-                       'mediawiki.language',
-                       'mediawiki.ui.anchor',
-                       'ext.echo.base',
-                       'mediawiki.api',
-                       'mediawiki.jqueryMsg',
-               ),
-               'messages' => array(
-                       'echo-overlay-link',
-                       'echo-mark-all-as-read',
-                       'echo-more-info',
-                       'echo-feedback',
-                       'echo-notification-alert',
-                       'echo-notification-message',
-                       'echo-notification-alert-text-only',
-                       'echo-notification-message-text-only',
-                       'echo-email-batch-bullet'
-               ),
-       ),
-       'ext.echo.overlay.init' => $echoResourceTemplate + array(
-               'styles' => array(
-                       'overlay/ext.echo.overlay.less',
-               ),
-               'dependencies' => array(
-                       'ext.echo.overlay',
-               ),
-               'scripts' => array(
-                       'overlay/ext.echo.overlay.init.js',
-               ),
-       ),
-       'ext.echo.special' => $echoResourceTemplate + array(
-               'scripts' => array(
-                       'special/ext.echo.special.js',
-               ),
-               'styles' => 'special/ext.echo.special.less',
-               'dependencies' => array(
-                       'mediawiki.ui.button',
-                       'ext.echo.base',
-               ),
-               'messages' => array(
-                       'echo-load-more-error',
-                       'echo-more-info',
-                       'echo-feedback',
-               ),
-               'position' => 'top',
-       ),
-       'ext.echo.alert' => $echoResourceTemplate + array(
-               'position' => 'top',
-               'styles' => 'alert/ext.echo.alert.less',
-               'skinStyles' => array(
-                       'modern' => 'alert/ext.echo.alert.modern.css',
-                       'monobook' => 'alert/ext.echo.alert.monobook.css',
-               ),
-       ),
-       'ext.echo.badge' => $echoResourceTemplate + array(
-               'position' => 'top',
-               'styles' => 'badge/ext.echo.badge.less',
-               'skinStyles' => array(
-                       'modern' => 'badge/ext.echo.badge.modern.css',
-                       'monobook' => 'badge/ext.echo.badge.monobook.css',
-               ),
-       ),
-);
diff --git a/autoload.php b/autoload.php
deleted file mode 100644
index 5409aa7..0000000
--- a/autoload.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-// This file is generated by scripts/gen-autoload.php, do not adjust manually
-
-global $wgAutoloadClasses;
-
-$wgAutoloadClasses += array(
-       'ApiEchoMarkRead' => __DIR__ . '/api/ApiEchoMarkRead.php',
-       'ApiEchoMarkReadTest' => __DIR__ . 
'/tests/phpunit/api/ApiEchoMarkReadTest.php',
-       'ApiEchoMarkSeen' => __DIR__ . '/api/ApiEchoMarkSeen.php',
-       'ApiEchoNotifications' => __DIR__ . '/api/ApiEchoNotifications.php',
-       'ApiEchoNotificationsTest' => __DIR__ . 
'/tests/phpunit/api/ApiEchoNotificationsTest.php',
-       'BatchRowUpdateTest' => __DIR__ . 
'/tests/phpunit/includes/BatchRowUpdateTest.php',
-       'CallbackFilterIterator' => __DIR__ . 
'/includes/iterator/CallbackFilterIterator.php',
-       'ContainmentSetTest' => __DIR__ . 
'/tests/phpunit/includes/ContainmentSetTest.php',
-       'EchoAbstractEntity' => __DIR__ . '/model/AbstractEntity.php',
-       'EchoAbstractMapper' => __DIR__ . '/includes/mapper/AbstractMapper.php',
-       'EchoAbstractMapperStub' => __DIR__ . 
'/tests/phpunit/includes/mapper/AbstractMapperTest.php',
-       'EchoAbstractMapperTest' => __DIR__ . 
'/tests/phpunit/includes/mapper/AbstractMapperTest.php',
-       'EchoArrayList' => __DIR__ . '/includes/ContainmentSet.php',
-       'EchoAttributeManager' => __DIR__ . '/includes/AttributeManager.php',
-       'EchoAttributeManagerTest' => __DIR__ . 
'/tests/phpunit/includes/AttributeManagerTest.php',
-       'EchoBasicFormatter' => __DIR__ . '/formatters/BasicFormatter.php',
-       'EchoBatchRowIterator' => __DIR__ . '/includes/BatchRowUpdate.php',
-       'EchoBatchRowUpdate' => __DIR__ . '/includes/BatchRowUpdate.php',
-       'EchoBatchRowWriter' => __DIR__ . '/includes/BatchRowUpdate.php',
-       'EchoCachedList' => __DIR__ . '/includes/ContainmentSet.php',
-       'EchoCallbackIterator' => __DIR__ . 
'/includes/iterator/CallbackIterator.php',
-       'EchoCatchableFatalErrorException' => __DIR__ . 
'/includes/exception/CatchableFatalErrorException.php',
-       'EchoCommentFormatter' => __DIR__ . '/formatters/CommentFormatter.php',
-       'EchoContainmentList' => __DIR__ . '/includes/ContainmentSet.php',
-       'EchoContainmentSet' => __DIR__ . '/includes/ContainmentSet.php',
-       'EchoDataOutputFormatter' => __DIR__ . 
'/includes/DataOutputFormatter.php',
-       'EchoDeferredMarkAsReadUpdate' => __DIR__ . 
'/includes/DeferredMarkAsReadUpdate.php',
-       'EchoDiffGroup' => __DIR__ . '/includes/DiffParser.php',
-       'EchoDiffParser' => __DIR__ . '/includes/DiffParser.php',
-       'EchoDiffParserTest' => __DIR__ . 
'/tests/phpunit/includes/DiffParserTest.php',
-       'EchoDiscussionParser' => __DIR__ . '/includes/DiscussionParser.php',
-       'EchoDiscussionParserTest' => __DIR__ . 
'/tests/phpunit/includes/DiscussionParserTest.php',
-       'EchoEditFormatter' => __DIR__ . '/formatters/EditFormatter.php',
-       'EchoEditUserTalkFormatter' => __DIR__ . 
'/formatters/EditUserTalkFormatter.php',
-       'EchoEmailDecorator' => __DIR__ . '/includes/EmailFormatter.php',
-       'EchoEmailDigest' => __DIR__ . '/includes/EmailFormatter.php',
-       'EchoEmailFormatter' => __DIR__ . '/includes/EmailFormatter.php',
-       'EchoEmailFormatterTest' => __DIR__ . 
'/tests/phpunit/includes/EmailFormatterTest.php',
-       'EchoEmailMode' => __DIR__ . '/includes/EmailFormatter.php',
-       'EchoEmailSingle' => __DIR__ . '/includes/EmailFormatter.php',
-       'EchoEvent' => __DIR__ . '/model/Event.php',
-       'EchoEventMapper' => __DIR__ . '/includes/mapper/EventMapper.php',
-       'EchoEventMapperTest' => __DIR__ . 
'/tests/phpunit/includes/mapper/EventMapperTest.php',
-       'EchoExecuteFirstArgumentStub' => __DIR__ . 
'/tests/phpunit/includes/mapper/NotificationMapperTest.php',
-       'EchoFilteredSequentialIterator' => __DIR__ . 
'/includes/iterator/FilteredSequentialIterator.php',
-       'EchoHTMLEmailDecorator' => __DIR__ . '/includes/EmailFormatter.php',
-       'EchoHTMLEmailFormatter' => __DIR__ . '/includes/EmailFormatter.php',
-       'EchoHooks' => __DIR__ . '/Hooks.php',
-       'EchoIteratorDecorator' => __DIR__ . 
'/includes/iterator/IteratorDecorator.php',
-       'EchoLocalCache' => __DIR__ . '/includes/cache/LocalCache.php',
-       'EchoMentionFormatter' => __DIR__ . '/formatters/MentionFormatter.php',
-       'EchoMultipleIterator' => __DIR__ . 
'/includes/iterator/MultipleIterator.php',
-       'EchoNotRecursiveIterator' => __DIR__ . 
'/includes/iterator/NotRecursiveIterator.php',
-       'EchoNotification' => __DIR__ . '/model/Notification.php',
-       'EchoNotificationController' => __DIR__ . 
'/controller/NotificationController.php',
-       'EchoNotificationDeleteJob' => __DIR__ . 
'/jobs/NotificationDeleteJob.php',
-       'EchoNotificationFormatter' => __DIR__ . 
'/formatters/NotificationFormatter.php',
-       'EchoNotificationFormatterTest' => __DIR__ . 
'/tests/phpunit/formatters/NotificationFormatterTest.php',
-       'EchoNotificationJob' => __DIR__ . '/jobs/NotificationJob.php',
-       'EchoNotificationMapper' => __DIR__ . 
'/includes/mapper/NotificationMapper.php',
-       'EchoNotificationMapperTest' => __DIR__ . 
'/tests/phpunit/includes/mapper/NotificationMapperTest.php',
-       'EchoNotificationTest' => __DIR__ . 
'/tests/phpunit/model/NotificationTest.php',
-       'EchoNotifier' => __DIR__ . '/Notifier.php',
-       'EchoOnWikiList' => __DIR__ . '/includes/ContainmentSet.php',
-       'EchoPageLinkFormatter' => __DIR__ . 
'/formatters/PageLinkFormatter.php',
-       'EchoRevisionLocalCache' => __DIR__ . 
'/includes/cache/RevisionLocalCache.php',
-       'EchoRowUpdateGenerator' => __DIR__ . '/includes/BatchRowUpdate.php',
-       'EchoSuppressionRowUpdateGenerator' => __DIR__ . 
'/includes/schemaUpdate.php',
-       'EchoTalkPageFunctionalTest' => __DIR__ . 
'/tests/phpunit/includes/TalkPageFunctionalTest.php',
-       'EchoTargetPage' => __DIR__ . '/model/TargetPage.php',
-       'EchoTargetPageMapper' => __DIR__ . 
'/includes/mapper/TargetPageMapper.php',
-       'EchoTargetPageMapperTest' => __DIR__ . 
'/tests/phpunit/includes/mapper/TargetPageMapperTest.php',
-       'EchoTargetPageTest' => __DIR__ . 
'/tests/phpunit/model/TargetPageTest.php',
-       'EchoTextEmailDecorator' => __DIR__ . '/includes/EmailFormatter.php',
-       'EchoTextEmailFormatter' => __DIR__ . '/includes/EmailFormatter.php',
-       'EchoTitleLocalCache' => __DIR__ . 
'/includes/cache/TitleLocalCache.php',
-       'EchoTitleLocalCacheTest' => __DIR__ . 
'/tests/phpunit/includes/cache/TitleLocalCacheTest.php',
-       'EchoUserLocator' => __DIR__ . '/includes/UserLocator.php',
-       'EchoUserLocatorTest' => __DIR__ . 
'/tests/phpunit/includes/UserLocatorTest.php',
-       'EchoUserNotificationGateway' => __DIR__ . 
'/includes/gateway/UserNotificationGateway.php',
-       'EchoUserNotificationGatewayTest' => __DIR__ . 
'/tests/phpunit/includes/gateway/UserNotificationGatewayTest.php',
-       'EchoUserRightsFormatter' => __DIR__ . 
'/formatters/UserRightsFormatter.php',
-       'FilteredSequentialIteratorTest' => __DIR__ . 
'/tests/phpunit/includes/iterator/FilteredSequentialIteratorTest.php',
-       'MWDbEchoEmailBatch' => __DIR__ . '/includes/DbEmailBatch.php',
-       'MWDbEchoEmailBundler' => __DIR__ . '/includes/DbEmailBundler.php',
-       'MWEchoDbFactory' => __DIR__ . '/includes/EchoDbFactory.php',
-       'MWEchoDbFactoryTest' => __DIR__ . 
'/tests/phpunit/includes/EchoDbFactoryTest.php',
-       'MWEchoEmailBatch' => __DIR__ . '/includes/EmailBatch.php',
-       'MWEchoEmailBundler' => __DIR__ . '/includes/EmailBundler.php',
-       'MWEchoEventLogging' => __DIR__ . '/includes/EventLogging.php',
-       'MWEchoNotifUser' => __DIR__ . '/includes/NotifUser.php',
-       'MWEchoNotifUserTest' => __DIR__ . 
'/tests/phpunit/includes/NotifUserTest.php',
-       'MWEchoNotificationEmailBundleJob' => __DIR__ . 
'/jobs/NotificationEmailBundleJob.php',
-       'NotificationControllerTest' => __DIR__ . 
'/tests/phpunit/controller/NotificationControllerTest.php',
-       'SpecialNotifications' => __DIR__ . '/special/SpecialNotifications.php',
-       'SuppressionMaintenanceTest' => __DIR__ . 
'/tests/phpunit/maintenance/SupressionMaintenanceTest.php',
-);
diff --git a/extension.json b/extension.json
new file mode 100644
index 0000000..0c33ec1
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,721 @@
+{
+       "name": "Echo",
+       "author": [
+               "Andrew Garrett",
+               "Ryan Kaldari",
+               "Benny Situ",
+               "Luke Welling"
+       ],
+       "url": "https://www.mediawiki.org/wiki/Extension:Echo";,
+       "descriptionmsg": "echo-desc",
+       "license-name": "MIT",
+       "type": "specialpage",
+       "callback": "EchoHooks::registerExtension",
+       "DefaultUserOptions": {
+               "echo-notify-show-link": true,
+               "echo-show-alert": true,
+               "echo-email-frequency": 0,
+               "echo-email-format": "plain-text",
+               "echo-subscriptions-email-system": true,
+               "echo-subscriptions-web-system": true,
+               "echo-subscriptions-email-user-rights": true,
+               "echo-subscriptions-web-user-rights": true,
+               "echo-subscriptions-email-other": false,
+               "echo-subscriptions-web-other": true,
+               "echo-subscriptions-email-edit-user-talk": false,
+               "echo-subscriptions-web-edit-user-talk": true,
+               "echo-subscriptions-email-reverted": false,
+               "echo-subscriptions-web-reverted": true,
+               "echo-subscriptions-email-article-linked": false,
+               "echo-subscriptions-web-article-linked": false,
+               "echo-subscriptions-email-mention": false,
+               "echo-subscriptions-web-mention": true
+       },
+       "ExtensionFunctions": [
+               "EchoHooks::initEchoExtension"
+       ],
+       "SpecialPages": {
+               "Notifications": "SpecialNotifications"
+       },
+       "SpecialPageGroups": {
+               "Notifications": "users"
+       },
+       "JobClasses": {
+               "EchoNotificationJob": "EchoNotificationJob",
+               "MWEchoNotificationEmailBundleJob": 
"MWEchoNotificationEmailBundleJob",
+               "EchoNotificationDeleteJob": "EchoNotificationDeleteJob"
+       },
+       "APIModules": {
+               "echomarkread": "ApiEchoMarkRead",
+               "echomarkseen": "ApiEchoMarkSeen"
+       },
+       "APIMetaModules": {
+               "notifications": "ApiEchoNotifications"
+       },
+       "MessagesDirs": {
+               "Echo": [
+                       "i18n"
+               ]
+       },
+       "ExtensionMessagesFiles": {
+               "EchoAliases": "Echo.alias.php"
+       },
+       "AutoloadClasses": {
+               "ApiEchoMarkRead": "api/ApiEchoMarkRead.php",
+               "ApiEchoMarkReadTest": 
"tests/phpunit/api/ApiEchoMarkReadTest.php",
+               "ApiEchoMarkSeen": "api/ApiEchoMarkSeen.php",
+               "ApiEchoNotifications": "api/ApiEchoNotifications.php",
+               "ApiEchoNotificationsTest": 
"tests/phpunit/api/ApiEchoNotificationsTest.php",
+               "BatchRowUpdateTest": 
"tests/phpunit/includes/BatchRowUpdateTest.php",
+               "CallbackFilterIterator": 
"includes/iterator/CallbackFilterIterator.php",
+               "ContainmentSetTest": 
"tests/phpunit/includes/ContainmentSetTest.php",
+               "EchoAbstractEntity": "model/AbstractEntity.php",
+               "EchoAbstractMapper": "includes/mapper/AbstractMapper.php",
+               "EchoAbstractMapperStub": 
"tests/phpunit/includes/mapper/AbstractMapperTest.php",
+               "EchoAbstractMapperTest": 
"tests/phpunit/includes/mapper/AbstractMapperTest.php",
+               "EchoArrayList": "includes/ContainmentSet.php",
+               "EchoAttributeManager": "includes/AttributeManager.php",
+               "EchoAttributeManagerTest": 
"tests/phpunit/includes/AttributeManagerTest.php",
+               "EchoBasicFormatter": "formatters/BasicFormatter.php",
+               "EchoBatchRowIterator": "includes/BatchRowUpdate.php",
+               "EchoBatchRowUpdate": "includes/BatchRowUpdate.php",
+               "EchoBatchRowWriter": "includes/BatchRowUpdate.php",
+               "EchoCachedList": "includes/ContainmentSet.php",
+               "EchoCallbackIterator": 
"includes/iterator/CallbackIterator.php",
+               "EchoCatchableFatalErrorException": 
"includes/exception/CatchableFatalErrorException.php",
+               "EchoCommentFormatter": "formatters/CommentFormatter.php",
+               "EchoContainmentList": "includes/ContainmentSet.php",
+               "EchoContainmentSet": "includes/ContainmentSet.php",
+               "EchoDataOutputFormatter": "includes/DataOutputFormatter.php",
+               "EchoDeferredMarkAsReadUpdate": 
"includes/DeferredMarkAsReadUpdate.php",
+               "EchoDiffGroup": "includes/DiffParser.php",
+               "EchoDiffParser": "includes/DiffParser.php",
+               "EchoDiffParserTest": 
"tests/phpunit/includes/DiffParserTest.php",
+               "EchoDiscussionParser": "includes/DiscussionParser.php",
+               "EchoDiscussionParserTest": 
"tests/phpunit/includes/DiscussionParserTest.php",
+               "EchoEditFormatter": "formatters/EditFormatter.php",
+               "EchoEditUserTalkFormatter": 
"formatters/EditUserTalkFormatter.php",
+               "EchoEmailDecorator": "includes/EmailFormatter.php",
+               "EchoEmailDigest": "includes/EmailFormatter.php",
+               "EchoEmailFormatter": "includes/EmailFormatter.php",
+               "EchoEmailFormatterTest": 
"tests/phpunit/includes/EmailFormatterTest.php",
+               "EchoEmailMode": "includes/EmailFormatter.php",
+               "EchoEmailSingle": "includes/EmailFormatter.php",
+               "EchoEvent": "model/Event.php",
+               "EchoEventMapper": "includes/mapper/EventMapper.php",
+               "EchoEventMapperTest": 
"tests/phpunit/includes/mapper/EventMapperTest.php",
+               "EchoExecuteFirstArgumentStub": 
"tests/phpunit/includes/mapper/NotificationMapperTest.php",
+               "EchoFilteredSequentialIterator": 
"includes/iterator/FilteredSequentialIterator.php",
+               "EchoHTMLEmailDecorator": "includes/EmailFormatter.php",
+               "EchoHTMLEmailFormatter": "includes/EmailFormatter.php",
+               "EchoHooks": "Hooks.php",
+               "EchoIteratorDecorator": 
"includes/iterator/IteratorDecorator.php",
+               "EchoLocalCache": "includes/cache/LocalCache.php",
+               "EchoMentionFormatter": "formatters/MentionFormatter.php",
+               "EchoMultipleIterator": 
"includes/iterator/MultipleIterator.php",
+               "EchoNotRecursiveIterator": 
"includes/iterator/NotRecursiveIterator.php",
+               "EchoNotification": "model/Notification.php",
+               "EchoNotificationController": 
"controller/NotificationController.php",
+               "EchoNotificationDeleteJob": "jobs/NotificationDeleteJob.php",
+               "EchoNotificationFormatter": 
"formatters/NotificationFormatter.php",
+               "EchoNotificationFormatterTest": 
"tests/phpunit/formatters/NotificationFormatterTest.php",
+               "EchoNotificationJob": "jobs/NotificationJob.php",
+               "EchoNotificationMapper": 
"includes/mapper/NotificationMapper.php",
+               "EchoNotificationMapperTest": 
"tests/phpunit/includes/mapper/NotificationMapperTest.php",
+               "EchoNotificationTest": 
"tests/phpunit/model/NotificationTest.php",
+               "EchoNotifier": "Notifier.php",
+               "EchoOnWikiList": "includes/ContainmentSet.php",
+               "EchoPageLinkFormatter": "formatters/PageLinkFormatter.php",
+               "EchoRevisionLocalCache": 
"includes/cache/RevisionLocalCache.php",
+               "EchoRowUpdateGenerator": "includes/BatchRowUpdate.php",
+               "EchoSuppressionRowUpdateGenerator": 
"includes/schemaUpdate.php",
+               "EchoTalkPageFunctionalTest": 
"tests/phpunit/includes/TalkPageFunctionalTest.php",
+               "EchoTargetPage": "model/TargetPage.php",
+               "EchoTargetPageMapper": "includes/mapper/TargetPageMapper.php",
+               "EchoTargetPageMapperTest": 
"tests/phpunit/includes/mapper/TargetPageMapperTest.php",
+               "EchoTargetPageTest": "tests/phpunit/model/TargetPageTest.php",
+               "EchoTextEmailDecorator": "includes/EmailFormatter.php",
+               "EchoTextEmailFormatter": "includes/EmailFormatter.php",
+               "EchoTitleLocalCache": "includes/cache/TitleLocalCache.php",
+               "EchoTitleLocalCacheTest": 
"tests/phpunit/includes/cache/TitleLocalCacheTest.php",
+               "EchoUserLocator": "includes/UserLocator.php",
+               "EchoUserLocatorTest": 
"tests/phpunit/includes/UserLocatorTest.php",
+               "EchoUserNotificationGateway": 
"includes/gateway/UserNotificationGateway.php",
+               "EchoUserNotificationGatewayTest": 
"tests/phpunit/includes/gateway/UserNotificationGatewayTest.php",
+               "EchoUserRightsFormatter": "formatters/UserRightsFormatter.php",
+               "FilteredSequentialIteratorTest": 
"tests/phpunit/includes/iterator/FilteredSequentialIteratorTest.php",
+               "MWDbEchoEmailBatch": "includes/DbEmailBatch.php",
+               "MWDbEchoEmailBundler": "includes/DbEmailBundler.php",
+               "MWEchoDbFactory": "includes/EchoDbFactory.php",
+               "MWEchoDbFactoryTest": 
"tests/phpunit/includes/EchoDbFactoryTest.php",
+               "MWEchoEmailBatch": "includes/EmailBatch.php",
+               "MWEchoEmailBundler": "includes/EmailBundler.php",
+               "MWEchoEventLogging": "includes/EventLogging.php",
+               "MWEchoNotifUser": "includes/NotifUser.php",
+               "MWEchoNotifUserTest": 
"tests/phpunit/includes/NotifUserTest.php",
+               "MWEchoNotificationEmailBundleJob": 
"jobs/NotificationEmailBundleJob.php",
+               "NotificationControllerTest": 
"tests/phpunit/controller/NotificationControllerTest.php",
+               "SpecialNotifications": "special/SpecialNotifications.php",
+               "SuppressionMaintenanceTest": 
"tests/phpunit/maintenance/SupressionMaintenanceTest.php"
+       },
+       "ResourceModules": {
+               "ext.echo.base": {
+                       "targets": [
+                               "desktop",
+                               "mobile"
+                       ],
+                       "position": "top",
+                       "styles": "base/ext.echo.base.less",
+                       "scripts": [
+                               "base/ext.echo.base.js"
+                       ],
+                       "messages": [
+                               "echo-error-preference",
+                               "echo-error-token"
+                       ]
+               },
+               "ext.echo.overlay": {
+                       "targets": [
+                               "desktop",
+                               "mobile"
+                       ],
+                       "scripts": [
+                               "overlay/ext.echo.overlay.js"
+                       ],
+                       "skinStyles": {
+                               "modern": "overlay/ext.echo.overlay.modern.css",
+                               "monobook": 
"overlay/ext.echo.overlay.monobook.css"
+                       },
+                       "dependencies": [
+                               "mediawiki.util",
+                               "mediawiki.language",
+                               "mediawiki.ui.anchor",
+                               "ext.echo.base",
+                               "mediawiki.api",
+                               "mediawiki.jqueryMsg"
+                       ],
+                       "messages": [
+                               "echo-overlay-link",
+                               "echo-mark-all-as-read",
+                               "echo-more-info",
+                               "echo-feedback",
+                               "echo-notification-alert",
+                               "echo-notification-message",
+                               "echo-notification-alert-text-only",
+                               "echo-notification-message-text-only",
+                               "echo-email-batch-bullet"
+                       ]
+               },
+               "ext.echo.overlay.init": {
+                       "styles": [
+                               "overlay/ext.echo.overlay.less"
+                       ],
+                       "dependencies": [
+                               "ext.echo.overlay"
+                       ],
+                       "scripts": [
+                               "overlay/ext.echo.overlay.init.js"
+                       ]
+               },
+               "ext.echo.special": {
+                       "scripts": [
+                               "special/ext.echo.special.js"
+                       ],
+                       "styles": "special/ext.echo.special.less",
+                       "dependencies": [
+                               "mediawiki.ui.button",
+                               "ext.echo.base"
+                       ],
+                       "messages": [
+                               "echo-load-more-error",
+                               "echo-more-info",
+                               "echo-feedback"
+                       ],
+                       "position": "top"
+               },
+               "ext.echo.alert": {
+                       "position": "top",
+                       "styles": "alert/ext.echo.alert.less",
+                       "skinStyles": {
+                               "modern": "alert/ext.echo.alert.modern.css",
+                               "monobook": "alert/ext.echo.alert.monobook.css"
+                       }
+               },
+               "ext.echo.badge": {
+                       "position": "top",
+                       "styles": "badge/ext.echo.badge.less",
+                       "skinStyles": {
+                               "modern": "badge/ext.echo.badge.modern.css",
+                               "monobook": "badge/ext.echo.badge.monobook.css"
+                       }
+               }
+       },
+       "ResourceFileModulePaths": {
+               "localBasePath": "modules",
+               "remoteExtPath": "Echo/modules"
+       },
+       "Hooks": {
+               "LoadExtensionSchemaUpdates": [
+                       "EchoHooks::getSchemaUpdates"
+               ],
+               "GetPreferences": [
+                       "EchoHooks::getPreferences"
+               ],
+               "PersonalUrls": [
+                       "EchoHooks::onPersonalUrls"
+               ],
+               "BeforePageDisplay": [
+                       "EchoHooks::beforePageDisplay"
+               ],
+               "MakeGlobalVariablesScript": [
+                       "EchoHooks::makeGlobalVariablesScript"
+               ],
+               "UnitTestsList": [
+                       "EchoHooks::getUnitTests"
+               ],
+               "ResourceLoaderRegisterModules": [
+                       "EchoHooks::onResourceLoaderRegisterModules"
+               ],
+               "ResourceLoaderTestModules": [
+                       "EchoHooks::onResourceLoaderTestModules"
+               ],
+               "UserRights": [
+                       "EchoHooks::onUserRights"
+               ],
+               "UserLoadOptions": [
+                       "EchoHooks::onUserLoadOptions"
+               ],
+               "UserSaveOptions": [
+                       "EchoHooks::onUserSaveOptions"
+               ],
+               "UserClearNewTalkNotification": [
+                       "EchoHooks::onUserClearNewTalkNotification"
+               ],
+               "ParserTestTables": [
+                       "EchoHooks::onParserTestTables"
+               ],
+               "UserMergeAccountFields": [
+                       "EchoHooks::onUserMergeAccountFields"
+               ],
+               "MergeAccountFromTo": [
+                       "EchoHooks::onMergeAccountFromTo"
+               ],
+               "UserMergeAccountDeleteTables": [
+                       "EchoHooks::onUserMergeAccountDeleteTables"
+               ],
+               "EchoGetNotificationTypes": [
+                       "EchoHooks::getNotificationTypes"
+               ],
+               "EchoGetBundleRules": [
+                       "EchoHooks::onEchoGetBundleRules"
+               ],
+               "EchoAbortEmailNotification": [
+                       "EchoHooks::onEchoAbortEmailNotification"
+               ],
+               "EchoCreateNotificationComplete": [
+                       "EchoHooks::onEchoCreateNotificationComplete"
+               ],
+               "ArticleSaveComplete": [
+                       "EchoHooks::onArticleSaved"
+               ],
+               "AddNewAccount": [
+                       "EchoHooks::onAccountCreated"
+               ],
+               "ArticleRollbackComplete": [
+                       "EchoHooks::onRollbackComplete"
+               ],
+               "UserSaveSettings": [
+                       "EchoHooks::onUserSaveSettings"
+               ],
+               "AbortTalkPageEmailNotification": [
+                       "EchoHooks::onAbortTalkPageEmailNotification"
+               ],
+               "SendWatchlistEmailNotification": [
+                       "EchoHooks::onSendWatchlistEmailNotification"
+               ],
+               "GetNewMessagesAlert": [
+                       "EchoHooks::abortNewMessagesAlert"
+               ],
+               "LinksUpdateAfterInsert": [
+                       "EchoHooks::onLinksUpdateAfterInsert"
+               ]
+       },
+       "config": {
+               "EchoBackendName": "Db",
+               "EchoEnableEmailBatch": true,
+               "EchoHelpPage": 
"//www.mediawiki.org/wiki/Special:MyLanguage/Help:Notifications",
+               "EchoUseJobQueue": false,
+               "EchoEmailFooterAddress": "",
+               "NotificationSenderName": null,
+               "NotificationReplyName": "No Reply",
+               "EchoCluster": false,
+               "EchoMaxNotificationCount": 99,
+               "EchoMaxUpdateCount": 2000,
+               "EchoBundleEmailInterval": 0,
+               "EchoNewMsgAlert": true,
+               "EchoDefaultNotificationTypes": {
+                       "all": {
+                               "web": true,
+                               "email": true
+                       },
+                       "welcome": {
+                               "email": false
+                       }
+               },
+               "EchoNotifiers": {
+                       "web": [
+                               "EchoNotifier",
+                               "notifyWithNotification"
+                       ],
+                       "email": [
+                               "EchoNotifier",
+                               "notifyWithEmail"
+                       ]
+               },
+               "EchoOnWikiBlacklist": "Echo-blacklist",
+               "EchoPerUserWhitelistFormat": "%s/Echo-whitelist",
+               "EchoNotificationCategories": {
+                       "system": {
+                               "priority": 9,
+                               "no-dismiss": [
+                                       "all"
+                               ]
+                       },
+                       "user-rights": {
+                               "priority": 9,
+                               "tooltip": "echo-pref-tooltip-user-rights"
+                       },
+                       "other": {
+                               "no-dismiss": [
+                                       "all"
+                               ]
+                       },
+                       "edit-user-talk": {
+                               "priority": 1,
+                               "no-dismiss": [
+                                       "web"
+                               ],
+                               "tooltip": "echo-pref-tooltip-edit-user-talk"
+                       },
+                       "reverted": {
+                               "priority": 9,
+                               "tooltip": "echo-pref-tooltip-reverted"
+                       },
+                       "article-linked": {
+                               "priority": 5,
+                               "tooltip": "echo-pref-tooltip-article-linked"
+                       },
+                       "mention": {
+                               "priority": 4,
+                               "tooltip": "echo-pref-tooltip-mention"
+                       }
+               },
+               "EchoNotificationIcons": {
+                       "placeholder": {
+                               "path": "Echo/modules/icons/Generic.png"
+                       },
+                       "trash": {
+                               "path": "Echo/modules/icons/Deletion.png"
+                       },
+                       "chat": {
+                               "path": "Echo/modules/icons/Talk.png"
+                       },
+                       "linked": {
+                               "path": "Echo/modules/icons/CrossReferenced.png"
+                       },
+                       "featured": {
+                               "path": "Echo/modules/icons/Featured.png"
+                       },
+                       "reviewed": {
+                               "path": "Echo/modules/icons/Reviewed.png"
+                       },
+                       "tagged": {
+                               "path": 
"Echo/modules/icons/ReviewedWithTags.png"
+                       },
+                       "revert": {
+                               "path": "Echo/modules/icons/Revert.png"
+                       },
+                       "checkmark": {
+                               "path": "Echo/modules/icons/Reviewed.png"
+                       },
+                       "gratitude": {
+                               "path": "Echo/modules/icons/Gratitude.png"
+                       },
+                       "site": {
+                               "url": false
+                       }
+               },
+               "EchoNotifications": {
+                       "welcome": {
+                               "user-locators": [
+                                       "EchoUserLocator::locateEventAgent"
+                               ],
+                               "category": "system",
+                               "group": "positive",
+                               "section": "alert",
+                               "title-message": "notification-new-user",
+                               "title-params": [
+                                       "agent"
+                               ],
+                               "icon": "site"
+                       },
+                       "edit-user-talk": {
+                               "user-locators": [
+                                       "EchoUserLocator::locateTalkPageOwner"
+                               ],
+                               "primary-link": {
+                                       "message": 
"notification-link-text-view-message",
+                                       "destination": "section"
+                               },
+                               "secondary-link": {
+                                       "message": 
"notification-link-text-view-changes",
+                                       "destination": "diff"
+                               },
+                               "category": "edit-user-talk",
+                               "group": "interactive",
+                               "section": "alert",
+                               "bundle": {
+                                       "web": true,
+                                       "email": false
+                               },
+                               "formatter-class": "EchoEditUserTalkFormatter",
+                               "title-message": "notification-edit-talk-page2",
+                               "title-params": [
+                                       "agent",
+                                       "user",
+                                       "subject-anchor"
+                               ],
+                               "bundle-message": 
"notification-edit-talk-page-bundle",
+                               "bundle-params": [
+                                       "agent",
+                                       "user",
+                                       "agent-other-display",
+                                       "agent-other-count"
+                               ],
+                               "flyout-message": 
"notification-edit-talk-page-flyout2",
+                               "flyout-params": [
+                                       "agent",
+                                       "user",
+                                       "subject-anchor"
+                               ],
+                               "email-subject-message": 
"notification-edit-talk-page-email-subject2",
+                               "email-subject-params": [
+                                       "agent"
+                               ],
+                               "email-body-batch-message": 
"notification-edit-talk-page-email-batch-body2",
+                               "email-body-batch-params": [
+                                       "agent"
+                               ],
+                               "email-body-batch-bundle-message": 
"notification-edit-user-talk-email-batch-bundle-body",
+                               "email-body-batch-bundle-params": [
+                                       "agent",
+                                       "agent-other-display",
+                                       "agent-other-count"
+                               ],
+                               "icon": "chat"
+                       },
+                       "reverted": {
+                               "user-locators": [
+                                       [
+                                               
"EchoUserLocator::locateFromEventExtra",
+                                               [
+                                                       "reverted-user-id"
+                                               ]
+                                       ]
+                               ],
+                               "primary-link": {
+                                       "message": 
"notification-link-text-view-edit",
+                                       "destination": "diff"
+                               },
+                               "category": "reverted",
+                               "group": "negative",
+                               "section": "alert",
+                               "formatter-class": "EchoEditFormatter",
+                               "title-message": "notification-reverted2",
+                               "title-params": [
+                                       "agent",
+                                       "title",
+                                       "difflink",
+                                       "number"
+                               ],
+                               "flyout-message": 
"notification-reverted-flyout2",
+                               "flyout-params": [
+                                       "agent",
+                                       "title",
+                                       "difflink",
+                                       "number"
+                               ],
+                               "email-subject-message": 
"notification-reverted-email-subject2",
+                               "email-subject-params": [
+                                       "agent",
+                                       "title",
+                                       "number"
+                               ],
+                               "email-body-batch-message": 
"notification-reverted-email-batch-body2",
+                               "email-body-batch-params": [
+                                       "agent",
+                                       "title",
+                                       "number"
+                               ],
+                               "icon": "revert"
+                       },
+                       "page-linked": {
+                               "user-locators": [
+                                       "EchoUserLocator::locateArticleCreator"
+                               ],
+                               "primary-link": {
+                                       "message": 
"notification-link-text-view-page",
+                                       "destination": "link-from-page"
+                               },
+                               "category": "article-linked",
+                               "group": "neutral",
+                               "section": "alert",
+                               "bundle": {
+                                       "web": true,
+                                       "email": true
+                               },
+                               "formatter-class": "EchoPageLinkFormatter",
+                               "title-message": "notification-page-linked",
+                               "title-params": [
+                                       "agent",
+                                       "title",
+                                       "link-from-page"
+                               ],
+                               "bundle-message": 
"notification-page-linked-bundle",
+                               "bundle-params": [
+                                       "agent",
+                                       "title",
+                                       "link-from-page",
+                                       "link-from-page-other-display",
+                                       "link-from-page-other-count"
+                               ],
+                               "flyout-message": 
"notification-page-linked-flyout",
+                               "flyout-params": [
+                                       "agent",
+                                       "title",
+                                       "link-from-page"
+                               ],
+                               "email-subject-message": 
"notification-page-linked-email-subject",
+                               "email-subject-params": [],
+                               "email-body-batch-message": 
"notification-page-linked-email-batch-body",
+                               "email-body-batch-params": [
+                                       "agent",
+                                       "title",
+                                       "link-from-page"
+                               ],
+                               "email-body-batch-bundle-message": 
"notification-page-linked-email-batch-bundle-body",
+                               "email-body-batch-bundle-params": [
+                                       "agent",
+                                       "title",
+                                       "link-from-page",
+                                       "link-from-page-other-display",
+                                       "link-from-page-other-count"
+                               ],
+                               "icon": "linked"
+                       },
+                       "mention": {
+                               "user-locators": [
+                                       [
+                                               
"EchoUserLocator::locateFromEventExtra",
+                                               [
+                                                       "mentioned-users"
+                                               ]
+                                       ]
+                               ],
+                               "primary-link": {
+                                       "message": 
"notification-link-text-view-mention",
+                                       "destination": "section"
+                               },
+                               "secondary-link": {
+                                       "message": 
"notification-link-text-view-changes",
+                                       "destination": "diff"
+                               },
+                               "category": "mention",
+                               "group": "interactive",
+                               "section": "alert",
+                               "formatter-class": "EchoMentionFormatter",
+                               "title-message": "notification-mention",
+                               "title-params": [
+                                       "agent",
+                                       "subject-anchor",
+                                       "title",
+                                       "section-title",
+                                       "main-title-text"
+                               ],
+                               "flyout-message": "notification-mention-flyout",
+                               "flyout-params": [
+                                       "agent",
+                                       "subject-anchor",
+                                       "title",
+                                       "section-title",
+                                       "main-title-text"
+                               ],
+                               "email-subject-message": 
"notification-mention-email-subject",
+                               "email-subject-params": [
+                                       "agent"
+                               ],
+                               "email-body-batch-message": 
"notification-mention-email-batch-body",
+                               "email-body-batch-params": [
+                                       "agent",
+                                       "title",
+                                       "section-title",
+                                       "main-title-text"
+                               ],
+                               "icon": "chat"
+                       },
+                       "user-rights": {
+                               "user-locators": [
+                                       [
+                                               
"EchoUserLocator::locateFromEventExtra",
+                                               [
+                                                       "user"
+                                               ]
+                                       ]
+                               ],
+                               "primary-link": {
+                                       "message": "echo-learn-more",
+                                       "destination": "user-rights-list"
+                               },
+                               "category": "user-rights",
+                               "group": "neutral",
+                               "section": "alert",
+                               "formatter-class": "EchoUserRightsFormatter",
+                               "title-message": "notification-user-rights",
+                               "title-params": [
+                                       "agent",
+                                       "user-rights-list"
+                               ],
+                               "flyout-message": 
"notification-user-rights-flyout",
+                               "flyout-params": [
+                                       "agent",
+                                       "user-rights-list"
+                               ],
+                               "email-subject-message": 
"notification-user-rights-email-subject",
+                               "email-subject-params": [],
+                               "email-body-batch-message": 
"notification-user-rights-email-batch-body",
+                               "email-body-batch-params": [
+                                       "agent",
+                                       "user-rights-list"
+                               ],
+                               "icon": "site"
+                       }
+               },
+               "EchoConfig": {
+                       "version": "1.5",
+                       "eventlogging": {
+                               "Echo": {
+                                       "enabled": false,
+                                       "revision": 7572295
+                               },
+                               "EchoMail": {
+                                       "enabled": false,
+                                       "revision": 5467650
+                               },
+                               "EchoInteraction": {
+                                       "enabled": false,
+                                       "revision": 5782287
+                               }
+                       }
+               }
+       }
+}
diff --git a/i18n/ro.json b/i18n/ro.json
index 0eac238..1a3fd11 100644
--- a/i18n/ro.json
+++ b/i18n/ro.json
@@ -4,7 +4,8 @@
                        "Firilacroco",
                        "Minisarm",
                        "Reception123",
-                       "Stelistcristi"
+                       "Stelistcristi",
+                       "ImGelu"
                ]
        },
        "echo-desc": "Sistem de notificări",
@@ -46,7 +47,7 @@
        "echo-error-preference": "Eroare: Nu s-au putut stabili preferințele 
utilizatorului.",
        "echo-error-token": "Eroare: Nu s-a putut prelua jetonul 
utilizatorului.",
        "notifications": "Notificări",
-       "tooltip-pt-notifications": "Notificările dumneavoastră",
+       "tooltip-pt-notifications": "Notificările tale",
        "echo-specialpage": "Notificări",
        "echo-anon": "Pentru a primi notificări, [$1 creați-vă un cont] sau [$2 
autentificați-vă].",
        "echo-none": "Nu aveți nicio notificare.",

-- 
To view, visit https://gerrit.wikimedia.org/r/211298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I945e0b60ff4de88a9ac2144a0af54bd22d291cc6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to