r67116 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r67115‎ | r67116 | r67117 >
Date:20:56, 30 May 2010
Author:aaron
Status:deferred
Tags:
Comment:
* Edit checkbox and changeSaveButton() fixes
* Added sanity check to isDiffFromStable
* Fixed diff msg after saving old, unflagged, rev
* Tweaked help links
* Doc tweaks
Modified paths:
  • /trunk/extensions/FlaggedRevs/FlaggedArticle.php (modified) (history)
  • /trunk/extensions/FlaggedRevs/FlaggedArticleView.php (modified) (history)
  • /trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php (modified) (history)
  • /trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php (modified) (history)

Diff [purge]

Index: trunk/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php
——@@ -110,13 +110,13 @@
111111 'revreview-depth-4' => 'Featured',
112112 'revreview-draft-title' => 'Pending changes are displayed on this page',
113113 'revreview-edit' => 'Edit',
114 - 'revreview-editnotice' => '\'\'\'Your changes will be accepted once an authorized user reviews them. ([[{{MediaWiki:Validationpage}}|?]])\'\'\'',
 114+ 'revreview-editnotice' => '\'\'\'Your changes will be accepted once an authorized user reviews them. ([[{{MediaWiki:Validationpage}}|help]])\'\'\'',
115115 'revreview-check-flag' => 'Accept the pending changes',
116116 'revreview-check-flag-title' => 'Accept all the currently pending changes along with your own edit.
117117 Only use this if you have already seen the entire pending changes diff.',
118118 'revreview-submitedit' => 'Submit changes',
119119 'revreview-submitedit-title' => 'Submit your changes for review',
120 - 'revreview-edited' => '\'\'\'Changes will be accepted once an authorized user reviews them. ([[{{MediaWiki:Validationpage}}|?]])\'\'\'
 120+ 'revreview-edited' => '\'\'\'Your changes will be accepted once an authorized user reviews them. ([[{{MediaWiki:Validationpage}}|help]])\'\'\'
121121
122122 There {{PLURAL:$2|is|are}} [{{fullurl:{{FULLPAGENAMEE}}|oldid=$1&diff=cur&diffonly=0}} $2 pending {{PLURAL:$2|change|changes}}] \'\'(shown below)\'\' awaiting review.',
123123 'revreview-edited-section' => 'Return to page section named "[[#$1|$2]]".',
——@@ -189,10 +189,14 @@
190190 Please hit the "back" button in your browser and try again.',
191191 'revreview-update' => '\'\'\'Please [[{{MediaWiki:Validationpage}}|review]] any pending changes \'\'(shown below)\'\' made to the accepted version.\'\'\'
192192 You may first need to follow-up on or "undo" edits.',
193 - 'revreview-update-edited' => '<span class="flaggedrevs_important">Your changes have not yet been accepted. There are previous edits pending review.</span>
 193+ 'revreview-update-edited' => '<span class="flaggedrevs_important">Your changes have not yet been accepted.</span>
194194
195195 Please review all the changes shown below to make your edits accepted.
196196 You may first need to follow-up on or "undo" edits.',
 197+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">Your changes have not yet been accepted. There are previous changes pending review.</span>
 198+
 199+Please review all the changes shown below to make your edits accepted.
 200+You may first need to follow-up on or "undo" edits.',
197201 'revreview-update-includes' => '\'\'\'Some templates/files were updated:\'\'\'',
198202 'revreview-update-use' => '\'\'\'NOTE:\'\'\' The accepted version of each of these templates/files is used in the accepted version of this page.',
199203 'revreview-visibility' => '\'\'\'This page has an updated [[{{MediaWiki:Validationpage}}|accepted version]]; page stability settings can be [{{fullurl:{{#Special:Stabilization}}|page={{FULLPAGENAMEE}}}} configured].\'\'\'',
——@@ -252,7 +256,7 @@
253257 'tooltip-ca-stable' => 'View the accepted version of this page',
254258 'tooltip-ca-default' => 'Quality assurance settings',
255259
256 - 'flaggedrevs-protect-legend' => 'Automatic edit acceptance ([[{{MediaWiki:Validationpage}}|?]])',
 260+ 'flaggedrevs-protect-legend' => 'Automatic edit acceptance ([[{{MediaWiki:Validationpage}}|help]])',
257261 'flaggedrevs-protect-none' => 'Allow all users',
258262 'flaggedrevs-protect-basic' => 'Default settings',
259263
——@@ -679,7 +683,7 @@
680684 'revreview-toggle-title' => 'shfaqje / fshih detajet',
681685 'revreview-toolow' => '\'\'\'Ju duhet të kursit të secilit prej atributeve më të larta se "paaprovuar" në mënyrë që për një rishikim të merren parasysh rishikohet.\'\'\' Për të hequr statusin shqyrtimin e rishikimit, i vendosur të gjitha fushat për të "paaprovuar". Ju lutem goditi "mbrapa "butonin e shfletuesit tuaj dhe provoni përsëri.',
682686 'revreview-update' => "Ju lutem [[{{MediaWiki:Validationpage}}|rishikim]] ndonjë ndryshim në pritje''(treguar më poshtë),''e bëra në versionin e botuar.",
683 - 'revreview-update-edited' => '<span class="flaggedrevs_important">Ndryshimet juaja ende nuk janë botuar.</span> Ka redaktimet e mëparshme në pritje të shqyrtimit. Për të publikojë ndryshimet tuaj, ju lutemi shqyrtimin e të gjitha ndryshimet e treguar më poshtë.',
 687+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">Ndryshimet juaja ende nuk janë botuar.</span> Ka redaktimet e mëparshme në pritje të shqyrtimit. Për të publikojë ndryshimet tuaj, ju lutemi shqyrtimin e të gjitha ndryshimet e treguar më poshtë.',
