| Index: branches/wmf/1.16wmf4/extensions/FlaggedRevs/FlaggedRevision.php |
| — | — | @@ -447,6 +447,83 @@ |
| 448 | 448 | return $this->mFiles; |
| 449 | 449 | } |
| 450 | 450 | |
| | 451 | + /* |
| | 452 | + * Fetch pending template changes for this reviewed page version. |
| | 453 | + * For each template, the version used is newest( stable rev, rev at time of review ). |
| | 454 | + * Pending changes exist if the latest version of the template is newer than this. |
| | 455 | + * |
| | 456 | + * @return Array of (template title, rev ID in reviewed version) tuples |
| | 457 | + */ |
| | 458 | + public function findPendingTemplateChanges() { |
| | 459 | + $dbr = wfGetDB( DB_SLAVE ); |
| | 460 | + $ret = $dbr->select( array( 'flaggedtemplates', 'page', 'flaggedpages' ), |
| | 461 | + array( 'ft_namespace', 'ft_title', 'fp_stable', 'ft_tmp_rev_id', 'page_latest' ), |
| | 462 | + array( 'ft_rev_id' => $this->getRevId() ), |
| | 463 | + __METHOD__, |
| | 464 | + array(), /* OPTIONS */ |
| | 465 | + array( |
| | 466 | + 'page' => array( 'LEFT JOIN', |
| | 467 | + 'page_namespace = ft_namespace AND page_title = ft_title' ), |
| | 468 | + 'flaggedpages' => array( 'LEFT JOIN', 'fp_page_id = page_id' ) ) |
| | 469 | + ); |
| | 470 | + $tmpChanges = array(); |
| | 471 | + while ( $row = $dbr->fetchObject( $ret ) ) { |
| | 472 | + $title = Title::makeTitleSafe( $row->ft_namespace, $row->ft_title ); |
| | 473 | + $revIdDraft = (int)$row->page_latest; // may be NULL |
| | 474 | + # Select newest of (stable rev, rev when reviewed) when parsing |
| | 475 | + $revIdStable = max( $row->fp_stable, $row->ft_tmp_rev_id ); |
| | 476 | + # Compare to current... |
| | 477 | + $deleted = ( !$revIdDraft && $revIdStable ); // later deleted |
| | 478 | + $updated = ( $revIdDraft && $revIdDraft > $revIdStable ); // updated/created |
| | 479 | + if ( $deleted || $updated ) { |
| | 480 | + $tmpChanges[] = array( $title, $revIdStable ); |
| | 481 | + } |
| | 482 | + } |
| | 483 | + return $tmpChanges; |
| | 484 | + } |
| | 485 | + |
| | 486 | + /* |
| | 487 | + * Fetch pending file changes for this reviewed page version. |
| | 488 | + * For each file, the version used is newest( stable rev, rev at time of review ). |
| | 489 | + * Pending changes exist if the latest version of the file is newer than this. |
| | 490 | + * @TODO: skip commons images, deliberately? (bug 15748). |
| | 491 | + * |
| | 492 | + * @return Array of (file title, MW file timestamp in reviewed version) tuples |
| | 493 | + */ |
| | 494 | + public function findPendingFileChanges() { |
| | 495 | + $dbr = wfGetDB( DB_SLAVE ); |
| | 496 | + $ret = $dbr->select( |
| | 497 | + array( 'flaggedimages', 'page', 'flaggedpages', 'flaggedrevs' ), |
| | 498 | + array( 'fi_name', 'fi_img_timestamp', 'fr_img_timestamp' ), |
| | 499 | + array( 'fi_rev_id' => $this->getRevId() ), |
| | 500 | + __METHOD__, |
| | 501 | + array(), /* OPTIONS */ |
| | 502 | + array( |
| | 503 | + 'page' => array( 'LEFT JOIN', |
| | 504 | + 'page_namespace = ' . NS_FILE . ' AND page_title = fi_name' ), |
| | 505 | + 'flaggedpages' => array( 'LEFT JOIN', 'fp_page_id = page_id' ), |
| | 506 | + 'flaggedrevs' => array( 'LEFT JOIN', |
| | 507 | + 'fr_page_id = fp_page_id AND fr_rev_id = fp_stable' ) ) |
| | 508 | + ); |
| | 509 | + $fileChanges = array(); |
| | 510 | + while ( $row = $dbr->fetchObject( $ret ) ) { |
| | 511 | + $title = Title::makeTitleSafe( NS_FILE, $row->fi_name ); |
| | 512 | + $reviewedTS = trim( $row->fi_img_timestamp ); // may be ''/NULL |
| | 513 | + # Select newest of (stable rev, rev when reviewed) when parsing |
| | 514 | + $tsStable = $row->fr_img_timestamp >= $reviewedTS |
| | 515 | + ? $row->fr_img_timestamp |
| | 516 | + : $reviewedTS; |
| | 517 | + # Compare to current... |
| | 518 | + $file = wfFindFile( $title ); // current file version |
| | 519 | + $deleted = ( !$file && $tsStable ); // later deleted |
| | 520 | + $updated = ( $file && $file->getTimestamp() > $tsStable ); // updated/created |
| | 521 | + if ( $deleted || $updated ) { |
| | 522 | + $fileChanges[] = array( $title, $tsStable ); |
| | 523 | + } |
| | 524 | + } |
| | 525 | + return $fileChanges; |
| | 526 | + } |
| | 527 | + |
| 451 | 528 | /** |
| 452 | 529 | * Get text of the corresponding revision |
| 453 | 530 | * @return mixed (string/false) revision timestamp in MW format |
| Index: branches/wmf/1.16wmf4/extensions/FlaggedRevs/FlaggedArticleView.php |
| — | — | @@ -1242,9 +1242,9 @@ |
| 1243 | 1243 | $changeList = array(); |
| 1244 | 1244 | if ( !$synced ) { |
| 1245 | 1245 | # Add a list of links to each changed template... |
| 1246 | | - $changeList += $this->fetchTemplateChanges( $frev ); |
| | 1246 | + $changeList = array_merge( $changeList, $this->fetchTemplateChanges( $frev ) ); |
| 1247 | 1247 | # Add a list of links to each changed file... |
| 1248 | | - $changeList += $this->fetchFileChanges( $frev ); |
| | 1248 | + $changeList = array_merge( $changeList, $this->fetchFileChanges( $frev ) ); |
| 1249 | 1249 | } |
| 1250 | 1250 | |
| 1251 | 1251 | # Some important information about include version selection... |
| — | — | @@ -1391,36 +1391,15 @@ |
| 1392 | 1392 | protected function fetchTemplateChanges( FlaggedRevision $frev ) { |
| 1393 | 1393 | global $wgUser; |
| 1394 | 1394 | $skin = $wgUser->getSkin(); |
| 1395 | | - $dbr = wfGetDB( DB_SLAVE ); |
| 1396 | | - # Get templates where the current and stable are not the same revision |
| 1397 | | - $ret = $dbr->select( array( 'flaggedtemplates', 'page', 'flaggedpages' ), |
| 1398 | | - array( 'ft_namespace', 'ft_title', 'fp_stable', 'ft_tmp_rev_id', 'page_latest' ), |
| 1399 | | - array( 'ft_rev_id' => $frev->getRevId() ), |
| 1400 | | - __METHOD__, |
| 1401 | | - array(), /* OPTIONS */ |
| 1402 | | - array( |
| 1403 | | - 'page' => array( 'LEFT JOIN', |
| 1404 | | - 'page_namespace = ft_namespace AND page_title = ft_title' ), |
| 1405 | | - 'flaggedpages' => array( 'LEFT JOIN', 'fp_page_id = page_id' ) ) |
| 1406 | | - ); |
| 1407 | | - $tmpChanges = array(); |
| 1408 | | - while ( $row = $dbr->fetchObject( $ret ) ) { |
| 1409 | | - $title = Title::makeTitleSafe( $row->ft_namespace, $row->ft_title ); |
| 1410 | | - $revIdDraft = $row->page_latest; // may be NULL |
| 1411 | | - # Stable time -> time when reviewed (unless the other is newer) |
| 1412 | | - $revIdStable = $row->fp_stable && $row->fp_stable >= $row->ft_tmp_rev_id |
| 1413 | | - ? $row->fp_stable |
| 1414 | | - : $row->ft_tmp_rev_id; |
| 1415 | | - # Compare to current... |
| 1416 | | - $deleted = ( !$revIdDraft && $revIdStable ); // later deleted |
| 1417 | | - $updated = ( $revIdDraft && $revIdDraft > $revIdStable ); // updated/created |
| 1418 | | - if ( $deleted || $updated ) { |
| 1419 | | - $tmpChanges[] = $skin->makeLinkObj( $title, |
| 1420 | | - $title->getPrefixedText(), |
| 1421 | | - 'diff=cur&oldid=' . (int)$revIdStable ); |
| 1422 | | - } |
| | 1395 | + $diffLinks = array(); |
| | 1396 | + $changes = $frev->findPendingTemplateChanges(); |
| | 1397 | + foreach ( $changes as $tuple ) { |
| | 1398 | + list( $title, $revIdStable ) = $tuple; |
| | 1399 | + $diffLinks[] = $skin->makeLinkObj( $title, |
| | 1400 | + $title->getPrefixedText(), |
| | 1401 | + 'diff=cur&oldid=' . (int)$revIdStable ); |
| 1423 | 1402 | } |
| 1424 | | - return $tmpChanges; |
| | 1403 | + return $diffLinks; |
| 1425 | 1404 | } |
| 1426 | 1405 | |
| 1427 | 1406 | // Fetch file changes for a reviewed revision since review |
| — | — | @@ -1428,40 +1407,14 @@ |
| 1429 | 1408 | protected function fetchFileChanges( FlaggedRevision $frev ) { |
| 1430 | 1409 | global $wgUser; |
| 1431 | 1410 | $skin = $wgUser->getSkin(); |
| 1432 | | - $dbr = wfGetDB( DB_SLAVE ); |
| 1433 | | - # Get images where the current and stable are not the same revision |
| 1434 | | - $ret = $dbr->select( |
| 1435 | | - array( 'flaggedimages', 'page', 'image', 'flaggedpages', 'flaggedrevs' ), |
| 1436 | | - array( 'fi_name', 'fi_img_timestamp', 'fr_img_timestamp' ), |
| 1437 | | - array( 'fi_rev_id' => $frev->getRevId() ), |
| 1438 | | - __METHOD__, |
| 1439 | | - array(), /* OPTIONS */ |
| 1440 | | - array( |
| 1441 | | - 'page' => array( 'LEFT JOIN', |
| 1442 | | - 'page_namespace = ' . NS_FILE . ' AND page_title = fi_name' ), |
| 1443 | | - 'image' => array( 'LEFT JOIN', 'img_name = fi_name' ), |
| 1444 | | - 'flaggedpages' => array( 'LEFT JOIN', 'fp_page_id = page_id' ), |
| 1445 | | - 'flaggedrevs' => array( 'LEFT JOIN', |
| 1446 | | - 'fr_page_id = fp_page_id AND fr_rev_id = fp_stable' ) ) |
| 1447 | | - ); |
| 1448 | | - $imgChanges = array(); |
| 1449 | | - while ( $row = $dbr->fetchObject( $ret ) ) { |
| 1450 | | - $title = Title::makeTitleSafe( NS_FILE, $row->fi_name ); |
| 1451 | | - $reviewedTS = trim( $row->fi_img_timestamp ); // may be ''/NULL |
| 1452 | | - # Stable time -> time when reviewed (unless the other is newer) |
| 1453 | | - $tsStable = $row->fr_img_timestamp && $row->fr_img_timestamp >= $reviewedTS |
| 1454 | | - ? $row->fr_img_timestamp |
| 1455 | | - : $reviewedTS; |
| 1456 | | - # Compare to current... |
| 1457 | | - $file = wfFindFile( $title ); |
| 1458 | | - $deleted = ( !$file && $tsStable ); // later deleted |
| 1459 | | - $updated = ( $file && $file->getTimestamp() > $tsStable ); // updated/created |
| 1460 | | - if ( $deleted || $updated ) { |
| 1461 | | - // @TODO: change when MW has file diffs |
| 1462 | | - $imgChanges[] = $skin->makeLinkObj( $title, $title->getPrefixedText() ); |
| 1463 | | - } |
| | 1411 | + $diffLinks = array(); |
| | 1412 | + $changes = $frev->findPendingFileChanges(); |
| | 1413 | + foreach ( $changes as $tuple ) { |
| | 1414 | + list( $title, $revIdStable ) = $tuple; |
| | 1415 | + // @TODO: change when MW has file diffs |
| | 1416 | + $diffLinks[] = $skin->makeLinkObj( $title, $title->getPrefixedText() ); |
| 1464 | 1417 | } |
| 1465 | | - return $imgChanges; |
| | 1418 | + return $diffLinks; |
| 1466 | 1419 | } |
| 1467 | 1420 | |
| 1468 | 1421 | // Mark that someone is viewing a portion or all of the diff-to-stable |
| Index: branches/wmf/1.16wmf4/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php |
| — | — | @@ -2886,7 +2886,7 @@ |
| 2887 | 2887 | 'revreview-submitedit-title' => 'Deine Änderungen zum Überprüfen übertragen', |
| 2888 | 2888 | 'revreview-edited' => "'''Deine Änderungen werden veröffentlicht, sobald ein dazu berechtigter Benutzer sie überprüft hat. ([[{{MediaWiki:Validationpage}}|Hilfe]])''' |
| 2889 | 2889 | |
| 2890 | | -Momentan {{PLURAL:$2|gibt|gibt}} es [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $2 ungeprüfte {{PLURAL:$2|Änderung|Änderungen}}] ''(siehe unten)'', die noch überprüft werden müssen.", |
| | 2890 | +Momentan {{PLURAL:$2|gibt|gibt}} es [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $2 ungeprüfte {{PLURAL:$2|Änderung|Änderungen}}] ''(siehe unten)'', die noch überprüft werden {{PLURAL:$2|muss|müssen}}.", |
| 2891 | 2891 | 'revreview-edited-section' => 'Zurück zum Seitenabschnitt „[[#$1|$2]]“.', |
| 2892 | 2892 | 'revreview-flag' => 'Markiere Version', |
| 2893 | 2893 | 'revreview-reflag' => 'Diese Version erneut markieren', |
| — | — | @@ -2896,12 +2896,12 @@ |
| 2897 | 2897 | 'revreview-main' => 'Du musst eine Version zur Markierung auswählen. |
| 2898 | 2898 | |
| 2899 | 2899 | Siehe die [[Special:Unreviewedpages|Liste unmarkierter Versionen]].', |
| 2900 | | - 'revreview-newest-basic' => 'Die [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} überprüfte Version] wurde am <i>$2</i> [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} freigegeben]. Momentan {{PLURAL:$3|gibt|gibt}} es [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 {{PLURAL:$3|Änderung|Änderungen}}] die noch überprüft werden müssen.', |
| | 2900 | + 'revreview-newest-basic' => 'Die [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} überprüfte Version] wurde am <i>$2</i> [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} freigegeben]. Momentan {{PLURAL:$3|gibt|gibt}} es [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 {{PLURAL:$3|Änderung|Änderungen}}] die noch überprüft werden {{PLURAL:$3|muss|müssen}}.', |
| 2901 | 2901 | 'revreview-newest-basic-i' => 'Die [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} überprüfte Version] wurde am <i>$2</i> [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} freigegeben]. Es sind noch [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} Vorlagen- und Dateiänderungen] vorhanden, die überprüft werden müssen.', |
| 2902 | | - 'revreview-newest-quality' => 'Die [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} überprüfte Version] wurde am <i>$2</i> [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} freigegeben]. Momentan {{PLURAL:$3|gibt|gibt}} es [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 {{PLURAL:$3|Änderung|Änderungen}}] die noch überprüft werden müssen.', |
| | 2902 | + 'revreview-newest-quality' => 'Die [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} überprüfte Version] wurde am <i>$2</i> [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} freigegeben]. Momentan {{PLURAL:$3|gibt|gibt}} es [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 {{PLURAL:$3|Änderung|Änderungen}}] die noch überprüft werden {{PLURAL:$3|muss|müssen}}.', |
| 2903 | 2903 | 'revreview-newest-quality-i' => 'Die [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} überprüfte Version] wurde am <i>$2</i> [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} freigegeben]. Es sind noch [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} Vorlagen- und Dateiänderungen] vorhanden, die überprüft werden müssen.', |
| 2904 | | - 'revreview-pending-basic' => 'Die [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} überprüfte Version] wurde am <i>$2</i> [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} freigegeben]. Momentan {{PLURAL:$3|gibt|gibt}} es [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 {{PLURAL:$3|Änderung|Änderungen}}] die noch überprüft werden müssen.', |
| 2905 | | - 'revreview-pending-quality' => 'Die [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} überprüfte Version] wurde am <i>$2</i> [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} freigegeben]. Momentan {{PLURAL:$3|gibt|gibt}} es [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 {{PLURAL:$3|Änderung|Änderungen}}] die noch überprüft werden müssen.', |
| | 2904 | + 'revreview-pending-basic' => 'Die [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} überprüfte Version] wurde am <i>$2</i> [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} freigegeben]. Momentan {{PLURAL:$3|gibt|gibt}} es [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 {{PLURAL:$3|Änderung|Änderungen}}] die noch überprüft werden {{PLURAL:$3|muss|müssen}}.', |
| | 2905 | + 'revreview-pending-quality' => 'Die [{{fullurl:{{FULLPAGENAMEE}}|stable=1}} überprüfte Version] wurde am <i>$2</i> [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} freigegeben]. Momentan {{PLURAL:$3|gibt|gibt}} es [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 {{PLURAL:$3|Änderung|Änderungen}}] die noch überprüft werden {{PLURAL:$3|muss|müssen}}.', |
| 2906 | 2906 | 'revreview-pending-nosection' => 'Versuche die [{{fullurl:{{FULLPAGENAMEE}}|stable=0}} neueste Version], die [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $2 zu überprüfende {{PLURAL:$2|Änderung|Änderungen}}] enthält, anzusehen, um festzustellen, ob der Abschnitt verschoben oder gelöscht wurde.', |
| 2907 | 2907 | 'revreview-noflagged' => "Von dieser Seite gibt es keine [[{{MediaWiki:Validationpage}}|überprüften Versionen]]. Sie wurde möglicherweise noch '''nicht''' bezüglich deren Qualität überprüft.", |
| 2908 | 2908 | 'revreview-note' => '[[User:$1|$1]] machte die folgende [[{{MediaWiki:Validationpage}}|Prüfnotiz]] zu dieser Version:', |
| — | — | @@ -3168,19 +3168,18 @@ |
| 3169 | 3169 | [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} vurnayişê şablon/dosyayi] gani newe ra konrol bıbo.', |
| 3170 | 3170 | 'revreview-pending-basic' => '[{{fullurl:{{FULLPAGENAMEE}}|stable=1}} Versiyonê sabiti] <i>$2</i> di [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} control biya]. [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 {{PLURAL:$3|vurnayis|vurnayisan}}] {{PLURAL:$3|esta|este}} ke gani kontrol biyo.', |
| 3171 | 3171 | 'revreview-pending-quality' => '[{{fullurl:{{FULLPAGENAMEE}}|stable=1}} Versiyonê sabiti] <i>$2</i> de [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} qebul biya]. [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 {{PLURAL:$3|vurnayis|vurnayisan}}] {{PLURAL:$3|esta|este}} ke gani kontrol biyo.', |
| 3172 | | - 'revreview-noflagged' => 'No pel de revizyono ke çım ser nêçariyayi çino, no sebeb ra qey qalite belka [[{{MediaWiki:Validationpage}}|checked]] biyo.', |
| | 3172 | + 'revreview-noflagged' => 'No pel de revizyono ke [[{{MediaWiki:Validationpage}}|çım ser nêçariyayi]] çini yo, no sebeb ra qey qalite belka hewl niyo.', |
| 3173 | 3173 | 'revreview-note' => '[[User:$1|$1]] no revizyon ser [[{{MediaWiki:Validationpage}}|çım çarna]] u no not verda:', |
| 3174 | 3174 | 'revreview-notes' => 'tayê not u muşahedati ramociyeni:', |
| 3175 | 3175 | 'revreview-oldrating' => 'derecekerdış:', |
| 3176 | | - 'revreview-quality' => 'Eno [[{{MediaWiki:Validationpage}}|versiyono istıqrarın]]o ke, roca <i>$2</i>ine de [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} tesdiq biyo]. |
| 3177 | | -[{{fullurl:{{FULLPAGENAMEE}}|stable=0}} Vernuşte] de [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 teklifê {{PLURAL:$3|vurnayışio ke çımraviyarnayışi paweno, esto|vurnayışanê ke çımraviyarnayışi pawenê, estê}}].', |
| 3178 | | - 'revreview-quality-i' => 'Eno [[{{MediaWiki:Validationpage}}|versiyono istıqrarın]]o ke, roca <i>$2</i>ine de [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} tesdiq biyo]. |
| 3179 | | -[{{fullurl:{{FULLPAGENAMEE}}|stable=0}} Vernuşte] de [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} vurnayışê şabloniê/dosyaê] ke çımraviyarnayışi pawenê, estê.', |
| 3180 | | - 'revreview-quality-old' => 'no yew revizyono [[{{MediaWiki:Validationpage}}|qaliteyıno]] ([{{fullurl:{{#Special:ReviewedVersions}}|page={{FULLPAGENAMEE}}}} pêroyi liste ker]), <i>$2</i> tarix de [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} tesdiq biyo]. |
| 3181 | | -Yeni [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} değişiklikler] yapılmış olabilir.', |
| 3182 | | - 'revreview-quality-same' => 'no revizyono [[{{MediaWiki:Validationpage}}|qaliteyıno]] tewr peyin o ([{{fullurl:{{#Special:ReviewedVersions}}|page={{FULLPAGENAMEE}}}} pêroyi liste ker]), <i>$2</i> tarix de [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} tesdiq biyo].', |
| | 3176 | + 'revreview-quality' => 'No revizyon, revizyono [[{{MediaWiki:Validationpage}}|qaliteyıno]] tewr peyin o, <i>$2</i> tarix de [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} tesdiq biyo]. [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $3 {{PLURAL:$3|vurnayis|vurnayisan}}] {{PLURAL:$3|esta|este}} ke gani kontrol biya.', |
| | 3177 | + 'revreview-quality-i' => 'Eno [[{{MediaWiki:Validationpage}}|versiyono sebiti]] roca <i>$2</i>ine de [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} tesdiq biyo]. |
| | 3178 | +[{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} vurnayışê şabloniyê/dosyayê] ke çımraviyarnayışi pawenê, estê.', |
| | 3179 | + 'revreview-quality-old' => 'Eno versiyon [[{{MediaWiki:Validationpage}}|qaliteyıno]] ([{{fullurl:{{#Special:ReviewedVersions}}|page={{FULLPAGENAMEE}}}} pêroyi liste ker]), <i>$2</i> tarix de [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} tesdiq biyo]. |
| | 3180 | + [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} Vurnayisano newe] belke biyo.', |
| | 3181 | + 'revreview-quality-same' => 'Eno revizyono [[{{MediaWiki:Validationpage}}|qaliteyıno]] tewr peyini <i>$2</i> tarix de [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} tesdiq biyo].', |
| 3183 | 3182 | 'revreview-quality-source' => '[{{fullurl:{{FULLPAGENAMEE}}|stableid=$1}} revizyonê qaliteyınê no peli], <i>$2</i> tarix de [{{fullurl:{{#Special:Log}}|type=review&page={{FULLPAGENAMEE}}}} tesdiq biyo], no revizyon qıstas geriyayo.', |
| 3184 | | - 'revreview-quality-title' => 'Ena yew pela qaliteya', |
| | 3183 | + 'revreview-quality-title' => 'Ena yew versiyone qaliteya pele ya', |
| 3185 | 3184 | 'revreview-quick-basic' => "'''[[{{MediaWiki:Validationpage}}|Pela qontrolkerdiye]]''' ([{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} vurnayışanê vıneteyan bıvêne])", |
| 3186 | 3185 | 'revreview-quick-basic-old' => "'''[[{{MediaWiki:Validationpage}}|Qontrol bi]]'''", |
| 3187 | 3186 | 'revreview-quick-basic-same' => "'''[[{{MediaWiki:Validationpage}}|Qontrol bi]]'''", |
| Index: branches/wmf/1.16wmf4/extensions/FlaggedRevs/language/StablePages.i18n.php |
| — | — | @@ -170,7 +170,7 @@ |
| 171 | 171 | $messages['de'] = array( |
| 172 | 172 | 'stablepages' => 'Seiten die nur mit Bearbeitungsfreigabe bearbeitet werden können', |
| 173 | 173 | 'stablepages-text' => 'Es folgt eine Liste von Seiten, die Einschränkungen haben, so das bestimmte Benutzer Bearbeitungen vornehmen können, die keine Überprüfung benötigen. |
| 174 | | -Somit werden einige Bearbeitungen nicht angezeigt, bis ein entsprechend berechtigter Benutzer sie überprüft hat.', |
| | 174 | +Bearbeitungen von anderen Bentzern werden standardmäßig solange nicht angezeigt, bis ein entsprechend berechtigter Benutzer sie überprüft hat.', |
| 175 | 175 | 'stablepages-none' => 'Diese Liste enthält keine Seiten.', |
| 176 | 176 | 'stablepages-config' => 'Konfiguration', |
| 177 | 177 | ); |
| Property changes on: branches/wmf/1.16wmf4/extensions/FlaggedRevs/language |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 178 | 178 | Merged /trunk/extensions/FlaggedRevs/language:r68032-68054,68056-68057 |
| Index: branches/wmf/1.16wmf4/extensions/FlaggedRevs/FlaggedArticle.php |
| — | — | @@ -150,15 +150,11 @@ |
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | /** |
| 154 | | - * Check if the stable version is synced with the current revision. |
| 155 | | - * Note: This function can be pretty expensive... |
| 156 | | - * @param ParserOutput $stableOutput, will fetch if not given |
| 157 | | - * @param ParserOutput $currentOutput, will fetch if not given |
| | 154 | + * Checks if the stable version is synced with the current revision |
| | 155 | + * Note: slower than getPendingRevCount() |
| 158 | 156 | * @return bool |
| 159 | 157 | */ |
| 160 | | - public function stableVersionIsSynced( |
| 161 | | - ParserOutput $stableOutput = null, ParserOutput $currentOutput = null |
| 162 | | - ) { |
| | 158 | + public function stableVersionIsSynced() { |
| 163 | 159 | global $wgUser, $wgMemc, $wgEnableParserCache, $wgParserCacheExpireTime; |
| 164 | 160 | $srev = $this->getStableRev(); |
| 165 | 161 | if ( !$srev ) { |
| — | — | @@ -186,56 +182,11 @@ |
| 187 | 183 | } elseif ( $value === "false" ) { |
| 188 | 184 | return false; |
| 189 | 185 | } |
| 190 | | - # If parseroutputs not given, fetch them... |
| 191 | | - if ( is_null( $stableOutput ) || !isset( $stableOutput->fr_newestTemplateID ) ) { |
| 192 | | - # Get parsed stable version |
| 193 | | - $anon = new User(); // anon cache most likely to exist |
| 194 | | - $stableOutput = FlaggedRevs::getPageCache( $this, $anon ); |
| 195 | | - if ( $stableOutput == false && $wgUser->getId() ) { |
| 196 | | - $stableOutput = FlaggedRevs::getPageCache( $this, $wgUser ); |
| 197 | | - } |
| 198 | | - # Regenerate the parser output as needed... |
| 199 | | - if ( $stableOutput == false ) { |
| 200 | | - $text = $srev->getRevText(); |
| 201 | | - $stableOutput = FlaggedRevs::parseStableText( $this, $text, $srev->getRevId() ); |
| 202 | | - # Update the stable version cache |
| 203 | | - FlaggedRevs::updatePageCache( $this, $anon, $stableOutput ); |
| 204 | | - } |
| 205 | | - } |
| 206 | | - if ( is_null( $currentOutput ) || !isset( $currentOutput->fr_newestTemplateID ) ) { |
| 207 | | - # Get parsed current version |
| 208 | | - $parserCache = ParserCache::singleton(); |
| 209 | | - $currentOutput = false; |
| 210 | | - $anon = new User(); // anon cache most likely to exist |
| 211 | | - # If $text is set, then the stableOutput is new. In that case, |
| 212 | | - # the current must also be new to avoid sync goofs. |
| 213 | | - if ( !isset( $text ) ) { |
| 214 | | - $currentOutput = $parserCache->get( $this, $anon ); |
| 215 | | - if ( $currentOutput == false && $wgUser->getId() ) { |
| 216 | | - $currentOutput = $parserCache->get( $this, $wgUser ); |
| 217 | | - } |
| 218 | | - } |
| 219 | | - # Regenerate the parser output as needed... |
| 220 | | - if ( $currentOutput == false ) { |
| 221 | | - global $wgParser; |
| 222 | | - $source = $this->getContent(); |
| 223 | | - $options = FlaggedRevs::makeParserOptions( $anon ); |
| 224 | | - $currentOutput = $wgParser->parse( $source, $this->getTitle(), |
| 225 | | - $options, /*$lineStart*/true, /*$clearState*/true, $this->getLatest() ); |
| 226 | | - # Might as well save the cache while we're at it |
| 227 | | - if ( $wgEnableParserCache ) { |
| 228 | | - $parserCache->save( $currentOutput, $this, $anon ); |
| 229 | | - } |
| 230 | | - } |
| 231 | | - } |
| 232 | 186 | # Since the stable and current revisions have the same text and only outputs, |
| 233 | 187 | # the only other things to check for are template and file differences in the output. |
| 234 | 188 | # (a) Check if the current output has a newer template/file used |
| 235 | 189 | # (b) Check if the stable version has a file/template that was deleted |
| 236 | | - $synced = ( |
| 237 | | - !$stableOutput->fr_includeErrors && // deleted since |
| 238 | | - FlaggedRevs::includesAreSynced( $stableOutput, $currentOutput ) |
| 239 | | - ); |
| | 190 | + $synced = ( !$srev->findPendingTemplateChanges() && !$srev->findPendingFileChanges() ); |
| 240 | 191 | # Save to cache. This will be updated whenever the page is touched. |
| 241 | 192 | $data = FlaggedRevs::makeMemcObj( $synced ? "true" : "false" ); |
| 242 | 193 | $wgMemc->set( $key, $data, $wgParserCacheExpireTime ); |
| Property changes on: branches/wmf/1.16wmf4/extensions/FlaggedRevs |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 243 | 194 | Merged /trunk/extensions/FlaggedRevs:r68032-68054,68056-68057 |