jenkins-bot has submitted this change and it was merged.

Change subject: New Wikidata Build - 2016-10-18T10:00:01+0000
......................................................................


New Wikidata Build - 2016-10-18T10:00:01+0000

Change-Id: I9c3c42066c16194919504221ea8a935ca5c3a8b1
---
M composer.lock
M extensions/Wikibase/client/i18n/kn.json
M extensions/Wikibase/lib/i18n/es.json
M extensions/Wikibase/lib/i18n/pl.json
M extensions/Wikibase/lib/i18n/sv.json
M extensions/Wikibase/repo/i18n/gl.json
M extensions/Wikibase/repo/i18n/he.json
M extensions/Wikibase/repo/i18n/tl.json
M extensions/Wikibase/repo/includes/Actions/EditEntityAction.php
M extensions/Wikibase/repo/includes/Actions/SubmitEntityAction.php
M vendor/composer/installed.json
11 files changed, 74 insertions(+), 82 deletions(-)

Approvals:
  Tobias Gritschacher: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.lock b/composer.lock
index ab9929c..8d8072a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1574,12 +1574,12 @@
             "source": {
                 "type": "git",
                 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-                "reference": "8547422341c5ba301119feb8fbd1734ab08f6e91"
+                "reference": "9954c1002bedf9fc3a63d95baa4649a297aa5d91"
             },
             "dist": {
                 "type": "zip",
-                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8547422341c5ba301119feb8fbd1734ab08f6e91";,
-                "reference": "8547422341c5ba301119feb8fbd1734ab08f6e91",
+                "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/9954c1002bedf9fc3a63d95baa4649a297aa5d91";,
+                "reference": "9954c1002bedf9fc3a63d95baa4649a297aa5d91",
                 "shasum": ""
             },
             "require": {
@@ -1653,7 +1653,7 @@
                 "wikibaserepo",
                 "wikidata"
             ],
-            "time": "2016-10-17 09:46:52"
+            "time": "2016-10-17 20:37:03"
         },
         {
             "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/i18n/kn.json 
b/extensions/Wikibase/client/i18n/kn.json
index f588ade..441d38a 100644
--- a/extensions/Wikibase/client/i18n/kn.json
+++ b/extensions/Wikibase/client/i18n/kn.json
@@ -2,7 +2,8 @@
        "@metadata": {
                "authors": [
                        "VASANTH S.N.",
-                       "Omshivaprakash"
+                       "Omshivaprakash",
+                       "Shushruth"
                ]
        },
        "wikibase-comment-update": "{{WBREPONAME}} ವಸ್ತು ಬದಲಾಗಿದೆ",
@@ -17,5 +18,5 @@
        "wikibase-rc-wikibase-edit-title": "{{WBREPONAME}} ಸಂಪಾದನೆ",
        "wikibase-unconnectedpages-submit": "ಹೋಗು",
        "wikibase-pageinfo-entity-id-none": "ಯಾವುದೂ ಇಲ್ಲ",
-       "wikibase-otherprojects": "ಇತರೆ ಯೋಜನೆಗಳು"
+       "wikibase-otherprojects": "ಇತರೆ ಯೋಜನೆಗಳಲ್ಲಿ"
 }
diff --git a/extensions/Wikibase/lib/i18n/es.json 
b/extensions/Wikibase/lib/i18n/es.json
index 35e7104..53b5df9 100644
--- a/extensions/Wikibase/lib/i18n/es.json
+++ b/extensions/Wikibase/lib/i18n/es.json
@@ -77,7 +77,7 @@
        "wikibase-validator-bad-value-type": "Tipo de valor incorrecto $1, se 
esperaba $2",
        "wikibase-validator-bad-data-type": "Tipo de dato erróneo: $1",
        "wikibase-validator-bad-url": "Las URL no pueden contener determinados 
caracteres tales como espacios y corchetes: $1",
-       "wikibase-validator-url-scheme-missing": "A esta URL le falta un 
esquema como \"https://\": $1",
+       "wikibase-validator-url-scheme-missing": "A este URL le falta un 
esquema como «https://»: $1",
        "wikibase-validator-bad-url-scheme": "Esquema de URL no admitido: $1",
        "wikibase-validator-unknown-unit": "Unidad desconocida: $1",
        "wikibase-validator-not-allowed": "Valor ilegal: $1",