684688 'revreview-update-includes' => "'''Disa templates / Fotografi të ishin më të azhornuara:'''",
685689 'revreview-update-use' => "'''Shënim:''' Versioni i publikuar të secilit prej këtyre templates / fotografi është përdorur në versionin e publikuar të kësaj faqeje.",
686690 'revreview-visibility' => "'''Kjo faqe është e azhurnuar [[{{MediaWiki:Validationpage}}|publikuar versionin]]; settings faqe e stabilitetit mund të [{{fullurl:{{#Special:Stabilization}}|page={{FULLPAGENAMEE}}}} konfiguruar ].'''",
——@@ -1724,7 +1728,7 @@
17251729 Калі ласка, націсьніце ў Вашым браўзэры кнопку «вярнуцца» і паспрабуйце зноў.",
17261730 'revreview-update' => "'''Калі ласка, [[{{MediaWiki:Validationpage}}|прарэцэнзуйце]] ўсе зьмены ''(паказаныя ніжэй)'', зробленыя ў апублікаванай вэрсіі.'''
17271731 Верагодна спачатку Вам неабходна прыняць рэдагаваньні ці іх «адмяніць».",
1728 - 'revreview-update-edited' => '<span class="flaggedrevs_important">Вашыя зьмены яшчэ не былі прынятыя. Існуюць рэдагаваньні, якія чакаюць рэцэнзаваньня.</span>
 1732+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">Вашыя зьмены яшчэ не былі прынятыя. Існуюць рэдагаваньні, якія чакаюць рэцэнзаваньня.</span>
17291733
17301734 Калі ласка, прарэцэензуйце ўсе зьмены пададзеныя ніжэй, каб прыняць Вашыя рэдагаваньні.
17311735 Верагодна спачатку Вам неабходна прыняць рэдагаваньні ці іх «адмяніць».',
——@@ -2150,7 +2154,7 @@
21512155 Implijit bouton \"disteiñ\" ho merder ha klaskit en-dro.",
21522156 'revreview-update' => "'''Mar plij [[{{MediaWiki:Validationpage}}|adlennit]] an holl gemmoù ''(diskouezet a-is)'' bet graet d'ar stumm degemeret.'''
21532157 Marteze ho po da reizhañ pe \"tennañ\" kemmoù 'zo da gentañ.",
2154 - 'revreview-update-edited' => '<span class="flaggedrevs_important">N\'eo ket bet degemeret ho kemmoù c\'hoazh. Kemmoù all a zo o c\'hortoz bezañ adlennet.</span>
 2158+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">N\'eo ket bet degemeret ho kemmoù c\'hoazh. Kemmoù all a zo o c\'hortoz bezañ adlennet.</span>
21552159
21562160 Rankout a rit adlenn an holl gemmoù diskouezet a-is.
21572161 Marteze ho po da reizhañ pe "tennañ" kemmoù \'zo da gentañ.',
——@@ -2930,7 +2934,7 @@
29312935 Klicke auf die „Zurück“-Schaltfläche deines Browsers und versuche es erneut.",
29322936 'revreview-update' => "'''Bitte [[{{MediaWiki:Validationpage}}|überprüfe]] alle nicht überprüften Änderungen ''(siehe unten)'', die seit der neuesten freigegebenen Version gemacht wurden.'''
29332937 Gegebenenfalls musst du zunächst diese Bearbeitungen nachvollziehen oder ''rückgängig'' machen.",
2934 - 'revreview-update-edited' => "<span class=\"flaggedrevs_important\">Deine Änderungen wurden bislang nicht übernommen. Es gibt ältere Bearbeitungen, die noch überprüft werden müssen.</span>
 2938+ 'revreview-update-edited-prev' => "<span class=\"flaggedrevs_important\">Deine Änderungen wurden bislang nicht übernommen. Es gibt ältere Bearbeitungen, die noch überprüft werden müssen.</span>
29352939
29362940 Bitte überprüfte alle unten angezeigten Änderungen, damit deine Bearbeitungen übernommen werden können.
29372941 Gegebenenfalls musst du zunächst diese Bearbeitungen nachvollziehen oder ''rückgängig'' machen.",
——@@ -3389,7 +3393,7 @@
33903394 Pšosym klikni na tłocašk \"Slědk\" w swójom wobglědowaku a wopytaj hyšći raz.",
33913395 'revreview-update' => "'''Pšosym [[{{MediaWiki:Validationpage}}|pśeglědaj]] ''(slědujuce)'' njepśeglědane změny, kótarež su se na akceptěrowanej wersiji pśewjedli.'''
33923396 Musyš nejpjerwjeje změny dalej wobźěłaś abo \"slědk wześ\".",
3393 - 'revreview-update-edited' => '<span class="flaggedrevs_important">Twóje změny hyšći njejsu akceptěrowane. Su hyšći njepśeglědane změny.</span>
 3397+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">Twóje změny hyšći njejsu akceptěrowane. Su hyšći njepśeglědane změny.</span>
33943398
33953399 Pšosym pśeglědaj wšykne slědujuce změny, aby je akoakceptěrowane markěrował.
33963400 Musy nejpjerwjej změny dalej wobźełaś abo je "slědk wześ".',
——@@ -3733,7 +3737,7 @@
37343738
37353739 Bonvolu klaki la "reiri" butonon en via retumilo kaj reprovu.',
37363740 'revreview-update' => "Bonvolu [[{{MediaWiki:Validationpage}}|kontroli]] iujn kontrolendajn ŝanĝojn ''(montritajn suben)'' faritajn al la publikigita versio:'''",
3737 - 'revreview-update-edited' => '<span class="flaggedrevs_important">Viaj ŝanĝoj ankoraŭ publikigitaj.</span>
 3741+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">Viaj ŝanĝoj ankoraŭ publikigitaj.</span>
