Page MenuHomePhabricator
Paste P5617

error on git review
ActivePublic

Authored by Eee888 on Jun 22 2017, 10:19 AM.
$ git show
commit 3e77669c61e14d042dfa74c76afc53f18fd6ee0e
Author: Translation updater bot <l10n-bot@translatewiki.net>
Date: Mon Jun 19 22:47:29 2017 +0200
new notification type was added and works
Change-Id: Ic0a2ca07b0cd1597e5534bb1f3b748beb215ddfc
diff --git a/extension.json b/extension.json
index eb801bb0..bcf6e597 100644
--- a/extension.json
+++ b/extension.json
@@ -1012,6 +1012,10 @@
}
},
"merge_strategy": "array_plus_2d"
+ },
+ "AllowArticleReminderNotification": {
+ "value": false,
+ "description": "This is a feature flag to the Article Reminder notification"
}
},
"manifest_version": 2
diff --git a/i18n/api/pt.json b/i18n/api/pt.json
index 6356c5bf..f1915876 100644
--- a/i18n/api/pt.json
+++ b/i18n/api/pt.json
@@ -47,7 +47,7 @@
"apihelp-query+unreadnotificationpages-description": "Obter as páginas que contêm notificações não lidas para o utilizador atual.",
"apihelp-query+unreadnotificationpages-summary": "Obter as páginas que contêm notificações não lidas para o utilizador atual.",
"apihelp-query+unreadnotificationpages-param-grouppages": "Agrupar as páginas de discussão com a respetiva página de conteúdo, e agrupar as notificações não associadas a uma página com a página do utilizador atual.",
- "apihelp-query+unreadnotificationpages-param-limit": "O número máximo de páginas a devolver.",
+ "apihelp-query+unreadnotificationpages-param-limit": "O número máximo de páginas a serem devolvidas.",
"apihelp-query+unreadnotificationpages-param-wikis": "Lista de wikis onde obter páginas com notificações não lidas (por padrão, só a wiki atual).",
"apihelp-query+unreadnotificationpages-example-1": "Listar páginas com notificações não lidas e respetiva quantidade",
"apiwarn-echo-deprecation-timestampformat": "O formato de saída para data e hora do MediaWiki foi descontinuado. De futuro será sempre usado como formato de saída de data e hora o ISO 8601. Ajuste o seu cliente e defina o <var>timestampFormat</var> como <kbd>ISO_8601</kbd>.",
diff --git a/i18n/en.json b/i18n/en.json
index fe1f10b3..8ad5e9bf 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -146,8 +146,8 @@
"notification-header-page-linked": "A link was made from <strong>$4</strong> to <strong>$3</strong>.",
"notification-compact-header-page-linked": "Linked from <strong>$1</strong>.",
"notification-bundle-header-page-linked": "Links were made from {{PLURAL:$5||$5 pages|100=99+ pages}} to <strong>$3</strong>.",
- "notification-header-article-reminder-bundle": "Bundled message for article-reminder notification. Parameters:\n* $1 - the formatted article title of the article the user requested. \n* {{msg-mw|Notification-article-reminder-email-subject}}\n{{Related|Notification-bundle}}",
- "notification-header-article-reminder": "Message for article-reminder notification. Parameters:\n* $1 - the formatted article title of the article the user requested. \n* {{msg-mw|Notification-article-reminder-email-subject}}\n{{Related|Notification-bundle}}",
+ "notification-header-article-reminder-bundle": "Bundled message for article-reminder notification.",
+ "notification-header-article-reminder": "Message for article-reminder notification",
"notification-link-text-what-links-here": "All links to this page",
"notification-body-mention": "$1",
"notification-header-mention-other": "$1 {{GENDER:$2|mentioned}} {{GENDER:$3|you}} on <strong>$4</strong> in \"<strong>$5</strong>\".",
@@ -185,6 +185,7 @@
"notification-header-thank-you-1000000-edit": "{{GENDER:$2|You}} just made {{GENDER:$2|your}} millionth edit; thank {{GENDER:$2|you}} for an astonishing contribution!",
"notification-link-thank-you-edit": "{{GENDER:$1|Your}} edit",
"notification-link-text-view-edit": "View edit",
+ "notification-link-article-reminder": "View Article",
"notification-header-reverted": "Your {{PLURAL:$4|edit on <strong>$3</strong> was|edits on <strong>$3</strong> were}} {{GENDER:$2|reverted}}.",
"notification-body-reverted": "$1",
"notification-header-emailuser": "$1 {{GENDER:$2|sent}} you an email.",
diff --git a/includes/formatters/ArticleReminderPresentationModel.php b/includes/formatters/ArticleReminderPresentationModel.php
index e69642fa..3bd16d98 100644
--- a/includes/formatters/ArticleReminderPresentationModel.php
+++ b/includes/formatters/ArticleReminderPresentationModel.php
@@ -4,7 +4,7 @@
*
* @author Ela Opper
*
- * @license GNU GPL v2+
+ * @license MIT
*/
:
FoxyBrown@FoxyBrown MINGW64 /vagrant/mediawiki/extensions/Echo (T2582_newNotificationType)
$ git review
You are about to submit multiple commits. This is expected if you are
submitting a commit that is dependent on one or more in-review
commits. Otherwise you should consider squashing your changes into one
commit before submitting.
The outstanding commits are:
3e77669c (HEAD -> T2582_newNotificationType) new notification type was added and works
c6a1315f new notification type was added and works
Do you really want to submit the above commits?
Type 'yes' to confirm, other to cancel: hyes
Aborting.
FoxyBrown@FoxyBrown MINGW64 /vagrant/mediawiki/extensions/Echo (T2582_newNotificationType)
$ git review
You are about to submit multiple commits. This is expected if you are
submitting a commit that is dependent on one or more in-review
commits. Otherwise you should consider squashing your changes into one
commit before submitting.
The outstanding commits are:
3e77669c (HEAD -> T2582_newNotificationType) new notification type was added and works
c6a1315f new notification type was added and works
Do you really want to submit the above commits?
Type 'yes' to confirm, other to cancel: yes
remote: Processing changes: refs: 1, done
remote: ERROR: [c6a1315] missing Change-Id in commit message footer
remote:
remote: Hint: A potential Change-IdChange-Id was found, but it was not in the footer (last paragraph) of the commit message.
remote:
remote: Hint: To automatically insert Change-Id, install the hook:
remote: gitdir=$(git rev-parse --git-dir); scp -p -P 29418 eee888@gerrit.wikimedia.org:hooks/commit-msg ${gitdir}/hooks/
remote: And then amend the commit:
remote: git commit --amend
remote:
To ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo.git
! [remote rejected] HEAD -> refs/publish/master/T2582_newNotificationType ([c6a1315] missing Change-Id in commit message footer)
error: failed to push some refs to 'ssh://eee888@gerrit.wikimedia.org:29418/mediawiki/extensions/Echo.git'

Event Timeline

Eee888 created this paste.Jun 22 2017, 10:19 AM