diff --git a/extensions/Wikibase/lib/i18n/pl.json 
b/extensions/Wikibase/lib/i18n/pl.json
index 7260e00..ef1a9f8 100644
--- a/extensions/Wikibase/lib/i18n/pl.json
+++ b/extensions/Wikibase/lib/i18n/pl.json
@@ -74,7 +74,7 @@
        "wikibase-validator-bad-value": "Zawartość danych jest uszkodzona: $1",
        "wikibase-validator-bad-value-type": "Błędny typ wartości $1, 
oczekiwano $2",
        "wikibase-validator-bad-data-type": "Zły typ danych: $1",
-       "wikibase-validator-bad-url": "Nieprawidłowy URL: $1",
+       "wikibase-validator-bad-url": "Adresy URL nie mogą zawierać pewne 
znaków, takich jak spacje i nawiasy kwadratowe: $1",
        "wikibase-validator-bad-url-scheme": "Nieobsługiwany schemat adresu 
URL: $1",
        "wikibase-validator-unknown-unit": "Nieznana jednostka: $1",
        "wikibase-validator-not-allowed": "Niepoprawna wartość: $1",
diff --git a/extensions/Wikibase/lib/i18n/sv.json 
b/extensions/Wikibase/lib/i18n/sv.json
index f4427a5..665f676 100644
--- a/extensions/Wikibase/lib/i18n/sv.json
+++ b/extensions/Wikibase/lib/i18n/sv.json
@@ -68,6 +68,7 @@
        "wikibase-validator-bad-value-type": "Dåligt värdetyp $1, förväntade 
$2",
        "wikibase-validator-bad-data-type": "Dålig datatyp: $1",
        "wikibase-validator-bad-url": "Felformaterad URL: $1",
+       "wikibase-validator-url-scheme-missing": "Webbdadressen saknar ett 
protokoll som \"https://\": $1",
        "wikibase-validator-bad-url-scheme": "Ej stött URL-schema: $1",
        "wikibase-validator-unknown-unit": "Okänd enhet: $1",
        "wikibase-validator-not-allowed": "Otillåtet värde: $1",
diff --git a/extensions/Wikibase/repo/i18n/gl.json 
b/extensions/Wikibase/repo/i18n/gl.json
index 1ac6e17..eb1e350 100644
--- a/extensions/Wikibase/repo/i18n/gl.json
+++ b/extensions/Wikibase/repo/i18n/gl.json
@@ -87,8 +87,11 @@
        "wikibase-claimview-snak-tooltip": "Insira un valor correspondente á 
propiedade chamada \"$1\". Se a propiedade non ten ningún valor designado ou 
non se coñece o valor real, pode elixir a alternativa teclear un valor premendo 
na icona ó lado da caixa de entrada.",
        "wikibase-claimview-snak-new-tooltip": "Despois de especificar unha 
propiedade pode inserir o valor correspondente. Se a propiedade non ten ningún 
valor designado ou non se coñece o valor real, pode elixir a alternativa 
teclear un valor premendo na icona que está ó lado da caixa de entrada.",
        "wikibase-statementview-rank-preferred": "Rango privilexiado",
+       "wikibase-statementview-rank-tooltip-preferred": "Valor válido e 
actualizado",
        "wikibase-statementview-rank-normal": "Rango normal",
+       "wikibase-statementview-rank-tooltip-normal": "Valor válido, aínda que 
posiblemente desactualizado",
        "wikibase-statementview-rank-deprecated": "Rango obsoleto",
+       "wikibase-statementview-rank-tooltip-deprecated": "O valor é coñecido 
por ser errado pero (acostumaba ser) comunmente admitido",
        "wikibase-statementview-references-counter": 
"$1{{PLURAL:$2|0=|$3+$2$4}} {{PLURAL:$1|referencia|referencias}}",
        "wikibase-statementview-referencesheading-pendingcountertooltip": 