37383742
37393743 Estas antaŭaj kontrolendaj redaktoj. Publikigi viajn ŝanĝojn, bonvolu kontroli ĉiujn jenajn ŝanĝojn.',
37403744 'revreview-update-includes' => "'''Iuj ŝablonoj/bildoj estis ĝisdatigitaj:'''",
——@@ -3976,7 +3980,7 @@
39773981 Por favor presiona el botón ''atrás'' en tu navegador e intenta de nuevo.",
39783982 'revreview-update' => "'''Por favor,[[{{MediaWiki:Validationpage}}|revisa]] los cambios pendientes ''(que se muestran a continuación)'' hechos en la versión aceptada.'''
39793983 Primero tendrás que hacer un seguimiento de las ediciones, o \"deshacerlas\".",
3980 - 'revreview-update-edited' => '<span class="flaggedrevs_important">Tus cambios no han sido aceptados aún. Hay ediciones previas pendientes de ser revisadas.</span>
 3984+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">Tus cambios no han sido aceptados aún. Hay ediciones previas pendientes de ser revisadas.</span>
39813985
39823986 Por favor, revisa todos los cambios mostrados a continuación para que se acepten tus ediciones.
39833987 Primero tendrás que hacer un seguimiento de las ediciones, o "deshacerlas".',
——@@ -4694,7 +4698,7 @@
46954699 Veuillez utiliser le bouton « retour » de votre navigateur puis essayez de nouveau.",
46964700 'revreview-update' => "Veuillez [[{{MediaWiki:Validationpage}}|relire]] toutes les modifications ''(voir ci-dessous)'' apportées à la version acceptée.
46974701 Vous pourriez d'abord avoir à corriger ou « défaire » certaines modifications.",
4698 - 'revreview-update-edited' => '<span class="flaggedrevs_important">Vos modifications n\'ont pas encore été acceptées. Il y a de précédentes modifications en attente de relecture.</span>
 4702+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">Vos modifications n\'ont pas encore été acceptées. Il y a de précédentes modifications en attente de relecture.</span>
46994703
47004704 Vous devez relire toutes les modifications affichées ci-dessous.
47014705 Vous pourriez d\'abord avoir à corriger ou « défaire » certaines modifications.',
——@@ -5170,7 +5174,7 @@
51715175 Por favor, prema sobre o botón \"Volver\" do seu navegador e inténteo de novo.",
51725176 'revreview-update' => "'''[[{{MediaWiki:Validationpage}}|Revise]] os cambios pendentes ''(amósanse a continuación)'' feitos á versión aceptada.'''
51735177 Quizais queira corrixir ou desfacer algunhas modificacións.",
5174 - 'revreview-update-edited' => '<span class="flaggedrevs_important">Aínda non se aceptaron os seus cambios. Hai edicións previas pendentes de revisión.</span>
 5178+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">Aínda non se aceptaron os seus cambios. Hai edicións previas pendentes de revisión.</span>
51755179
51765180 Para aceptar as súas edicións, revise todos os cambios listados a continuación.
51775181 Quizais queira corrixir ou desfacer algunhas modificacións.',
——@@ -5491,7 +5495,7 @@
54925496 Bitte druck uf dr „Zruck“-Chnopf un versuech s nonemol.",
54935497 'revreview-update' => "'''Bitte [[{{MediaWiki:Validationpage}}|prief]] di hängige Änderige ''(lueg unte)'', wu syt dr letschte vereffetligte Version gmacht wore sin.'''
54945498 S cha syy, ass Du zerscht Bearbeitige muesch noogoh oder si muesch zrucksetze.",
5495 - 'revreview-update-edited' => '<span class="flaggedrevs_important">Dyy Änderige sin nonig vereffentligt wore. S het no vorigi Änderige, wu hängig sin. </span>
 5499+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">Dyy Änderige sin nonig vereffentligt wore. S het no vorigi Änderige, wu hängig sin. </span>
54965500
54975501 Go Dyyni Änderige vereffetlige, due bitte alli hängige Änderige priefe, wu do aazeigt wäre. S cha syy, ass Du zerscht Bearbeitige muesch noogoh oder si muesch zrucksetze.',
54985502 'revreview-update-includes' => "'''E paar Vorlage/Dateie sin aktualisiert wore:'''",
——@@ -6304,7 +6308,7 @@
63056309 Prošu klikń na tłóčatko \"Wróćo\" w swojim wobhladowaku a spytaj hišće raz.",
63066310 'revreview-update' => "'''Prošu [[{{MediaWiki:Validationpage}}|přepruwuj]] njepřepruwowane změny ''(hlej deleka)'', kotrež buchu na akceptowanej wersiji přewjedźene.'''
63076311 Dyrbiš snano změny dale wobźěłać abo je' 'cofnyć''.",
6308 - 'revreview-update-edited' => '<span class="flaggedrevs_important">Twoje změny hišće njejsu so akceptowali. Su hišće njepřepruwowane změny.</span>
 6312+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">Twoje změny hišće njejsu so akceptowali. Su hišće njepřepruwowane změny.</span>
63096313
63106314 Přepruwuj prošu wšě změny, kotrež so deleka pokazuja, zo bychu so twoje změny akceptowali.
63116315 Dyrbiš snano změny dale wobdźěłać abo "cofnyć".',
——@@ -6534,7 +6538,7 @@
65356539
65366540 Kattints a böngésződ „Vissza” gombjára, majd próbáld újra.",
65376541 'revreview-update' => "Kérlek [[{{MediaWiki:Validationpage}}|ellenőrizd]] a közzétett változat utáni, még ellenőrzésre váró változtatásokat ''(lásd alább)''.",
6538 - 'revreview-update-edited' => "<span class=\"flaggedrevs_important\">A változtatásaid még nincsenek közzétéve.</span>
 6542+ 'revreview-update-edited-prev' => "<span class=\"flaggedrevs_important\">A változtatásaid még nincsenek közzétéve.</span>
65396543
65406544 A tiédet megelőző szerkesztések várnak ellenőrzésre. Ahhoz, hogy közzétedd a változtatásaidat, kérlek ellenőrizd ''az összes'' alább látható változtatást.",
65416545 'revreview-update-includes' => "'''Néhány sablon vagy fájl megváltozott:'''",
——@@ -6777,7 +6781,7 @@
67786782 Per favor preme le button \"retro\" in tu navigator e reproba.",
67796783 'revreview-update' => "'''Per favor [[{{MediaWiki:Validationpage}}|revide]] omne modificationes pendente ''(monstrate hic infra)'' facite al version acceptate.'''
67806784 Pote esser necessari primo investigar o \"disfacer\" modificationes.",
6781 - 'revreview-update-edited' => '<span class="flaggedrevs_important">Tu modificationes non ha ancora essite acceptate. Il ha previe modificationes attendente revision.</span>
 6785+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">Tu modificationes non ha ancora essite acceptate. Il ha previe modificationes attendente revision.</span>
67826786
67836787 Per favor revide tote le modificationes monstrate hic infra pro facer acceptar tu modificationes.
67846788 Pote esser necessari primo investigar o "disfacer" modificationes.',
——@@ -7416,7 +7420,7 @@
74177421
74187422 ブラウザの「戻る」ボタンを押して再試行してください。",
74197423 'revreview-update' => "'''承認版に加えられた保留中の変更 (''下記参照'') を[[{{MediaWiki:Validationpage}}|査読]]してください。'''過去の編集を追跡したり、取り消す必要があるかもしれません。",
7420 - 'revreview-update-edited' => '<span class="flaggedrevs_important">あなたの加えた変更はまだ公開されていません。あなたの編集よりも前になされた査読待ちの編集があります。</span>
 7424+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">あなたの加えた変更はまだ公開されていません。あなたの編集よりも前になされた査読待ちの編集があります。</span>
74217425
74227426 あなたの変更が承認されるには、下記の変更をすべて査読してください。過去の編集を追跡したり、取り消す必要があるかもしれません。',
74237427 'revreview-update-includes' => "'''更新されたテンプレートやファイルがあります:'''",
——@@ -8290,7 +8294,7 @@
82918295 브라우저의 "뒤로" 버튼을 눌러 다시 시도하십시오.',
82928296 'revreview-update' => "'''승인된 판에 이루어진 아래의 검토를 기다리고 있는 편집을 [[{{MediaWiki:Validationpage}}|검토]]해주십시오.'''
82938297 필요하다면 내용을 보충하거나 편집을 되돌리십시오.",
8294 - 'revreview-update-edited' => '<span class="flaggedrevs_important">당신의 편집은 아직 승인되지 않았습니다. 편집 이전에 검토를 기다리고 있는 편집이 있습니다.</span>
 8298+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">당신의 편집은 아직 승인되지 않았습니다. 편집 이전에 검토를 기다리고 있는 편집이 있습니다.</span>
82958299
82968300 당신의 편집을 승인하시려면 아래에 보이는 모든 편집 사항을 검토해주십시오.
82978301 필요하다면 내용을 보충하거나 편집을 되돌리십시오.',
——@@ -8744,7 +8748,7 @@
87458749 Klickt w.e.g op den ''Zréck''-Knäppche vun Ärem Browser a versicht et nach eng Kéier.",
87468750 'revreview-update' => "'''[[{{MediaWiki:Validationpage}}|Kuckt]] w.e.g. all Ännerungen no ''(déi ënnendrënner gewise sinn)'' déi no der publizéiert Versioun gemaach goufen.'''
87478751 Et ka sinn datt Dir d'éischt Ännerungen noverfolgen oder ''zerécksetze'' musst.",
8748 - 'revreview-update-edited' => "<span class=\"flaggedrevs_important\">Är Ännerungen goufen nach net akzeptéiert. Et gëtt vireg Ännerungen déi drop waarde fir nogekuckt ze ginn.</span>
 8752+ 'revreview-update-edited-prev' => "<span class=\"flaggedrevs_important\">Är Ännerungen goufen nach net akzeptéiert. Et gëtt vireg Ännerungen déi drop waarde fir nogekuckt ze ginn.</span>
87498753
87508754 Kuckt w.e.g. all d'Ännerungen hei drënner no fir datt Är Ännerungen akzeptéiert ginn.
87518755 Et ka sinn datt Dir d'éischt Ännerungen noverfolgen oder ''zrécksetze'' musst.",
——@@ -9151,7 +9155,7 @@
91529156
91539157 Притиснете на копчето „назад“ во вашиот прелистувач и обидете се повторно.",
91549158 'revreview-update' => "'''[[{{MediaWiki:Validationpage}}|проверете]] ги промените ''(прикажани подолу)'' направени на прифатената верзија.'''",
9155 - 'revreview-update-edited' => '<span class="flaggedrevs_important">Вашите промени сè уште не се прифатени.</span> Постојат претходни уредувања што чекаат на проверка.</span>
 9159+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">Вашите промени сè уште не се прифатени.</span> Постојат претходни уредувања што чекаат на проверка.</span>