"{{PLURAL:$1|Unha referencia|$1 referencias}} sen gardar",
        "wikibase-snakview-property-input-placeholder": "propiedade",
diff --git a/extensions/Wikibase/repo/i18n/he.json 
b/extensions/Wikibase/repo/i18n/he.json
index 91ddcab..e554a93 100644
--- a/extensions/Wikibase/repo/i18n/he.json
+++ b/extensions/Wikibase/repo/i18n/he.json
@@ -89,8 +89,11 @@
        "wikibase-claimview-snak-tooltip": "נא להזין ערך המתאים למאפיין ששמו 
\"$1\". אם למאפיין אין ערך מוגדר או שהערך האמתי אינו ידוע, ביכולתך לבחור סוג 
ערך חלופי באמצעות לחיצה על הסמל לפני תיבת הקלט.",
        "wikibase-claimview-snak-new-tooltip": "אחרי ציון המאפיין ביכולתך להזין 
ערך מתאים. אם למאפיין אין ערך מוגדר או שהערך האמתי אינו ידוע, ביכולתך לבחור סוג 
ערך חלופי באמצעות לחיצה על הסמל לפני תיבת הקלט.",
        "wikibase-statementview-rank-preferred": "דירוג מועדף",
+       "wikibase-statementview-rank-tooltip-preferred": "ערך תקין ועדכני",
        "wikibase-statementview-rank-normal": "דירוג רגיל",
+       "wikibase-statementview-rank-tooltip-normal": "ערך תקין, יכול להיות גם 
היסטורי",
        "wikibase-statementview-rank-deprecated": "דירוג ירוד",
+       "wikibase-statementview-rank-tooltip-deprecated": "ידוע שהערך אינו 
נכון, אבל רבים האמינו בעבר שהוא נכון",
        "wikibase-statementview-references-counter": 
"$1{{PLURAL:$2|0=|$3+$2$4}} {{PLURAL:$1|הפניה למקור|הפניות למקורות}}",
        "wikibase-statementview-referencesheading-pendingcountertooltip": 
"{{PLURAL:$1|הפניה אחת למקור|$1 הפניות למקורות}} שעוד לא נשמרו",
        "wikibase-snakview-property-input-placeholder": "מאפיין",
diff --git a/extensions/Wikibase/repo/i18n/tl.json 
b/extensions/Wikibase/repo/i18n/tl.json
index 4ca0134..35e5641 100644
--- a/extensions/Wikibase/repo/i18n/tl.json
+++ b/extensions/Wikibase/repo/i18n/tl.json
@@ -5,7 +5,8 @@
                        "Jewel457",
                        "Sky Harbor",
                        "Leeheonjin",
-                       "Stranger195"
+                       "Stranger195",
+                       "Emem.calist"
                ]
        },
        "wikibase-desc": "Repositoryo ng datong may kayarian",
@@ -40,6 +41,7 @@
        "wikibase-disambiguation-title": "Paglilinaw para sa \"$1\"",
        "wb-special-newitem-new-item-notification": "Nilikha ang bagong bagay 
na $1 at muling pinapunta sa pahina nito. Bumalik sa $2.",
        "wikibase-aliases-input-help-message": "Kung nakikilala ang pangkat ng 
dato sa ilalim na mas mahigit kaysa sa isang partikular na pangalan, 
makakapagpasok ka ng mga bansag at mga kasingkahulugan, upang matagpuan ito sa 
pamamagitan ng kasalit na mga pangalan nito.",
+       "wikibase-statementview-rank-tooltip-preferred": "Wasto at nasa tamang 
kabuuan.",
        "wikibase-statementview-references-counter": 
"$1{{PLURAL:$2|0=|$3+$2$4}} {{PLURAL:$1|sanggunian|mga sanggunian}}",
        "wikibase-move-error": "Hindi ka maaaring maglipat ng mga pahinang nasa 
loob ng puwang ng pangalan ng datp, at hindi ka maaaring maglipat ng mga pahina 
na papasok dito.",
        "wikibase-itemlink": "$1 $2",