91569160
91579161 Проверете ги сите долунаведени промени за да ви бидат прифатени вашите уредувања.
91589162 Најпрвин можеби ќе треба да проследите или „вратите“ некои уредувања.',
——@@ -9388,7 +9392,7 @@
93899393 താങ്കളുടെ ബ്രൗസറിന്റെ "ബാക്ക്" ബട്ടൺ ഞെക്കി പിന്നോട്ട് പോയി വീണ്ടും ശ്രമിക്കുക.',
93909394 'revreview-update' => "'''ദയവായി അവശേഷിക്കുന്ന മാറ്റങ്ങൾ ''(താഴെ കൊടുത്തിരിക്കുന്നു)'' [[{{MediaWiki:Validationpage}}|സംശോധനം ചെയ്ത്]] അംഗീകരിക്കപ്പെട്ട പതിപ്പ് ആക്കുക.'''
93919395 ആദ്യം തിരുത്തലുകൾ \"തിരസ്കരിക്കുകയോ\", പൂർത്തീകരിക്കുകയോ ചെയ്യേണ്ടിയിരിക്കാം.",
9392 - 'revreview-update-edited' => '<span class="flaggedrevs_important">താങ്കൾ വരുത്തിയ മാറ്റങ്ങൾ ഇതുവരെ സ്വീകരിച്ചിട്ടില്ല, പഴയ മാറ്റങ്ങൾ സംശോധനത്തിന് അവശേഷിക്കുന്നു.</span>
 9396+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">താങ്കൾ വരുത്തിയ മാറ്റങ്ങൾ ഇതുവരെ സ്വീകരിച്ചിട്ടില്ല, പഴയ മാറ്റങ്ങൾ സംശോധനത്തിന് അവശേഷിക്കുന്നു.</span>
93939397
93949398 താങ്കളുടെ തിരുത്തലുകൾ സ്വീകരിക്കാൻ താഴെ കൊടുത്തിരിക്കുന്ന മാറ്റങ്ങൾ സംശോധനം ചെയ്യുക.
93959399 ആദ്യം തിരുത്തലുകൾ "തിരസ്കരിക്കുകയോ", പൂർത്തീകരിക്കുകയോ ചെയ്യേണ്ടിയിരിക്കാം.',
——@@ -10023,7 +10027,7 @@
1002410028 Klik op de knop "Terug" in uw browser en probeer het opnieuw.',
1002510029 'revreview-update' => "'''[[{{MediaWiki:Validationpage}}|Controleer]] alstublieft de ''onderstaande'' wijzigingen ten opzichte van de gepubliceerde versie.'''
1002610030 Wellicht dient u eerst correcties uit te voeren of bewerkingen ongedaan te maken.",
10027 - 'revreview-update-edited' => '<span class="flaggedrevs_important">Uw wijzigingen zijn nog niet gepubliceerd. Er moeten nog bewerkingen gecontroleerd worden.</span>
 10031+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">Uw wijzigingen zijn nog niet gepubliceerd. Er moeten nog bewerkingen gecontroleerd worden.</span>
1002810032
1002910033 Controleer alle hieronder weergegeven wijzigingen om ook uw bewerking te publiceren.
1003010034 Wellicht dient u eerst correcties uit te voeren of bewerkingen ongedaan te maken.',
——@@ -10440,7 +10444,7 @@
1044110445 Klikk på «tilbake»-knappen i nettleseren din og prøv igjen.",
1044210446 'revreview-update' => "'''[[{{MediaWiki:Validationpage}}|Revider]] ventende endringer ''(vist nedenfor)'' som har blitt gjort på den aksepterte versjonen.'''
1044310447 Du må kanskje følge opp eller «angre» endringer først.",
10444 - 'revreview-update-edited' => '<span class="flaggedrevs_important">Dine endringer har ikke blitt akseptert ennå. Det finnes tidligere endringer som venter på revidering.</span>
 10448+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">Dine endringer har ikke blitt akseptert ennå. Det finnes tidligere endringer som venter på revidering.</span>
1044510449
1044610450 Se igjennom alle endringene vist nedenfor for å gjøre endringene dine akseptert.
1044710451 Du må kanskje følge opp eller «angre» endringer først.',
——@@ -11126,7 +11130,7 @@
1112711131
1112811132 Për piasì, ch'a sgnaca ël boton \"andré\" an sò navigador e ch'a preuva torna.",
1112911133 'revreview-update' => "Për piasì [[{{MediaWiki:Validationpage}}|ch'a revision-a]] tuti ij cangiament an cors ''(smonù ambelessì-sota)'' fàit a la version publicà.",
11130 - 'revreview-update-edited' => '<span class="flaggedrevs_important">Ij sò cambiament a son anco\' pa stàit publicà.</span>
 11134+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">Ij sò cambiament a son anco\' pa stàit publicà.</span>
1113111135
1113211136 A-i son dle revision an cors ëd modìfiche precedente. Për publiché ij sò cambiament, për piasì ch\'a revision-a tùit ij cambiament mostrà sì-sota.',
1113311137 'revreview-update-includes' => "'''Chèich stamp o archivi a son ëstàit cangià:'''",
——@@ -11393,7 +11397,7 @@
1139411398 Clique o botão \"voltar\" do seu browser e tente novamente, por favor.",
1139511399 'revreview-update' => "'''[[{{MediaWiki:Validationpage}}|Reveja]] quaisquer alterações pendentes ''(mostradas abaixo)'' que tenham sido feitas à versão aceite, por favor.'''
1139611400 Pode ser necessário primeiro investigar ou \"reverter\" algumas edições.",
11397 - 'revreview-update-edited' => '<span class="flaggedrevs_important">As suas alterações ainda não foram aceites. Edições anteriores aguardam revisão.</span>
 11401+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">As suas alterações ainda não foram aceites. Edições anteriores aguardam revisão.</span>
1139811402
1139911403 Reveja todas as alterações mostradas abaixo para que as suas edições sejam aceites, por favor.
1140011404 Pode ser necessário primeiro investigar ou "reverter" algumas edições.',
——@@ -12049,7 +12053,7 @@
1205012054 Пожалуйста, нажмите в браузере кнопку «назад», чтобы указать значения заново.",
1205112055 'revreview-update' => "'''Пожалуйста, [[{{MediaWiki:Validationpage}}|проверьте]] изменения ''(показаны ниже)'', сделанные в принятой версии.'''
1205212056 Возможно, вам потребуется сначала пройти по правкам или отменить их.",
12053 - 'revreview-update-edited' => '<span class="flaggedrevs_important">Изменения не были приняты. Существуют более ранние правки, требующие проверки.</span>
 12057+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">Изменения не были приняты. Существуют более ранние правки, требующие проверки.</span>
1205412058
1205512059 Чтобы опубликовать ваши изменения, пожалуйста, проверьте все изменения, показанные ниже.
1205612060 Возможно, вам потребуется сначала пройти по правкам или отменить их.',
——@@ -14099,7 +14103,7 @@
1410014104 Lütfen tarayıcınızdaki "geri" tuşuna basın ve tekrar deneyin.',
1410114105 'revreview-update' => "'''Lütfen kabul edilmiş sürüme yapılan bekleyen her değişikliği ''(aşağıda gösterilmiş)'' [[{{MediaWiki:Validationpage}}|gözden geçirin]].'''
1410214106 Önce, takip etmeniz veya değişiklikleri \"geri almanız\" gerekebilir.",
14103 - 'revreview-update-edited' => '<span class="flaggedrevs_important">Değişiklikleriniz henüz yayınlanmadı.</span>
 14107+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">Değişiklikleriniz henüz yayınlanmadı.</span>
1410414108
1410514109 Gözden geçirme bekleyen önceki değişiklikler var. Değişikliklerinizi yayınlamak için, lütfen aşağıda gösterilen tüm değişiklikleri gözden geçirin.',
1410614110 'revreview-update-includes' => "'''Bazı şablonlar/dosyalar güncellenmiş:'''",
——@@ -14328,7 +14332,7 @@
1432914333
1433014334 Будь ласка, натисніть кнопку «Назад» у браузері і спробуйте ще раз.",
1433114335 'revreview-update' => "Будь ласка, [[{{MediaWiki:Validationpage}}|перевірте]] всі нерецензовані зміни опублікованої версії ''(показані нижче)''.",
14332 - 'revreview-update-edited' => '<span class="flaggedrevs_important">Ваші зміни ще не опубліковані.</span>
 14336+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">Ваші зміни ще не опубліковані.</span>
1433314337
1433414338 Попередні редагування очікують на перевірку. Щоб опублікувати ваші зміни, будь-ласка, перевірте усі зміни, що показані нижче.',
1433514339 'revreview-update-includes' => "'''Деякі шаблони або файли були оновлені:'''",
——@@ -15579,7 +15583,7 @@
1558015584
1558115585 請在您的瀏覽器點擊“返回“按鈕，然後再試一次。',
1558215586 'revreview-update' => '請[[{{MediaWiki:Validationpage}}|複審]]自從於這頁的穩定版以來的任何更改 （在下面顯示） 。模版和圖片亦可能同時更改。',
15583 - 'revreview-update-edited' => '<span class="flaggedrevs_important">您的變更尚未發佈。</span>
 15587+ 'revreview-update-edited-prev' => '<span class="flaggedrevs_important">您的變更尚未發佈。</span>