diff --git a/extensions/Wikibase/repo/includes/Actions/EditEntityAction.php 
b/extensions/Wikibase/repo/includes/Actions/EditEntityAction.php
index 2958201..03c1904 100644
--- a/extensions/Wikibase/repo/includes/Actions/EditEntityAction.php
+++ b/extensions/Wikibase/repo/includes/Actions/EditEntityAction.php
@@ -46,13 +46,10 @@
        private $entityDiffVisualizer;
 
        /**
-        * @var SummaryFormatter
-        */
-       private $summaryFormatter;
-
-       /**
+        * @see Action::__construct
+        *
         * @param Page $page
-        * @param IContextSource $context
+        * @param IContextSource|null $context
         */
        public function __construct( Page $page, IContextSource $context = null 
) {
                parent::__construct( $page, $context );
@@ -66,9 +63,6 @@
                ) );
 
                $wikibaseRepo = WikibaseRepo::getDefaultInstance();
-
-               $this->summaryFormatter = $wikibaseRepo->getSummaryFormatter();
-
                $termLookup = new EntityRetrievingTermLookup( 
$wikibaseRepo->getEntityLookup() );
                $labelDescriptionLookup = new LanguageLabelDescriptionLookup( 
$termLookup, $languageCode );
                $htmlFormatterFactory = 
$wikibaseRepo->getEntityIdHtmlLinkFormatterFactory();
@@ -366,50 +360,6 @@
                $meta = $this->getOutput()->getProperty( 'wikibase-meta-tags' );
 
                return isset( $meta['title'] ) ? $meta['title'] : 