1558415588 以前的編輯有等待審核。要發布您的變更，請檢查所有的變化 (如下)。',
1558515589 'revreview-update-includes' => "'''一些模板/文件已被更新：'''",
1558615590 'revreview-update-use' => "'''注意：'''發布的版本每個這些模板/文件是用於發布的版本的這一頁。",
Index: trunk/extensions/FlaggedRevs/FlaggedArticle.php
——@@ -126,7 +126,7 @@
127127 }
128128
129129 /**
130 - * Get latest quality rev, if not, the latest reviewed one
 130+ * Get the stable revision
131131 * @param int $flags
132132 * @return mixed (FlaggedRevision/false)
133133 */
——@@ -146,6 +146,16 @@
147147 }
148148
149149 /**
 150+ * Get the stable revision ID
 151+ * @param int $flags
 152+ * @return int
 153+ */
 154+ public function getStable( $flags = 0 ) {
 155+ $srev = $this->getStableRev( $flags );
 156+ return $srev ? $srev->getRevId() : 0;
 157+ }
 158+
 159+ /**
150160 * Get visiblity restrictions on page
151161 * @param int $flags, FR_MASTER
152162 * @returns array (select,override)
Index: trunk/extensions/FlaggedRevs/FlaggedRevs.hooks.php
——@@ -874,10 +874,11 @@
875875 }
876876
877877 /**
878 - * When an edit is made by a reviewer, if the base revision the
879 - * edit was made from is the stable version, or the edit is a reversion
880 - * to the stable version, then try to automatically review it.
881 - * Also automatically review if the "review this revision" box is checked.
 878+ * When an edit is made by a user, review it if either:
 879+ * (a) The user can 'autoreview' and the edit's base revision is a checked
 880+ * (b) The edit is a self-revert to the stable version (by anyone)
 881+ * (c) The user can 'autoreview' new pages and this edit is a new page
 882+ * (d) The user can 'review' and the "review pending edits" checkbox was checked
882883 *
883884 * Note: RC items not inserted yet, RecentChange_save hook does rc_patrolled bit...
884885 */
Index: trunk/extensions/FlaggedRevs/FlaggedArticleView.php
——@@ -363,7 +363,11 @@
364364 # If they are synced, do special styling
365365 $simpleTag = !$synced;
366366 # Give notice to newer users if an unreviewed edit was completed...
367 - if ( !$synced && $wgRequest->getVal( 'shownotice' ) && !$wgUser->isAllowed( 'review' ) ) {
 367+ if ( $wgRequest->getVal( 'shownotice' )
 368+ && $this->article->getUserText() == $wgUser->getName() // FIXME: rawUserText?
 369+ && $srev->getRevId() != $this->article->getLatest()
 370+ && !$wgUser->isAllowed( 'review' ) )
 371+ {
368372 $revsSince = FlaggedRevs::getRevCountSince( $this->article, $srev->getRevId() );
369373 $tooltip = wfMsgHtml( 'revreview-draft-title' );
370374 $pending = $prot;
——@@ -615,6 +619,7 @@
616620 }
617621
618622 /**
 623+ * Add diff-to-stable to top of page views as needed
619624 * @param FlaggedRevision $srev, stable version
620625 * @param bool $quality, revision is quality
621626 * @returns bool, diff added to output
——@@ -1227,32 +1232,39 @@
12281233 $notice = wfMsgExt( 'revreview-update-use', 'parse' );
12291234 }
12301235 } elseif ( !$synced ) {
1231 - $diff->mTitle->invalidateCache(); // bad cache, said they were not synced
 1236+ # Bad cache said they were not synced
 1237+ $this->article->getTitle()->invalidateCache();
12321238 }
12331239
12341240 # If the user is allowed to review, prompt them!
12351241 # Only those if there is something to actually review.
1236 - if ( $newRev->getId() > $oldRev->getId() ) {
1237 - # "Please review" notice...
1238 - $msg = 'revreview-update';
1239 - if ( $wgRequest->getInt( 'shownotice' )
1240 - && $newRev->isCurrent()
1241 - && $newRev->getRawUserText() == $wgUser->getName() )
1242 - {
1243 - $msg = 'revreview-update-edited'; // Reviewer just edited
 1242+ if ( $wgRequest->getInt( 'shownotice' )
 1243+ && $newRev->isCurrent()
 1244+ && $newRev->getRawUserText() == $wgUser->getName() )
 1245+ {
 1246+ // Reviewer just edited...
 1247+ $title = $this->article->getTitle(); // convenience
 1248+ // TODO: make diff class cache
 1249+ $n = $title->countRevisionsBetween( $oldRev->getId(), $newRev->getId() );
 1250+ if ( $n ) {
 1251+ $msg = 'revreview-update-edited-prev'; // previous pending edits
 1252+ } else {
 1253+ $msg = 'revreview-update-edited'; // just couldn't autoreview
12441254 }
1245 - $changeDiv = wfMsgExt( $msg, 'parse' );
1246 - if ( count( $changeList ) ) {
1247 - # Add include change list...
1248 - $changeDiv .= '<p>' .
1249 - wfMsgExt( 'revreview-update-includes', 'parseinline' ) .
1250 - '&#160;' . implode( ', ', $changeList ) . '</p>';
1251 - # Add include usage notice...
1252 - $changeDiv .= $notice;
1253 - }
1254 - $css = 'flaggedrevs_diffnotice plainlinks';
1255 - $form .= "<div id='mw-fr-difftostable' class='$css'>$changeDiv</div>\n";
 1255+ } else {
 1256+ $msg = 'revreview-update'; // generic "Please review" notice...
12561257 }
 1258+ $changeDiv = wfMsgExt( $msg, 'parse' );
 1259+ if ( count( $changeList ) ) {
 1260+ # Add include change list...
 1261+ $changeDiv .= '<p>' .
 1262+ wfMsgExt( 'revreview-update-includes', 'parseinline' ) .
 1263+ '&#160;' . implode( ', ', $changeList ) . '</p>';
 1264+ # Add include usage notice...
 1265+ $changeDiv .= $notice;
 1266+ }
 1267+ $css = 'flaggedrevs_diffnotice plainlinks';
 1268+ $form .= "<div id='mw-fr-difftostable' class='$css'>$changeDiv</div>\n";
12571269
12581270 # Set a key to note that someone is viewing this
12591271 $this->markDiffUnderReview( $oldRev, $newRev );
——@@ -1434,9 +1446,12 @@
14351447 $this->isMultiPageDiff = true;
14361448 // Is there a stable version?
14371449 } elseif ( $this->article->isReviewable() ) {
1438 - $srev = $this->article->getStableRev();
 1450+ $srevId = $this->article->getStable();
14391451 // Is this a diff of a draft rev against the stable rev?
1440 - if ( $srev && $oldRev->getId() == $srev->getRevId() ) {
 1452+ if ( $srevId
 1453+ && $oldRev->getId() == $srevId
 1454+ && $newRev->getTimestamp() >= $oldRev->getTimestamp() )
 1455+ {
14411456 $this->isDiffFromStable = true;
14421457 }
14431458 }
——@@ -1500,12 +1515,17 @@
15011516 * @TODO: would be nice if hook passed in button attribs, not XML
15021517 */
15031518 public function changeSaveButton( EditPage $editPage, array &$buttons ) {
 1519+ $title = $this->article->getTitle(); // convenience
15041520 if ( !$this->article->editsRequireReview() ) {
15051521 return true; // edit will go live immediatly
1506 - } elseif ( !$this->article->editsArePending()
1507 - && $this->article->getTitle()->userCan( 'autoreview' ) )
1508 - {
1509 - return true; // edit will be autoreviewed anyway
 1522+ } elseif ( $title->userCan( 'autoreview' ) ) {
 1523+ if ( FlaggedRevs::autoReviewNewPages() && !$this->article->exists() ) {
 1524+ return true; // edit will be autoreviewed anyway
 1525+ }
 1526+ $frev = FlaggedRevision::newFromTitle( $title, self::getBaseRevId( $editPage ) );
 1527+ if ( $frev ) {
 1528+ return true; // edit will be autoreviewed anyway
 1529+ }
15101530 }
15111531 if ( extension_loaded( 'domxml' ) ) {
15121532 wfDebug( "Warning: you have the obsolete domxml extension for PHP. Please remove it!\n" );
——@@ -1530,17 +1550,19 @@
15311551 */
15321552 public function addReviewCheck( $editPage, &$checkboxes, &$tabindex ) {
15331553 global $wgUser, $wgRequest;
1534 - if ( !$wgUser->isAllowed( 'review' ) ) {
 1554+ if ( !$this->article->isReviewable() || !$wgUser->isAllowed( 'review' ) ) {
15351555 return true;
15361556 } elseif ( FlaggedRevs::autoReviewNewPages() && !$this->article->exists() ) {
15371557 return true; // not needed
15381558 }
1539 - if ( $this->article->isReviewable() ) {
 1559+ $oldid = $wgRequest->getInt( 'oldid', $this->article->getLatest() );
 1560+ if ( $oldid == $this->article->getLatest() ) {
15401561 $srev = $this->article->getStableRev();
15411562 # For pages with either no stable version, or an outdated one, let
15421563 # the user decide if he/she wants it reviewed on the spot. One might
15431564 # do this if he/she just saw the diff-to-stable and *then* decided to edit.
1544 - if ( !$srev || $srev->getRevId() != $this->article->getLatest() ) {
 1565+ # Note: check not shown when editing old revisions, which is confusing.
 1566+ if ( !$srev || $this->article->editsArePending() ) {
15451567 $checkbox = Xml::check(
15461568 'wpReviewEdit',
15471569 $wgRequest->getCheck( 'wpReviewEdit' ),
——@@ -1565,33 +1587,8 @@
15661588 * Note: baseRevId trusted for Reviewers - text checked for others.
15671589 */
15681590 public function addRevisionIDField( EditPage $editPage, OutputPage $out ) {
1569 - global $wgRequest;
15701591 $this->load();
1571 - $article = $editPage->getArticle(); // convenience
1572 - $latestId = $article->getLatest(); // current rev
1573 - $undo = $wgRequest->getIntOrNull( 'undo' );
1574 - # Undoing consecutive top edits...
1575 - if ( $undo && $undo === $latestId ) {
1576 - # Treat this like a revert to a base revision.
1577 - # We are undoing all edits *after* some rev ID (undoafter).
1578 - # If undoafter is not given, then it is the previous rev ID.
1579 - $revId = $wgRequest->getInt( 'undoafter',
1580 - $article->getTitle()->getPreviousRevisionID( $latestId, GAID_FOR_UPDATE ) );
1581 - # Undoing other edits...
1582 - } elseif ( $undo ) {
1583 - $revId = $latestId; // current rev is the base rev
1584 - # Other edits...
1585 - } else {
1586 - # If we are editing via oldid=X, then use that rev ID.
1587 - # Otherwise, check if the client specified the ID (bug 23098).
1588 - $revId = $article->getOldID()
1589 - ? $article->getOldID()
1590 - : $wgRequest->getInt( 'baseRevId' ); // e.g. "show changes"/"preview"
1591 - }
1592 - # Zero oldid => current revision
1593 - if ( !$revId ) {
1594 - $revId = $latestId;
1595 - }
 1592+ $revId = self::getBaseRevId( $editPage );
15961593 $out->addHTML( "\n" . Xml::hidden( 'baseRevId', $revId ) );
15971594 $out->addHTML( "\n" . Xml::hidden( 'undidRev',
15981595 empty( $editPage->undidRev ) ? 0 : $editPage->undidRev )
——@@ -1599,6 +1596,44 @@
16001597 return true;
16011598 }
16021599
 1600+ /**
 1601+ * Guess the rev ID the text of this form is based off
 1602+ * Note: baseRevId trusted for Reviewers - text checked for others.
 1603+ * @return int
 1604+ */
 1605+ protected static function getBaseRevId( EditPage $editPage ) {
 1606+ global $wgRequest;
 1607+ if ( !isset( $editPage->fr_baseRevId ) ) {
 1608+ $article = $editPage->getArticle(); // convenience
 1609+ $latestId = $article->getLatest(); // current rev
 1610+ $undo = $wgRequest->getIntOrNull( 'undo' );
 1611+ # Undoing consecutive top edits...
 1612+ if ( $undo && $undo === $latestId ) {
 1613+ # Treat this like a revert to a base revision.
 1614+ # We are undoing all edits *after* some rev ID (undoafter).
 1615+ # If undoafter is not given, then it is the previous rev ID.
 1616+ $revId = $wgRequest->getInt( 'undoafter',
 1617+ $article->getTitle()->getPreviousRevisionID( $latestId, GAID_FOR_UPDATE ) );
 1618+ # Undoing other edits...
 1619+ } elseif ( $undo ) {
 1620+ $revId = $latestId; // current rev is the base rev
 1621+ # Other edits...
 1622+ } else {
 1623+ # If we are editing via oldid=X, then use that rev ID.
 1624+ # Otherwise, check if the client specified the ID (bug 23098).
 1625+ $revId = $article->getOldID()
 1626+ ? $article->getOldID()
 1627+ : $wgRequest->getInt( 'baseRevId' ); // e.g. "show changes"/"preview"
 1628+ }
 1629+ # Zero oldid => current revision
 1630+ if ( !$revId ) {
 1631+ $revId = $latestId;
 1632+ }
 1633+ $editPage->fr_baseRevId = $revId;
 1634+ }
 1635+ return $editPage->fr_baseRevId;
 1636+ }
 1637+
16031638 /**
16041639 * Adds brief review notes to a page.
16051640 * @param OutputPage $out

Status & tagging log