$this->getTitle()->getPrefixedText();
-       }
-
-       /**
-        * Returns an edit summary representing a restore-operation defined by 
the three given revisions.
-        *
-        * @since 0.1
-        *
-        * @param Revision $olderRevision
-        * @param string $userSummary User provided summary
-        *
-        * @return string
-        */
-       protected function makeRestoreSummary( Revision $olderRevision, 
$userSummary = '' ) {
-               $id = $olderRevision->getId();
-               $username = $olderRevision->getUserText();
-
-               $summary = new Summary;
-               $summary->setAction( 'restore' );
-               $summary->addAutoCommentArgs( $id, $username );
-               $summary->setUserSummary( $userSummary );
-
-               return $this->summaryFormatter->formatSummary( $summary );
-       }
-
-       /**
-        * Returns an edit summary representing an undo-operation defined by 
the three given revisions.
-        *
-        * @since 0.1
-        *
-        * @param Revision $newerRevision
-        * @param string $userSummary User provided summary
-        *
-        * @return string
-        */
-       protected function makeUndoSummary( Revision $newerRevision, 
$userSummary = '' ) {
-               $id = $newerRevision->getId();
-               $username = $newerRevision->getUserText();
-
-               $summary = new Summary;
-               $summary->setAction( 'undo' );
-               $summary->addAutoCommentArgs( $id, $username );
-               $summary->setUserSummary( $userSummary );
-
-               return $this->summaryFormatter->formatSummary( $summary );
        }
 
        /**
diff --git a/extensions/Wikibase/repo/includes/Actions/SubmitEntityAction.php 
b/extensions/Wikibase/repo/includes/Actions/SubmitEntityAction.php
index 8f17de2..46fcc1a 100644
--- a/extensions/Wikibase/repo/includes/Actions/SubmitEntityAction.php
+++ b/extensions/Wikibase/repo/includes/Actions/SubmitEntityAction.php
@@ -3,11 +3,14 @@
 namespace Wikibase;
 
 use Content;
+use IContextSource;
 use MWException;
+use Page;
 use Revision;
 use Status;
 use Title;
 use WatchAction;
+use Wikibase\Repo\WikibaseRepo;
 use WikiPage;
 
 /**
@@ -23,6 +26,24 @@
  * @author Daniel Kinzler
  */
 class SubmitEntityAction extends EditEntityAction {
+
+       /**
+        * @var SummaryFormatter
+        */
+       private $summaryFormatter;
+
+       /**
+        * @see EditEntityAction::__construct
+        *
+        * @param Page $page
+        * @param IContextSource|null $context
+        */
+       public function __construct( Page $page, IContextSource $context = null 
) {
+               parent::__construct( $page, $context );
+
+               $wikibaseRepo = WikibaseRepo::getDefaultInstance();
+               $this->summaryFormatter = $wikibaseRepo->getSummaryFormatter();
+       }
 
        public function getName() {
                return 'submit';
@@ -103,25 +124,20 @@
                $diff = $newerContent->getDiff( $olderContent );
                $patchedContent = $latestContent->getPatchedCopy( $diff );
 
-               $summary = $request->getText( 'wpSummary' );
-               $editToken = $request->getText( 'wpEditToken' );
+               if ( $patchedContent->equals( $latestContent ) ) {
+                       $status = Status::newGood();
+                       $status->warning( 'wikibase-empty-undo' );
+               } else {
+                       $summary = $request->getText( 'wpSummary' );
 
-               if ( $request->getCheck( 'restore' ) ) { // restore
-                       if ( $patchedContent->equals( $latestContent ) ) {
-                               $status = Status::newGood();
-                               $status->warning( 'wikibase-empty-undo' );
+                       if ( $request->getCheck( 'restore' ) ) {
+                               $summary = $this->makeSummary( 'restore', 
$olderRevision, $summary );
                        } else {
-                               $summary = $this->makeRestoreSummary( 
$olderRevision, $summary );
-                               $status = $this->attemptSave( $title, 
$patchedContent, $summary, $editToken );
+                               $summary = $this->makeSummary( 'undo', 
$newerRevision, $summary );
                        }
-               } else { // undo
-                       if ( $patchedContent->equals( $latestContent ) ) {
-                               $status = Status::newGood();
-                               $status->warning( 'wikibase-empty-undo' );
-                       } else {
-                               $summary = $this->makeUndoSummary( 
$newerRevision, $summary );
-                               $status = $this->attemptSave( $title, 
$patchedContent, $summary, $editToken );
-                       }
+
+                       $editToken = $request->getText( 'wpEditToken' );
+                       $status = $this->attemptSave( $title, $patchedContent, 
$summary, $editToken );
                }
 
                if ( $status->isOK() ) {
@@ -132,6 +148,22 @@
        }
 
        /**
+        * @param string $actionName
+        * @param Revision $revision
+        * @param string $userSummary
+        *
+        * @return string
+        */
+       private function makeSummary( $actionName, Revision $revision, 
$userSummary ) {
+               $summary = new Summary();
+               $summary->setAction( $actionName );
+               $summary->addAutoCommentArgs( $revision->getId(), 
$revision->getUserText() );
+               $summary->setUserSummary( $userSummary );
+
+               return $this->summaryFormatter->formatSummary( $summary );
+       }
+
+       /**
         * @throws MWException
         */
        public function execute() {
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index c68a670..34a5495 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1348,12 +1348,12 @@
         "source": {
             "type": "git",
             "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-            "reference": "8547422341c5ba301119feb8fbd1734ab08f6e91"
+            "reference": "9954c1002bedf9fc3a63d95baa4649a297aa5d91"
         },
         "dist": {
             "type": "zip",
-            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8547422341c5ba301119feb8fbd1734ab08f6e91";,
-            "reference": "8547422341c5ba301119feb8fbd1734ab08f6e91",
+            "url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/9954c1002bedf9fc3a63d95baa4649a297aa5d91";,
+            "reference": "9954c1002bedf9fc3a63d95baa4649a297aa5d91",
             "shasum": ""
         },
         "require": {
@@ -1386,7 +1386,7 @@
             "jakub-onderka/php-parallel-lint": "0.9.2",
             "mediawiki/mediawiki-codesniffer": "0.4.0|0.5.0"
         },
-        "time": "2016-10-17 09:46:52",
+        "time": "2016-10-17 20:37:03",
         "type": "mediawiki-extension",
         "installation-source": "dist",
         "autoload": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9c3c42066c16194919504221ea8a935ca5c3a8b1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <wikidata-servi...@wikimedia.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Aude <aude.w...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to