r76596 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r76595‎ \| r76596 \| r76597 >
Date:	21:11, 12 November 2010
Author:	demon
Status:	ok
Tags:
Comment:	MFT thru r76494
Modified paths:	/branches/chad-pre-wmf-merge/extensions/FlaggedRevs (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedArticleView.php (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedRevision.php (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedRevs.class.php (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedRevs.hooks.php (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedRevs.php (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedRevsXML.php (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/api/ApiQueryReviewedpages.php (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/api/ApiQueryUnreviewedpages.php (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/api/ApiReview.php (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/client/flaggedrevs.css (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/client/flaggedrevs.js (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/client/img/loading-small.gif (deleted) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/client/review.js (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/forms/RevisionReviewForm.php (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/language (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/language/Stabilization.i18n.php (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/language/ValidationStatistics.i18n.php (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/maintenance/reviewAllPages.inc (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/specialpages/PendingChanges_body.php (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/specialpages/QualityOversight_body.php (modified) (history) /branches/chad-pre-wmf-merge/extensions/FlaggedRevs/specialpages/RevisionReview_body.php (modified) (history)

Diff [purge]

Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedRevs.php
—	—	@@ -37,8 +37,8 @@
38	38	define( 'FR_TEXT', 3 );
39	39
40	40	# Level constants...
41		~~-if ( !defined( 'FR_SIGHTED' ) )~~
42		~~- define( 'FR_SIGHTED', 0 ); // "basic"/"checked"~~
	41	+if ( !defined( 'FR_CHECKED' ) )
	42	+ define( 'FR_CHECKED', 0 ); // "basic"/"checked"
43	43	if ( !defined( 'FR_QUALITY' ) )
44	44	define( 'FR_QUALITY', 1 );
45	45	if ( !defined( 'FR_PRISTINE' ) )
—	—	@@ -64,7 +64,7 @@
65	65	# IMPORTANT: DO NOT EDIT THIS FILE
66	66	# When configuring globals, set them at LocalSettings.php instead
67	67
68		~~-# This will only distinguish "sighted", "quality", and unreviewed~~
	68	+# This will only distinguish "checked", "quality", and unreviewed
69	69	# A small icon will show in the upper right hand corner
70	70	$wgSimpleFlaggedRevsUI = true; // @TODO: remove when ready
71	71	# For visitors, only show tags/icons for unreviewed/outdated pages
—	—	@@ -91,7 +91,7 @@
92	92	# (a) directly to the stable version by users with 'autoreview'/'bot'
93	93	# (b) self-reversions back to the stable version by any user
94	94	$wgFlaggedRevsAutoReview = true;
95		~~-# If $wgFlaggedRevsAutoReview, auto-review new pages as minimally "sighted"?~~
	95	+# If $wgFlaggedRevsAutoReview, auto-review new pages as minimally "checked"?
96	96	$wgFlaggedRevsAutoReviewNew = true;
97	97
98	98	# Define the tags we can use to rate an article, number of levels,
—	—	@@ -255,7 +255,7 @@
256	256	$wgAvailableRights[] = 'stablesettings';
257	257
258	258	# Bump this number every time you change flaggedrevs.css/flaggedrevs.js
259		~~-$wgFlaggedRevStyleVersion = '79';~~
	259	+$wgFlaggedRevStyleVersion = 80;
260	260
261	261	$wgExtensionFunctions[] = 'efLoadFlaggedRevs';
262	262
—	—	@@ -589,15 +589,15 @@
590	590	$wgLogNames['review'] = 'review-logpage';
591	591	$wgLogHeaders['review'] = 'review-logpagetext';
592	592	# Various actions are used for log filtering ...
593		~~-$wgLogActions['review/approve'] = 'review-logentry-app'; // sighted (again)~~
	593	+$wgLogActions['review/approve'] = 'review-logentry-app'; // checked (again)
594	594	$wgLogActions['review/approve2'] = 'review-logentry-app'; // quality (again)
595		~~-$wgLogActions['review/approve-i'] = 'review-logentry-app'; // sighted (first time)~~
	595	+$wgLogActions['review/approve-i'] = 'review-logentry-app'; // checked (first time)
596	596	$wgLogActions['review/approve2-i'] = 'review-logentry-app'; // quality (first time)
597		~~-$wgLogActions['review/approve-a'] = 'review-logentry-app'; // sighted (auto)~~
	597	+$wgLogActions['review/approve-a'] = 'review-logentry-app'; // checked (auto)
598	598	$wgLogActions['review/approve2-a'] = 'review-logentry-app'; // quality (auto)
599		~~-$wgLogActions['review/approve-ia'] = 'review-logentry-app'; // sighted (initial & auto)~~
	599	+$wgLogActions['review/approve-ia'] = 'review-logentry-app'; // checked (initial & auto)
600	600	$wgLogActions['review/approve2-ia'] = 'review-logentry-app'; // quality (initial & auto)
601		~~-$wgLogActions['review/unapprove'] = 'review-logentry-dis'; // was sighted~~
	601	+$wgLogActions['review/unapprove'] = 'review-logentry-dis'; // was checked
602	602	$wgLogActions['review/unapprove2'] = 'review-logentry-dis'; // was quality
603	603
604	604	# Add stable version log
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/maintenance/reviewAllPages.inc
—	—	@@ -21,7 +21,7 @@
22	22	$blockEnd = $start + $BATCH_SIZE - 1;
23	23	$count = 0;
24	24	$changed = 0;
25		~~- $flags = FlaggedRevs::quickTags( FR_SIGHTED ); // Assume basic level~~
	25	+ $flags = FlaggedRevs::quickTags( FR_CHECKED ); // Assume basic level
26	26	while( $blockEnd <= $end ) {
27	27	echo "...doing page_id from $blockStart to $blockEnd\n";
28	28	$cond = "page_id BETWEEN $blockStart AND $blockEnd";
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/language/Stabilization.i18n.php
—	—	@@ -60,7 +60,7 @@
61	61	$messages['qqq'] = array(
62	62	'stabilization-tab' => '{{Flagged Revs-small}}
63	63
64		-Some skins (e.g. standard/classic) display an additional tab to control visibility of the page revisions, e.g. whether last revision should be included or perhaps the last sighted or published version.',
	64	+Some skins (e.g. standard/classic) display an additional tab to control visibility of the page revisions, e.g. whether last revision should be included or perhaps the last checked or published version.',
65	65	'stabilization' => '{{Flagged Revs-small}}
66	66	Page title of Special:Stabilization.',
67	67	'stabilization-text' => '{{Flagged Revs-small}}
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/language/ValidationStatistics.i18n.php
—	—	@@ -455,14 +455,6 @@
456	456	'validationstatistics-reviews' => 'Επιθεωρήσεις',
457	457	);
458	458
459		~~-/** British English (British English)~~
460		~~- * @author Bruce89~~
461		~~- * @author Reedy~~
462		~~- */~~
463		~~-$messages['en-gb'] = array(~~
464		~~- 'validationstatistics' => 'Page review statistics',~~
465		~~-);~~
466		-
467	459	/** Esperanto (Esperanto)
468	460	* @author Yekrats
469	461	*/
—	—	@@ -885,7 +877,7 @@
886	878
887	879	[[Special:OldReviewedPages\|A nem ellenőrzött szerkesztésekkel rendelkező lapok]] átlagos késleltetési ideje '''$1'''.
888	880	Ezek a lapok ''elavultnak'' számítanak. A lapok akkor számítanak „frissnek”, ha nincsenek ellenőrzésre váró szerkesztéseik.",
889		~~- 'validationstatistics-revtime' => "A ''nem bejelentkezett szerkesztőknek'' '''$1''' az átlagos várakozási idő az ellenőrzésig; a medián '''$2''''.~~
	881	+ 'validationstatistics-revtime' => "A ''nem bejelentkezett szerkesztőknek'' '''$1''' az átlagos várakozási idő az ellenőrzésig; a medián '''$2'''.
890	882	$3",
891	883	'validationstatistics-table' => "Ezen az oldalon a névterekre bontott ellenőrzési statisztika látható, az átirányítások ''nélkül''.",
892	884	'validationstatistics-ns' => 'Névtér',
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/language/FlaggedRevs.i18n.php
—	—	@@ -41,6 +41,9 @@
42	42	'group-autoreview' => 'Autochecked users',
43	43	'group-autoreview-member' => 'autochecked users',
44	44	'grouppage-autoreview' => '{{ns:project}}:Autochecked users',
	45	+ 'revcontents-error' => 'Unable to get content.',
	46	+ 'revcontents-getcontents' => 'Click <a href="$1" >here</a> to view this revision.',
	47	+ 'revcontents-waiting' => 'Waiting for content',
45	48	'revreview-hist-draft' => 'unchecked revision',
46	49	'revreview-hist-pending' => 'pending revision',
47	50	'revreview-hist-quality' => 'quality revision',
—	—	@@ -358,7 +361,7 @@
359	362	'revreview-hist-quality' => '{{Flagged Revs-small}}
360	363	The accuracy "quality", as displayed on the page history after a revision with this setting.',
361	364	'revreview-hist-basic' => '{{Flagged Revs-small}}
362		~~-The accuracy "sighted", as displayed on the page history after a revision with this setting.',~~
	365	+The accuracy "checked", as displayed on the page history after a revision with this setting.',
363	366	'revreview-hist-quality-user' => '{{Flagged Revs}}',
364	367	'revreview-hist-basic-user' => '{{Flagged Revs}}',
365	368	'revreview-hist-basic-auto' => '{{Flagged Revs}}',
—	—	@@ -377,7 +380,8 @@
378	381	'review-logentry-dis' => '{{Flagged Revs}}
379	382	Parameters:
380	383	* $1 is a page title',
381		~~- 'review-logentry-id' => '{{Flagged Revs}}',~~
	384	+ 'review-logentry-id' => '{{Flagged Revs}}
	385	+{{Identical\|Revision}}',
382	386	'review-logentry-diff' => '{{Flagged Revs}}',
383	387	'review-logentry-diff2' => '{{Flagged Revs}}',
384	388	'review-logpage' => '{{Flagged Revs}}',
—	—	@@ -390,7 +394,7 @@
391	395	'revreview-accuracy-0' => '{{Flagged Revs-small}}
392	396	This is the default configuration, i.e. the revision has not (yet) been reviewed.',
393	397	'revreview-accuracy-1' => '{{Flagged Revs-small}}
394		~~-A basic check on vandalism ("sighted" as "has been seen/checked"). This configuration is considered as "flagged".',~~
	398	+A basic check on vandalism ("checked" as "has been seen/checked"). This configuration is considered as "flagged".',
395	399	'revreview-accuracy-2' => '{{Flagged Revs}}',
396	400	'revreview-accuracy-3' => '{{Flagged Revs}}',
397	401	'revreview-accuracy-4' => '{{Flagged Revs}}
—	—	@@ -406,7 +410,7 @@
407	411	'revreview-basic-same' => '{{Flagged Revs}}
408	412	* Parameter $2 is the date of the approval',
409	413	'revreview-basic-source' => '{{Flagged Revs-small}}
410		~~-Displayed on the top of a page when you are viewing an old sighted version.~~
	414	+Displayed on the top of a page when you are viewing an old checked version.
411	415	* Example: [http://de.wikipedia.org/w/index.php?title=Deutsche_Sprache&oldid=46894374 de.wikipedia].
412	416	* Parameter $2 is the date of the approval',
413	417	'revreview-failed' => '{{Flagged Revs}}',
—	—	@@ -442,7 +446,7 @@
443	447	{{Identical\|Content page}}',
444	448	'revreview-newest-basic' => '{{Flagged Revs}}',
445	449	'revreview-newest-basic-i' => '{{Flagged Revs-small}}
446		~~-Used in the "flagged revs box" when you are viewing the latest draft version, but when there is a sighted revision, the stable version.~~
	450	+Used in the "flagged revs box" when you are viewing the latest draft version, but when there is a checked revision, the stable version.
447	451
448	452	Example: [http://de.wikipedia.org/w/index.php?title=Deutsche_Sprache&stable=0 de.wikipedia].
449	453	* Note, the example seems not to work, currently.',
—	—	@@ -465,7 +469,7 @@
466	470	'revreview-quality-same' => '{{Flagged Revs}}',
467	471	'revreview-quality-source' => "{{Flagged Revs-small}}
468	472	Displayed on the top of a page when you are viewing an old quality version.
469		~~-* Example: [http://de.wikipedia.org/w/index.php?title=Deutsche_Sprache&oldid=46894374 de.wikipedia] (this is a sighted version, but it's the same for a quality version).~~
	473	+* Example: [http://de.wikipedia.org/w/index.php?title=Deutsche_Sprache&oldid=46894374 de.wikipedia] (this is a checked version, but it's the same for a quality version).
470	474	* Parameter $2 is the date of the approval",
471	475	'revreview-quality-title' => '{{Flagged Revs}}',
472	476	'revreview-quick-basic' => '{{Flagged Revs}}',
—	—	@@ -473,7 +477,7 @@
474	478	'revreview-quick-basic-same' => '{{Flagged Revs}}',
475	479	'revreview-quick-invalid' => '{{Flagged Revs}}',
476	480	'revreview-quick-none' => '{{Flagged Revs-small}}
477		~~-Shown in the "flagged revs box" on the content page when there isn\'t any sighted or quality revision yet.',~~
	481	+Shown in the "flagged revs box" on the content page when there isn\'t any checked or quality revision yet.',
478	482	'revreview-quick-quality' => '{{Flagged Revs-small}}
479	483	Used in the "flagged revs box" when viewing a quality version, while there are new changes (in a draft version) to be reviewed.',
480	484	'revreview-quick-quality-old' => '{{Flagged Revs}}',
—	—	@@ -506,9 +510,9 @@
507	511	'revreview-submit-reviewed' => '{{Flagged Revs}}',
508	512	'revreview-submit-unreviewed' => '{{Flagged Revs}}',
509	513	'revreview-successful' => '{{Flagged Revs-small}}
510		~~-Shown when a reviewer/editor has marked a revision as stable/sighted/... See also {{msg\|revreview-successful2\|pl=yes}}.',~~
	514	+Shown when a reviewer/editor has marked a revision as stable/checked/... See also {{msg\|revreview-successful2\|pl=yes}}.',
511	515	'revreview-successful2' => '{{Flagged Revs-small}}
512		~~-Shown when a reviewer/editor has marked a stable/sighted/... revision as unstable/unsighted/... After that, it can normally be reviewed again. See also {{msg\|revreview-successful\|pl=yes}}.',~~
	516	+Shown when a reviewer/editor has marked a stable/checked/... revision as unstable/unchecked/... After that, it can normally be reviewed again. See also {{msg\|revreview-successful\|pl=yes}}.',
513	517	'revreview-text' => "{{Flagged Revs-small}}
514	518	Displayed in the review box for the reviewers' information.",
515	519	'revreview-toggle-show' => '{{Optional}}
—	—	@@ -624,6 +628,7 @@
625	629	'reviewer' => 'Resensent',
626	630	'revreview-accuracy' => 'Akkuraatheid',
627	631	'revreview-accuracy-0' => 'Onvoldoende',
	632	+ 'revreview-accuracy-1' => 'Gekontroleer',
628	633	'revreview-accuracy-2' => 'Akkuraat',
629	634	'revreview-accuracy-3' => 'Goed van bronne voorsien',
630	635	'revreview-accuracy-4' => 'Uitgelig',
—	—	@@ -680,9 +685,12 @@
681	686	'revreview-lev-pristine' => 'onaangeroerd',
682	687	'revreview-def-all' => 'enige',
683	688	'revreview-def-draft' => 'nuutste',
	689	+ 'revreview-def-stable' => 'gepubliseerde',
684	690	'revreview-restrictfilter' => 'Beperkingsvlak:',
685	691	'revreview-restriction-any' => 'enige',
686	692	'revreview-restriction-none' => 'geen',
	693	+ 'revreview-reject-summary' => 'Wysigingsopsomming:',
	694	+ 'revreview-reject-cancel' => 'Kanselleer',
687	695	'tooltip-ca-default' => 'Instellings vir kwaliteitsbeheer',
688	696	'flaggedrevs-protect-legend' => 'Publiseer wysigings',
689	697	'flaggedrevs-protect-none' => 'Alle gebruikers toelaat',
—	—	@@ -771,6 +779,7 @@
772	780	'group-reviewer-member' => 'Revisador',
773	781	'grouppage-editor' => '{{ns:project}}:Editor',
774	782	'grouppage-reviewer' => '{{ns:project}}:Revisador',
	783	+
775	784	'revreview-hist-draft' => 'versión no verificata',
776	785	'revreview-hist-quality' => 'versión de calidat',
777	786	'revreview-hist-basic' => 'versión verificata',
—	—	@@ -2604,6 +2613,9 @@
2605	2614	'group-autoreview' => 'Autonadzornici',
2606	2615	'group-autoreview-member' => 'autonadzornik',
2607	2616	'grouppage-autoreview' => '{{ns:project}}:Autonadzornik',
	2617	+ 'revcontents-error' => 'Ne mogu da pronađem sadržaj.',
	2618	+ 'revcontents-getcontents' => 'Kliknite <a href="$1" >ovdje</a> da vidite ovu reviziju.',
	2619	+ 'revcontents-waiting' => 'Čekam na sadržaj',
2608	2620	'revreview-hist-draft' => 'neprovjerena revizija',
2609	2621	'revreview-hist-pending' => 'čeka na provjeru',
2610	2622	'revreview-hist-quality' => 'provjerena revizija',
—	—	@@ -2980,6 +2992,8 @@
2981	2993	'group-autoreview' => 'Automatičtí posuzovatelé',
2982	2994	'group-autoreview-member' => 'automatický posuzovatel',
2983	2995	'grouppage-autoreview' => '{{ns:project}}:Automatický posuzovatel',
	2996	+ 'revcontents-error' => 'Nelze získat obsah.',
	2997	+ 'revcontents-waiting' => 'Čekám na obsah',
2984	2998	'revreview-hist-draft' => 'nezkontrolovaná revize',
2985	2999	'revreview-hist-pending' => 'čeká na kontrolu',
2986	3000	'revreview-hist-quality' => 'kvalitní verze',
—	—	@@ -3175,6 +3189,7 @@
3176	3190	'revreview-restrictfilter' => 'Omezení autoposuzování:',
3177	3191	'revreview-restriction-any' => 'všechny',
3178	3192	'revreview-restriction-none' => 'žádné',
	3193	+ 'revreview-reject-cancel' => 'Zrušit',
3179	3194	'revreview-reviewlink' => 'posoudit',
3180	3195	'revreview-reviewlink-title' => 'Zobrazit rozdíl všech čekajících změn',
3181	3196	'revreview-unreviewedpage' => 'nezkontrolovaná stránka',
—	—	@@ -4028,6 +4043,7 @@
4029	4044	* @author Crazymadlover
4030	4045	* @author Dead3y3
4031	4046	* @author Flyax
	4047	+ * @author Glavkos
4032	4048	* @author Omnipaedista
4033	4049	* @author ZaDiak
4034	4050	*/
—	—	@@ -4068,14 +4084,14 @@
4069	4085	'revreview-accuracy-4' => 'Επιλεγμένο',
4070	4086	'revreview-auto' => '(αυτόματο)',
4071	4087	'revreview-failed' => 'Η επιθεώρηση απέτυχε!',
4072		~~- 'revreview-current' => 'Προσχέδιο',~~
	4088	+ 'revreview-current' => 'Αλλαγές σε εκκρεμότητα',
4073	4089	'revreview-depth' => 'Βάθος',
4074		~~- 'revreview-depth-0' => 'Μη εγκεκριμένο',~~
	4090	+ 'revreview-depth-0' => 'Ανεπαρκής',
4075	4091	'revreview-depth-1' => 'Βασικό',
4076	4092	'revreview-depth-2' => 'Μέτριο',
4077	4093	'revreview-depth-3' => 'Υψηλό',
4078	4094	'revreview-depth-4' => 'Εξαίρετο',
4079		~~- 'revreview-draft-title' => 'Πρόχειρη σελίδα',~~
	4095	+ 'revreview-draft-title' => 'Οι αλλαγές σε εκκρεμότητα εμφανίζονται σε αυτήν τη σελίδα',
4080	4096	'revreview-edit' => 'Επεξεργασία',
4081	4097	'revreview-flag' => 'Επιθεώρησε αυτή την τροποποίηση',
4082	4098	'revreview-reflag' => 'Αναίρεση επισκόπησης αυτής της έκδοσης',
—	—	@@ -4083,7 +4099,7 @@
4084	4100	'revreview-log' => 'Σχόλιο:',
4085	4101	'revreview-notes' => 'Εμφάνιση παρατηρήσεων ή σημειώσεων:',
4086	4102	'revreview-oldrating' => 'Βαθμολογήθηκε:',
4087		~~- 'revreview-quality-title' => 'Σελίδα ποιότητας',~~
	4103	+ 'revreview-quality-title' => 'Αυτή είναι μια ποιοτική έκδοση αυτής της σελίδας',
4088	4104	'revreview-quick-invalid' => "'''Άκυρος κωδικός αναθεώρησης'''",
4089	4105	'revreview-selected' => "Επιλεγμένη έκδοση του '''$1:'''",
4090	4106	'revreview-source' => 'Πηγή προσχεδίου',
—	—	@@ -4119,7 +4135,7 @@
4120	4136	'revreview-filter-auto' => 'Αυτόματος',
4121	4137	'revreview-filter-manual' => 'Χειροκίνητο',
4122	4138	'revreview-levelfilter' => 'Επίπεδο:',
4123		~~- 'revreview-lev-basic' => 'επιθεωρημένη',~~
	4139	+ 'revreview-lev-basic' => 'ελέγχθηκαν',
4124	4140	'revreview-lev-quality' => 'ποιότητα',
4125	4141	'revreview-lev-pristine' => 'μη αλλοιωμένο',
4126	4142	'revreview-reviewlink' => 'επιθεώρηση',
—	—	@@ -4132,9 +4148,11 @@
4133	4149	'validationpage' => '{{ns:help}}:Επικύρωση σελίδας',
4134	4150	);
4135	4151
4136		~~-/** British English (British English) */~~
	4152	+/** British English (British English)
	4153	+ * @author Reedy
	4154	+ */
4137	4155	$messages['en-gb'] = array(
4138		~~- 'flaggedrevs-desc' => 'Gives editors and reviewers the ability to validate revisions and stabilise pages',~~
	4156	+ 'flaggedrevs-desc' => 'Gives editors and reviewers the ability to review revisions and stabilise pages',
4139	4157	);
4140	4158
4141	4159	/** Esperanto (Esperanto)
—	—	@@ -4490,7 +4508,7 @@
4491	4509	'revreview-draft-title' => 'Los cambios pendientes se muestran en esta página',
4492	4510	'revreview-edit' => 'Editar',
4493	4511	'revreview-editnotice' => "'''Tus cambios serán publicados una vez que un usuario autorizado los revise. ([[{{MediaWiki:Validationpage}}\|ayuda]])'''",
4494		~~- 'revreview-check-flag-p' => 'Publicar cambios actualmente pendientes',~~
	4512	+ 'revreview-check-flag-p' => 'Aceptar esta versión (incluye {{PLURAL:$1\|un cambio pendiente\|$1 cambios pendientes}})',
4495	4513	'revreview-check-flag-p-title' => 'Aceptar todos los cambios actualmente pendientesjunto con tu propia edición.
4496	4514	Solamente usar esto si ya has visto por completo las diferencias de los cambios pendientes.',
4497	4515	'revreview-check-flag-u' => 'Aceptar esta página sin revisar',
—	—	@@ -4734,7 +4752,7 @@
4735	4753	'revreview-draft-title' => 'Sellel leheküljel kuvatakse ootel muudatused',
4736	4754	'revreview-edit' => 'Redigeeri',
4737	4755	'revreview-editnotice' => "'''Sinu muudatused kuvatakse lugejatele, kui volitatud kasutaja on need üle vaadanud. ([[{{MediaWiki:Validationpage}}\|abi]])'''",
4738		~~- 'revreview-check-flag-p' => 'Kiida ootel muudatused heaks',~~
	4756	+ 'revreview-check-flag-p' => 'Kiida see redaktsioon heaks (sisaldab {{PLURAL:$1\|üht\|$1}} ootel muudatust)',
4739	4757	'revreview-check-flag-p-title' => 'Kiida kõik praegu ootel olevad muudatused heaks, kaasa arvatud su enda muudatus. Kasuta seda ainult siis, kui oled juba kõiki erinevusi ootel muudatuste ja püsiva versiooni vahel näinud.',
4740	4758	'revreview-check-flag-u' => 'Kiida see ülevaatamata lehekülg heaks',
4741	4759	'revreview-check-flag-u-title' => 'Kiida käesolev lehekülje versioon heaks. Kasuta seda ainult siis, kui oled juba kogu lehekülge näinud.',
—	—	@@ -5549,7 +5567,7 @@
5550	5568	'revreview-draft-title' => 'Les modifications en attente sont affichées sur cette page',
5551	5569	'revreview-edit' => 'Modifier',
5552	5570	'revreview-editnotice' => "'''Vos modifications seront affichées aux lecteurs une fois qu’un utilisateur disposant des droits nécessaires les aura relues. [[{{MediaWiki:Validationpage}}\|aide]]'''",
5553		~~- 'revreview-check-flag-p' => 'Publier les modifications actuellement en attente',~~
	5571	+ 'revreview-check-flag-p' => 'Accepter cette version (inclut $1 {{PLURAL:$1\|modification\|modifications}} en attente)',
5554	5572	'revreview-check-flag-p-title' => "Accepter toutes les modifications en attente en même temps que votre propre modification.
5555	5573	Ne l'utilisez que si vous avez déjà vu le diff de l'ensemble des modifications en attente.",
5556	5574	'revreview-check-flag-u' => 'Accepter cette page non relue',
—	—	@@ -5682,9 +5700,12 @@
5683	5701	'revreview-restriction-any' => 'tous',
5684	5702	'revreview-restriction-none' => 'aucun',
5685	5703	'revreview-reject-header' => 'Refuser les modifications pour $1',
	5704	+ 'revreview-reject-text-list' => "En accomplissant cette action, vous allez '''rejeter''' les modifications suivantes :",
	5705	+ 'revreview-reject-text-revto' => 'Ceci remettra cette page dans sa [version $1 du $2].',
5686	5706	'revreview-reject-summary' => 'Résumé de modification :',
5687	5707	'revreview-reject-confirm' => 'Rejeter ces changements',
5688	5708	'revreview-reject-cancel' => 'Annuler',
	5709	+ 'revreview-reject-default-summary' => 'A rejeté les modifications de [[User:$1\|$1]] pour revenir à la version $2 de [[User:$3\|$3]]',
5689	5710	'revreview-reviewlink' => 'modifications en attente',
5690	5711	'revreview-reviewlink-title' => 'Voir le diff de toutes les modifications en attente',
5691	5712	'revreview-unreviewedpage' => 'Page non vérifiée',
—	—	@@ -6319,6 +6340,9 @@
6320	6341	'group-autoreview' => 'Autoreviewer',
6321	6342	'group-autoreview-member' => 'Autoreviewer',
6322	6343	'grouppage-autoreview' => '{{ns:project}}:Autoreviewer',
	6344	+ 'revcontents-error' => 'Cha dr Inhalt nit abruefe.',
	6345	+ 'revcontents-getcontents' => 'Druck <a href="$1" >do</a> go die Version aaluege.',
	6346	+ 'revcontents-waiting' => 'Am Warte uf dr Inhalt',
6323	6347	'revreview-hist-draft' => 'Entwurfsversion',
6324	6348	'revreview-hist-pending' => 'nonig prieft',
6325	6349	'revreview-hist-quality' => 'priefti Version',
—	—	@@ -7307,6 +7331,7 @@
7308	7332	'review_bad_key' => 'Njepłaćiwy kluč za zapřijimowanski parameter.',
7309	7333	'review_denied' => 'Prawo zapowědźene.',
7310	7334	'review_param_missing' => 'Parameter faluje abo je njepłaćiwy.',
	7335	+ 'review_cannot_undo' => 'Tute změny njehodźa so cofnyć, dokelž dalše njesčinjene změny su samsne městna změnili.',
7311	7336	'revreview-current' => 'Nječinjene změny',
7312	7337	'revreview-depth' => 'Hłubokosć',
7313	7338	'revreview-depth-0' => 'Njepřiměrjeny',
—	—	@@ -7317,7 +7342,7 @@
7318	7343	'revreview-draft-title' => 'Nječinjene změny so na tutej stronje zwobraznjeja',
7319	7344	'revreview-edit' => 'Wobdźěłać',
7320	7345	'revreview-editnotice' => "'''Twoje změny budu so čitarjam pokazować, tak ruče kaž awtorizowany wužiwar je přepruwuje. ([[{{MediaWiki:Validationpage}}\|pomoc]])'''",
7321		~~- 'revreview-check-flag-p' => 'Tuchwilu njepřepruwowane změny wozjewić',~~
	7346	+ 'revreview-check-flag-p' => 'Tutu wersiju akceptować (zapřijima $1 njesčinjene {{PLURAL:$1\|změna\|změnje\|změny\|změnow}})',
7322	7347	'revreview-check-flag-p-title' => 'Akceptowanje wšěch tuchwilu njepřepruwowanych změnow hromadźe z twojej swójskej změnu.
7323	7348	Wužij to jenož, jeli sy hižo wšě hišće njepřepruwowane změny widźał.',
7324	7349	'revreview-check-flag-u' => 'Tutu njepřepruwowanu stronu akceptować',
—	—	@@ -7392,11 +7417,11 @@
7393	7418	'revreview-successful2' => "'''Woznamjenjenje wersije [[:$1\|$1]] je so wuspěšnje wotstroniło.'''",
7394	7419	'revreview-text' => "''[[{{MediaWiki:Validationpage}}\|Přepruwowane wersije]] su skontrolowane wersije stronow, kotrež so wužiwaja, zo bychu wozjewjenu wersiju postajili.''",
7395	7420	'revreview-toggle-title' => 'Podrobnosće pokazać/schować',
7396		~~- 'revreview-toolow' => "'''Dyrbiš kóždy z atributow wyše hač \"njepřiměrjeny\" pohódnoćić, zo by so wersija jako přepruwowana wobkedźbowała.'''~~
	7421	+ 'revreview-toolow' => '\'\'\'Dyrbiš kóždy z atributow wyše hač "njepřiměrjeny" pohódnoćić, zo by so wersija jako přepruwowana wobkedźbowała.\'\'\'
7397	7422
7398		~~-Zo by přepruwowanski status wersije wotstronił, staj '''wšě''' pola na \"njepřiměrjeny\".~~
	7423	+Zo by přepruwowanski status wersije wotstronił, klikń na "njeakceptować".
7399	7424
7400		~~-Prošu klikń na tłóčatko \"Wróćo\" w swojim wobhladowaku a spytaj hišće raz.",~~
	7425	+Prošu klikń na tłóčatko "Wróćo" w swojim wobhladowaku a spytaj hišće raz.',
7401	7426	'revreview-update' => "'''Prošu [[{{MediaWiki:Validationpage}}\|přepruwuj]] njepřepruwowane změny ''(hlej deleka)'', kotrež buchu na akceptowanej wersiji přewjedźene.'''
7402	7427	Dyrbiš snano změny dale wobźěłać abo je' 'cofnyć''.",
7403	7428	'revreview-update-edited' => '<span class="flaggedrevs_important">Twoje změny hišće w stabilnej wersiji njeje.</span>
—	—	@@ -7449,6 +7474,13 @@
7450	7475	'revreview-restrictfilter' => 'Wobmjezowanje awtomatiskeho přepruwowanja:',
7451	7476	'revreview-restriction-any' => 'někajka',
7452	7477	'revreview-restriction-none' => 'žana',
	7478	+ 'revreview-reject-header' => 'Změny za $1 wotpokazać',
	7479	+ 'revreview-reject-text-list' => "Přewjedujo tutu akciju, budźeš slědowace '''wotpokazować''':",
	7480	+ 'revreview-reject-text-revto' => 'To stronu na [$1 wersiju wot dnja $2] wróćo staji.',
	7481	+ 'revreview-reject-summary' => 'Zjeće wobdźěłać',
	7482	+ 'revreview-reject-confirm' => 'Tute změny wotpokazać',
	7483	+ 'revreview-reject-cancel' => 'Přetorhnyć',
	7484	+ 'revreview-reject-default-summary' => 'Změny wot wužiwarja [[User:$1\|$1]] su so do wersije $2 wot wužiwarja [[User:$3\|$3]] wróćo stajili',
7453	7485	'revreview-reviewlink' => 'njepřepruwowane změny',
7454	7486	'revreview-reviewlink-title' => 'Rozdźěl wšěch njepřepruwowanych změnow pokazać',
7455	7487	'revreview-unreviewedpage' => 'njeskontrolowana strona',
—	—	@@ -7646,7 +7678,7 @@
7647	7679	'revreview-successful2' => "'''A(z) [[:$1\|$1]] változatáról sikeresen eltávolítottad a jelölést.'''",
7648	7680	'revreview-text' => "''Az [[{{MediaWiki:Validationpage}}\|ellenőrzött változatok]] olyan átnézett lapok, amiken a közzétett változat alapul.''",
7649	7681	'revreview-toggle-title' => 'részletek megjelenítése/elrejtése',
7650		~~- 'revreview-toolow' => "Ahhoz, hogy egy változat ellenőrzöttnek tekinthető legyen, minden tulajdonságot magasabbra kell értékelned a „nem ellenőrzött” szintnél.'''~~
	7682	+ 'revreview-toolow' => "'''Ahhoz, hogy egy változat ellenőrzöttnek tekinthető legyen, minden tulajdonságot magasabbra kell értékelned a „nem ellenőrzött” szintnél.'''
7651	7683
7652	7684	Nem ellenőrzöttnek való visszaminősítéshez állítsd az összes mezőt „nem ellenőrzött” értékre.
7653	7685
—	—	@@ -7754,6 +7786,9 @@
7755	7787	'group-autoreview' => 'Autorevisores',
7756	7788	'group-autoreview-member' => 'autorevisor',
7757	7789	'grouppage-autoreview' => '{{ns:project}}:Autorevisor',
	7790	+ 'revcontents-error' => 'Incapace de obtener contento.',
	7791	+ 'revcontents-getcontents' => 'Clicca <a href="$1" >hic</a> pro vider iste version.',
	7792	+ 'revcontents-waiting' => 'Attende contento',
7758	7793	'revreview-hist-draft' => 'version non verificate',
7759	7794	'revreview-hist-pending' => 'attende revision',
7760	7795	'revreview-hist-quality' => 'version de qualitate',
—	—	@@ -8597,7 +8632,7 @@
8598	8633	'revreview-draft-title' => '査読待ちの変更がこのページに表示されています',
8599	8634	'revreview-edit' => '編集',
8600	8635	'revreview-editnotice' => "'''あなたの変更は承認された利用者の査読の後に公開されます。 ([[{{MediaWiki:Validationpage}}\|ヘルプ]])'''",
8601		~~- 'revreview-check-flag-p' => '現在査読待ちの編集を公開する',~~
	8636	+ 'revreview-check-flag-p' => 'この版を承認する（保留中の$1コの{{PLURAL:$1\|変更}}を含む）',
8602	8637	'revreview-check-flag-p-title' => '自身の編集とともに現在保留中の変更をすべて承認する。
8603	8638	これは、あなたが既に保留中の変更全体の差分表示を確認した場合のみに使用してください。',
8604	8639	'revreview-check-flag-u' => 'この未査読ページを受理する',
—	—	@@ -10660,6 +10695,9 @@
10661	10696	'group-autoreview' => 'സ്വതേ സംശോധനം ചെയ്യുന്നവർ',
10662	10697	'group-autoreview-member' => 'സ്വതേ സംശോധനം ചെയ്യുന്നയാൾ',
10663	10698	'grouppage-autoreview' => '{{ns:project}}:സ്വതേ സംശോധനം ചെയ്യുന്നയാൾ',
	10699	+ 'revcontents-error' => 'ഉള്ളടക്കം എടുക്കാനാവുന്നില്ല.',
	10700	+ 'revcontents-getcontents' => 'ഈ നാൾപ്പതിപ്പിനായി <a href="$1" >ഇവിടെ ഞെക്കുക</a>',
	10701	+ 'revcontents-waiting' => 'ഉള്ളടക്കം പ്രതീക്ഷിക്കുന്നു',
10664	10702	'revreview-hist-draft' => 'പരിശോധിക്കാത്ത നാൾപ്പതിപ്പ്',
10665	10703	'revreview-hist-pending' => 'സംശോധനം പ്രതീക്ഷിക്കുന്നവ',
10666	10704	'revreview-hist-quality' => 'ഉന്നത നിലവാരമുള്ള പതിപ്പ്',
—	—	@@ -10735,7 +10773,7 @@
10736	10774	'revreview-submitedit-title' => 'താങ്കൾ വരുത്തിയ മാറ്റങ്ങൾ സംശോധനത്തിന് സമർപ്പിക്കുക',
10737	10775	'revreview-edited' => "'''അംഗീകരിക്കപ്പെട്ട ഒരു ഉപയോക്താവ് ഒരിക്കൽ സം‌ശോധനം നിർവഹിച്ചു കഴിഞ്ഞാൽ താങ്കളുടെ തിരുത്തലുകൾ എല്ലാ വായനക്കാർക്കും കാണാനാവും. ([[{{MediaWiki:Validationpage}}\|സഹായം]])'''
10738	10776
10739		-അതിൽ [{{fullurl:{{FULLPAGENAMEE}}\|oldid=$1&diff=cur&diffonly=0}} അവശേഷിക്കുന്ന {{PLURAL:$2\|ഒരു മാറ്റം\|$2 മാറ്റങ്ങൾ}}] ''(താഴെ കൊടുത്തിരിക്കുന്നു)''സം‌ശോധനം പ്രതീക്ഷിക്കുന്നു.",
	10777	+അതിൽ [{{fullurl:{{FULLPAGENAMEE}}\|oldid=$1&diff=cur&diffonly=0}} അവശേഷിക്കുന്ന {{PLURAL:$2\|ഒരു മാറ്റം\|$2 മാറ്റങ്ങൾ}}] ''(താഴെ കൊടുത്തിരിക്കുന്നു)'' സം‌ശോധനം പ്രതീക്ഷിക്കുന്നു.",
10740	10778	'revreview-edited-section' => 'താളിലെ "[[#$1\|$2]]" എന്ന ഉപവിഭാഗത്തിലേയ്ക്ക് തിരിച്ചുപോവുക.',
10741	10779	'revreview-flag' => 'ഈ പതിപ്പ് സംശോധനം ചെയ്യുക',
10742	10780	'revreview-reflag' => 'ഈ നാൾപ്പതിപ്പ് പുനർസംശോധനം ചെയ്യുക',
—	—	@@ -11294,6 +11332,9 @@
11295	11333	'group-autoreview' => 'Automatische controleurs',
11296	11334	'group-autoreview-member' => 'automatische controleur',
11297	11335	'grouppage-autoreview' => '{{ns:project}}:Automatische controleur',
	11336	+ 'revcontents-error' => 'Niet in staat om content op te vragen.',
	11337	+ 'revcontents-getcontents' => '<a href="$1" >Deze versie bekijken</a>.',
	11338	+ 'revcontents-waiting' => 'Bezig met het laden van content',
11298	11339	'revreview-hist-draft' => 'ongecontroleerde versie',
11299	11340	'revreview-hist-pending' => 'wacht op controle',
11300	11341	'revreview-hist-quality' => 'kwaliteitsversie',
—	—	@@ -12260,7 +12301,7 @@
12261	12302	'revreview-accuracy-4' => 'na medal',
12262	12303	'revreview-auto' => '(automatycznie)',
12263	12304	'revreview-basic' => 'To jest najnowsza [[{{MediaWiki:Validationpage}}\|wersja przejrzana]], która została [{{fullurl:{{#Special:Log}}\|type=review&page={{FULLPAGENAMEE}}}} oznaczona] <i>$2</i>.
12264		-Od tego czasu dokonano [{{fullurl:{{FULLPAGENAMEE}}\|oldid=$1&diff=cur&diffonly=0}} $3 {{PLURAL:$3\|zmianę\|zmiany\|zmian}}], {{PLURAL:$3\|która oczekuje\|które oczekują\|które oczekują}} na przejrzenie.',
	12305	+Od tego czasu dokonano [{{fullurl:{{FULLPAGENAMEE}}\|oldid=$1&diff=cur&diffonly=0}} $3 {{PLURAL:$3\|zmiany\|zmian\|zmian}}], {{PLURAL:$3\|która oczekuje\|które oczekują\|które oczekują}} na przejrzenie.',
12265	12306	'revreview-basic-i' => 'To jest [[{{MediaWiki:Validationpage}}\|wersja przejrzana]], która została [{{fullurl:{{#Special:Log}}\|type=review&page={{FULLPAGENAMEE}}}} oznaczona] <i>$2</i>.
12266	12307	Na przejrzenie oczekują [{{fullurl:{{FULLPAGENAMEE}}\|oldid=$1&diff=cur&diffonly=0}} zmiany w szablonach lub plikach], które są zawarte na tej stronie.',
12267	12308	'revreview-basic-old' => 'To jest [[{{MediaWiki:Validationpage}}\|wersja przejrzana]] ([{{fullurl:{{#Special:ReviewedVersions}}\|page={{FULLPAGENAMEE}}}} pokaż wszystkie]), która została [{{fullurl:{{#Special:Log}}\|type=review&page={{FULLPAGENAMEE}}}} oznaczona] <i>$2</i>.
—	—	@@ -12474,6 +12515,9 @@
12475	12516	'group-autoreview' => 'Utent autocontrolà',
12476	12517	'group-autoreview-member' => 'utent autocontrolà',
12477	12518	'grouppage-autoreview' => '{{ns:project}}:Utent autocontrolà',
	12519	+ 'revcontents-error' => 'As peul pa pijesse ël contnù.',
	12520	+ 'revcontents-getcontents' => 'Sgnaca <a href="$1" >ambelessì</a> për vardé sta revision.',
	12521	+ 'revcontents-waiting' => 'Speté dël contnù',
12478	12522	'revreview-hist-draft' => 'revision pa controlà',
12479	12523	'revreview-hist-pending' => 'revision an cors',
12480	12524	'revreview-hist-quality' => 'qualità',
—	—	@@ -13675,6 +13719,9 @@
13676	13720	'group-autoreview' => 'Автодосматривающие',
13677	13721	'group-autoreview-member' => 'автодосматривающий',
13678	13722	'grouppage-autoreview' => '{{ns:project}}:Автодосматривающие',
	13723	+ 'revcontents-error' => 'Невозможно получить содержимое.',
	13724	+ 'revcontents-getcontents' => 'Нажмите <a href="$1">здесь</a>, чтобы просмотреть эту версию.',
	13725	+ 'revcontents-waiting' => 'Ожидание материалов',
13679	13726	'revreview-hist-draft' => 'непроверенная версия',
13680	13727	'revreview-hist-pending' => 'ожидает проверки',
13681	13728	'revreview-hist-quality' => 'выверенная версия',
—	—	@@ -13741,7 +13788,7 @@
13742	13789	'revreview-draft-title' => 'На этой странице показываются непроверенные изменения',
13743	13790	'revreview-edit' => 'Править',
13744	13791	'revreview-editnotice' => "'''Сделанные вами изменения будут показаны читателям после проверки уполномоченным участником. ([[{{MediaWiki:Validationpage}}\|подробнее]])'''",
13745		~~- 'revreview-check-flag-p' => 'Подтвердить непроверенные изменения',~~
	13792	+ 'revreview-check-flag-p' => 'Подтвердить эту версию ($1 {{PLURAL:$1\|непроверенное изменения\|непроверенных изменения\|непроверенных изменений}})',
13746	13793	'revreview-check-flag-p-title' => 'Подтвердить все ожидающие проверки изменения вместе с вашей правкой. Используйте, только если вы уже просмотрели все ожидающие проверки изменения.',
13747	13794	'revreview-check-flag-u' => 'Подтвердить эту версию непроверенной страницы',
13748	13795	'revreview-check-flag-u-title' => 'Подтвердить эту версию страницы. Применяйте только в случае, если вы полностью просмотрели страницу.',
—	—	@@ -13870,6 +13917,13 @@
13871	13918	'revreview-restrictfilter' => 'Ограничение автопроверки:',
13872	13919	'revreview-restriction-any' => 'любой',
13873	13920	'revreview-restriction-none' => 'нет',
	13921	+ 'revreview-reject-header' => 'Отклонить изменения для $1',
	13922	+ 'revreview-reject-text-list' => "Выполняя это действие, вы '''отвергаете''' следующие изменения:",
	13923	+ 'revreview-reject-text-revto' => 'Возвращает страницу назад к [версии $1 от $2].',
	13924	+ 'revreview-reject-summary' => 'Описание изменений:',
	13925	+ 'revreview-reject-confirm' => 'Отклонить эти изменения',
	13926	+ 'revreview-reject-cancel' => 'Отмена',
	13927	+ 'revreview-reject-default-summary' => 'Отклонены изменения [[User:$1\|$1]] в версию $2 [[User:$3\|$3]]',
13874	13928	'revreview-reviewlink' => 'непроверенные изменения',
13875	13929	'revreview-reviewlink-title' => 'Просмотр разницы всех непроверенных изменений',
13876	13930	'revreview-unreviewedpage' => 'непроверенная страница',
—	—	@@ -14027,20 +14081,35 @@
14028	14082	'editor' => 'Көннөрөөччү',
14029	14083	'flaggedrevs' => 'Бэлиэтэммит торумнар',
14030	14084	'flaggedrevs-watched-pending' => "Эн кэтэбилиҥ тиһигэр тургутуллуохтаах [{{fullurl:{{#Special:OldReviewedPages}}\|watched=1}} көннөрүүлэр бааллар]. '''Бука диэн, көр эрэ!'''",
14031		- 'flaggedrevs-desc' => 'Эрэдээктэрдэргэ/ырытааччыларга сирэй торумнарын уонна сирэй стабилизациятын бигэргэтэр кыаҕы биэрэр',
	14085	+ 'flaggedrevs-desc' => 'Эрэдээктэрдэргэ сирэй барылларын тургутар уонна сирэй бигэ барылларын туруорар кыаҕы биэрэр',
14032	14086	'flaggedrevs-pref-UI' => 'Олох интерфейс:',
14033		~~- 'prefs-flaggedrevs' => 'Халбаҥнаабат гыныы (стабилизация)',~~
	14087	+ 'flaggedrevs-pref-UI-0' => 'Сирэйи бигэргэтии туругун туһунан сиһилии',
	14088	+ 'flaggedrevs-pref-UI-1' => 'Сирэйи бигэргэтии туругар сыһыаннаах кырачаан бэлиэлэр уонна кылгас тиэкистэр',
	14089	+ 'prefs-flaggedrevs' => 'Көннөрүүлэри бигэргэтии',
14034	14090	'prefs-flaggedrevs-ui' => 'Уларытыыны бигэргэтии',
14035	14091	'flaggedrevs-prefs-stable' => 'Бастаан ыстатыйа бэчээттэммит барылын көрдөрөргө (баар буоллаҕына)',
	14092	+ 'flaggedrevs-prefs-watch' => 'Тургуппут сирэйдэрбин кэтээн көрүү тиһигэр киллэрэн ис',
	14093	+ 'flaggedrevs-prefs-editdiffs' => 'Сирэйдэри уларытарга тургутуллубут уонна тургутуллубатах барыллар уратыларын көрдөр',
14036	14094	'group-editor' => 'Көннөрөөччүлэр',
14037	14095	'group-editor-member' => 'көннөрөөччү',
14038	14096	'group-reviewer' => 'Рецензеннар',
14039	14097	'group-reviewer-member' => 'рецензент',
14040	14098	'grouppage-editor' => '{{ns:project}}:Көннөрөөччү',
14041	14099	'grouppage-reviewer' => '{{ns:project}}:Рецензент',
14042		~~- 'revreview-hist-draft' => 'хара барыла',~~
	14100	+ 'revcontents-getcontents' => '<a href="$1">Маны</a> баттаа, оччоҕо бу барыл көстүө.',
	14101	+ 'revcontents-waiting' => 'Сурулларын кэтэһии',
	14102	+ 'revreview-hist-draft' => 'тургутуллубатах барыл',
	14103	+ 'revreview-hist-pending' => 'тургутуллуохтаах',
14043	14104	'revreview-hist-quality' => 'үрдүк хаачыстыбалаах торум',
14044		~~- 'revreview-hist-basic' => 'торум көрүлүннэ/көрүллүбүт',~~
	14105	+ 'revreview-hist-basic' => 'көрүллүбүт барыл',
	14106	+ 'revreview-hist-quality-user' => '[[User:$3\|$3]] кыттааччы [{{fullurl:$1\|stableid=$2}} бигэргэппит]',
	14107	+ 'revreview-hist-basic-user' => '[[User:$3\|$3]] кыттааччы [{{fullurl:$1\|stableid=$2}} көрбүт]',
	14108	+ 'revreview-hist-basic-auto' => '[{{fullurl:$1\|stableid=$2}} аптамаатынан көрүллүбүт]',
	14109	+ 'revreview-hist-quality-auto' => '[{{fullurl:$1\|stableid=$2}} аптамаатынан бигэргэтиллибит]',
	14110	+ 'revreview-hist-pending-difflink' => "'''[[{{fullurl:$1\|oldid=$2&diff=$3}} тургутуллуохтаах]]'''",
	14111	+ 'review-edit-diff' => "'''БИЛЛЭРИИ. Эн көннөрөр сирэйиҥ сорҕотугар сорох тургутуллуохтаах көннөрүүлэр бааллар эбит.'''",
	14112	+ 'revreview-diff-toggle-show' => 'уларытыылары көрдөр',
	14113	+ 'revreview-diff-toggle-hide' => 'уларытыылары кистээ',
14045	14114	'review-diff2stable' => 'Чистовой уонна саҥа торумнар уратыларын көрүү',
14046	14115	'review-logentry-app' => '[[$1]] сирэй r$2 барыла ырытыллынна',
14047	14116	'review-logentry-dis' => '[[$1]] сирэй эргэрбит барылын бэлиэтээбит',
—	—	@@ -14103,31 +14172,38 @@
14104	14173	'revreview-quick-invalid' => "'''Сирэй барылын идентификатора алҕастаах'''",
14105	14174	'revreview-quick-none' => "'''Бүтэһик торум''' (ырытыллыбыт торума суох)",
14106	14175	'revreview-quick-quality' => "'''[[{{MediaWiki:Validationpage}}\|Кичэйэн көрүллүбүт]]''' [[{{fullurl:{{FULLPAGENAMEE}}\|oldid=$1&diff=cur&diffonly=0}} черновигын көр]]",
14107		~~- 'revreview-quick-quality-same' => "'''[[{{MediaWiki:Validationpage}}\|Бэрэбиэркэлэммит сирэй]]'''",~~
14108		~~- 'revreview-quick-see-basic' => "'''[[{{MediaWiki:Validationpage}}\|Хара барыла]]''' [[{{fullurl:{{FULLPAGENAMEE}}\|stable=1}} бигэ барыла]]~~
14109		~~-[[{{fullurl:{{FULLPAGENAMEE}}\|oldid=$1&diff=cur&diffonly=0}} тэҥнииргэ]]",~~
14110		~~- 'revreview-quick-see-quality' => "'''[[{{MediaWiki:Validationpage}}\|Хара барыла]]''' [[{{fullurl:{{FULLPAGENAMEE}}\|stable=1}} бигэ барыла]]~~
14111		~~-[[{{fullurl:{{FULLPAGENAMEE}}\|oldid=$1&diff=cur&diffonly=0}} тэҥнииргэ]]",~~
	14176	+ 'revreview-quick-quality-same' => "'''[[{{MediaWiki:Validationpage}}\|Бэрт]]'''",
	14177	+ 'revreview-quick-see-basic' => '[[{{fullurl:{{FULLPAGENAMEE}}\|oldid=$1&diff=cur&diffonly=0}} бэрэбиэркэлэммэтэх уларытыылары көрдөр]]',
	14178	+ 'revreview-quick-see-quality' => '[[{{fullurl:{{FULLPAGENAMEE}}\|oldid=$1&diff=cur&diffonly=0}} бэрэбиэркэлэммэтэх уларытыылары көрдөр]]',
14112	14179	'revreview-selected' => "'''$1''' талыллыбыт торума:",
14113		~~- 'revreview-source' => 'черновик бастакы торума',~~
	14180	+ 'revreview-source' => 'Исходнигын көрүү',
14114	14181	'revreview-basic-title' => 'Бу сирэй көрүллүбүт барыла',
14115		- 'revreview-stable1' => 'Баҕар эн [{{fullurl:$1\|stableid=$2}} бу бэлиэтэммит барылы] эбэтэр, баар буоллаҕына, сирэй [{{fullurl:$1\|stable=1}} бигэ барылын] көрүөххүн баҕарарыҥ буолуо.',
14116		~~- 'revreview-stable2' => 'Эн өссө бу сирэй [{{fullurl:$1\|stable=1}} бигэ барылын] көрүөххүн сөп (баар буоллаҕына).',~~
	14182	+ 'revreview-stable1' => 'Баҕар эн [{{fullurl:$1\|stableid=$2}} бу бэлиэтэммит барылы] эбэтэр, баар буоллаҕына, сирэй [{{fullurl:$1\|stable=1}} бэчээттэммит барылын] көрүөххүн баҕарарыҥ буолуо.',
	14183	+ 'revreview-stable2' => 'Эн өссө бу сирэй [{{fullurl:$1\|stable=1}} бэчээттэммит барылын] көрүөххүн сөп.',
14117	14184	'revreview-style' => 'Ааҕарга табыгастааҕа',
14118		~~- 'revreview-style-0' => 'Бигэргэтиллибэтэх',~~
	14185	+ 'revreview-style-0' => 'Ыйыллыбатах',
14119	14186	'revreview-style-1' => 'Син аҕай',
14120	14187	'revreview-style-2' => 'Үчүгэй',
14121	14188	'revreview-style-3' => 'Кылгас',
14122	14189	'revreview-style-4' => 'Уһулуччу үчүгэй',
14123	14190	'revreview-submit' => 'Ыыт',
14124	14191	'revreview-submitting' => 'Ыытыы...',
	14192	+ 'revreview-submit-review' => 'Барылы бигэргэт',
	14193	+ 'revreview-submit-unreview' => 'Бигэргэтиини суох гын',
	14194	+ 'revreview-submit-reject' => 'Уларытыылары сот',
	14195	+ 'revreview-submit-reviewed' => 'Бэлэм. Бигэргэтилиннэ!',
	14196	+ 'revreview-submit-unreviewed' => 'Бэлэм. Бигэргэтии уһулунна!',
14125	14197	'revreview-successful' => "'''Талыллыбыт [[:$1\|$1]] барыл сөпкө бэлиэтэннэ. ([{{fullurl:{{#Special:ReviewedVersions}}\|page=$2}} бигэ барыллары көрүү])'''",
14126	14198	'revreview-successful2' => "'''Талыллыбыт [[:$1\|$1]] барылтан бэлиэ уһулунна.'''",
14127		- 'revreview-text' => 'Анаан туруоруллубатаҕына сирэйдэр хойукку буолбакка [[{{MediaWiki:Validationpage}}\|бигэ барыллара]] көстөллөр.',
	14199	+ 'revreview-text' => '[[{{MediaWiki:Validationpage}}\|бигэ барыллара]] — сирэй бэлиэммит барыллара, бэчээттэнэр барыл балартан талыллар.',
14128	14200	'revreview-toggle-title' => 'сиһилиитин көрдөр/кистээ',
14129		- 'revreview-toolow' => 'Бу торуму ырытыллыбыт диир буоллаххына «бигэргэтиллибэтэх» диэнтэн үөһээ таһымы туруоруохтааххын. Ырытыыта суох оҥорорго туох баар суолталарын «бигэргэтиллибэтэх» диэҥҥэ туруор.',
14130		- 'revreview-update' => "Бука диэн манна аллара бэриллибит бу бигэ барыл [{{fullurl:{{#Special:Log}}\|type=review&page={{FULLPAGENAMEE}}}} оҥоһуллубутун] кэннэ оҥоһуллубут [[{{MediaWiki:Validationpage}}\|көннөрүүлэри]] бэрэбиэркэлээ.<br />
14131		~~-'''Сорох халыыптар уонна билэлэр саҥардыллыбыттар:'''",~~
	14201	+ 'revreview-toolow' => "'''Бу барылы ырытыллыбыт диир буоллаххына «бигэргэтиллибэтэх» диэнтэн үөһээ таһымы туруоруохтааххын. '''
	14202	+
	14203	+Ырытыллыбатах оҥорорго «Бигэргэтиитин уһул» диэни баттаа.
	14204	+
	14205	+Суолталарын хос туруоруоххун баҕарар буоллаххына браузерыҥ «төнүн» тимэҕин баттаа.",
	14206	+ 'revreview-update' => "'''Бука диэн, бигэ барыл манна көстүбүт уларыйыыларын ''(аллара)'' [[{{MediaWiki:Validationpage}}\|тургут эрэ]].'''
	14207	+Баҕар бастаан көннөрүүлэр устуоруйалырын көрөр уонна кинилэри төннөрөр наада буолуо.",
14132	14208	'revreview-visibility' => 'Бу сирэй [[{{MediaWiki:Validationpage}}\|чистовой торумнаах]], которая может быть
14133	14209	[{{fullurl:{{#Special:Stabilization}}\|page={{FULLPAGENAMEE}}}} настроена].',
14134	14210	'revreview-revnotfound' => 'Бу сирэй урукку барыла булуллубата. Ыйынньыгы сыыһата суох суруйбуккун көр.',
—	—	@@ -14483,6 +14559,9 @@
14484	14560	'group-autoreview' => 'Samodejno potrjeni uporabniki',
14485	14561	'group-autoreview-member' => 'samodejno potrjeni uporabniki',
14486	14562	'grouppage-autoreview' => '{{ns:project}}:Samodejno preverjeni uporabniki',
	14563	+ 'revcontents-error' => 'Ne morem dobiti vsebine.',
	14564	+ 'revcontents-getcontents' => 'Kliknite <a href="$1" >tukaj</a> za ogled redakcije.',
	14565	+ 'revcontents-waiting' => 'Čakam na vsebino',
14487	14566	'revreview-hist-draft' => 'nepreverjena redakcija',
14488	14567	'revreview-hist-pending' => 'redakcija v teku',
14489	14568	'revreview-hist-quality' => 'kakovostna redakcija',
—	—	@@ -16586,6 +16665,16 @@
16587	16666	*/
16588	16667	$messages['tt-cyrl'] = array(
16589	16668	'revreview-edit' => 'Үзгәртү',
	16669	+ 'revreview-quick-none' => "'''[[{{MediaWiki:Validationpage}}\|Тикшерелмәгән]]'''",
	16670	+ 'revreview-quick-quality' => "'''[[{{MediaWiki:Validationpage}}\|Тикшерелгән]]''' [[{{fullurl:{{FULLPAGENAMEE}}\|oldid=$1&diff=cur&diffonly=0}} тикшерелмәгән үзгәртүләрне күрсәтергә]]",
	16671	+ 'revreview-quick-quality-old' => "'''[[{{MediaWiki:Validationpage}}\|Тикшерелгән]]'''",
	16672	+ 'revreview-quick-quality-same' => "'''[[{{MediaWiki:Validationpage}}\|Тикшерелгән]]'''",
	16673	+ 'revreview-quick-see-basic' => '[[{{fullurl:{{FULLPAGENAMEE}}\|oldid=$1&diff=cur&diffonly=0}} тикшерелмәгән үзгәрешләрне карарга]]',
	16674	+ 'revreview-quick-see-quality' => '[[{{fullurl:{{FULLPAGENAMEE}}\|oldid=$1&diff=cur&diffonly=0}} тикшерелмәгән үзгәрешләрне карарга]]',
	16675	+ 'revreview-selected' => "Сайланган юрама '''$1:'''",
	16676	+ 'revreview-source' => 'Карау',
	16677	+ 'revreview-basic-title' => 'Бу битнең каралган юрамасы',
	16678	+ 'validationpage' => '{{ns:help}}:Битләрне тикшерү',
16590	16679	);
16591	16680
16592	16681	/** Ukrainian (Українська)
—	—	@@ -17320,6 +17409,9 @@
17321	17410	'group-autoreview' => 'Người tự duyệt',
17322	17411	'group-autoreview-member' => 'người tự duyệt',
17323	17412	'grouppage-autoreview' => '{{ns:project}}:Người tự duyệt',
	17413	+ 'revcontents-error' => 'Không thể lấy nội dung.',
	17414	+ 'revcontents-getcontents' => '<a href="$1">Xem thay đổi này</a>.',
	17415	+ 'revcontents-waiting' => 'Đang chờ nội dung.',
17324	17416	'revreview-hist-draft' => 'phiên bản chưa xem qua',
17325	17417	'revreview-hist-pending' => 'phiên bản đang chờ',
17326	17418	'revreview-hist-quality' => 'bản chất lượng cao',
Property changes on: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/language
___________________________________________________________________
Modified: svn:mergeinfo
17327	17419	Merged /trunk/extensions/FlaggedRevs/language:r76039,76107,76162,76218,76229-76230,76233,76268,76272,76317,76335,76353,76360,76395,76413,76476,76489,76492-76494,76542,76577
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedRevs.class.php
—	—	@@ -115,6 +115,7 @@
116	116	* @returns string
117	117	*/
118	118	public static function binaryTagName() {
	119	+ self::load();
119	120	if ( !self::binaryFlagging() ) {
120	121	return null;
121	122	}
—	—	@@ -155,7 +156,6 @@
156	157	*/
157	158	public static function autoReviewNewPages() {
158	159	global $wgFlaggedRevsAutoReviewNew;
159		~~- self::load();~~
160	160	return (bool)$wgFlaggedRevsAutoReviewNew;
161	161	}
162	162
—	—	@@ -244,7 +244,7 @@
245	245	global $wgFlaggedRevsComments;
246	246	return $wgFlaggedRevsComments;
247	247	}
248		-
	248	+
249	249	/**
250	250	* Get the array of tag dimensions and level messages
251	251	* @returns array
—	—	@@ -253,26 +253,8 @@
254	254	self::load();
255	255	return self::$dimensions;
256	256	}
257		-
	257	+
258	258	/**
259		~~- * Get min level this tag needs to be for a rev to be "quality"~~
260		~~- * @returns int~~
261		~~- */~~
262		~~- public static function getMinQL( $tag ) {~~
263		~~- self::load();~~
264		~~- return self::$minQL[$tag];~~
265		~~- }~~
266		-
267		- /**
268		~~- * Get min level this tag needs to be for a rev to be "pristine"~~
269		~~- * @returns int~~
270		~~- */~~
271		~~- public static function getMinPL( $tag ) {~~
272		~~- self::load();~~
273		~~- return self::$minPL[$tag];~~
274		~~- }~~
275		-
276		- /**
277	259	* Get the associative array of tag dimensions
278	260	* (tags => array(levels => msgkey))
279	261	* @returns array
—	—	@@ -320,10 +302,11 @@
321	303	*/
322	304	public static function getTagValueMsg( $tag, $value ) {
323	305	self::load();
324		~~- if ( !isset( self::$dimensions[$tag] ) )~~
	306	+ if ( !isset( self::$dimensions[$tag] ) ) {
325	307	return '';
326		~~- if ( !isset( self::$dimensions[$tag][$value] ) )~~
	308	+ } elseif ( !isset( self::$dimensions[$tag][$value] ) ) {
327	309	return '';
	310	+ }
328	311	# Return empty string if not there
329	312	return wfMsgExt( 'revreview-' . self::$dimensions[$tag][$value],
330	313	array( 'escapenoentities' ) );
—	—	@@ -771,7 +754,7 @@
772	755	$data = array();
773	756	$level = self::pristineVersions() ? FR_PRISTINE : FR_QUALITY;
774	757	if ( !self::qualityVersions() ) {
775		~~- $level = FR_SIGHTED;~~
	758	+ $level = FR_CHECKED;
776	759	}
777	760	# Get the latest revision ID if not set
778	761	if ( !$latest ) {
—	—	@@ -798,13 +781,13 @@
799	782	);
800	783	# If there is a revision of this level, track it...
801	784	# Revisions reviewed to one level count as reviewed
802		~~- # at the lower levels (i.e. quality -> sighted).~~
	785	+ # at the lower levels (i.e. quality -> checked).
803	786	if ( $row ) {
804	787	$id = $row->fr_rev_id;
805	788	$ts = $row->rev_timestamp;
806	789	} else {
807		~~- $id = $higherLevelId; // use previous (quality -> sighted)~~
808		~~- $ts = $higherLevelTS; // use previous (quality -> sighted)~~
	790	+ $id = $higherLevelId; // use previous (quality -> checked)
	791	+ $ts = $higherLevelTS; // use previous (quality -> checked)
809	792	}
810	793	# Get edits that actually are pending...
811	794	if ( $id && $latest > $id ) {
—	—	@@ -866,11 +849,12 @@
867	850	*/
868	851	public static function getRevisionTags( Title $title, $rev_id ) {
869	852	$dbr = wfGetDB( DB_SLAVE );
870		~~- $tags = $dbr->selectField( 'flaggedrevs', 'fr_tags',~~
	853	+ $tags = (string)$dbr->selectField( 'flaggedrevs',
	854	+ 'fr_tags',
871	855	array( 'fr_rev_id' => $rev_id,
872	856	'fr_page_id' => $title->getArticleId() ),
873		~~- __METHOD__ );~~
874		~~- $tags = $tags ? $tags : "";~~
	857	+ __METHOD__
	858	+ );
875	859	return FlaggedRevision::expandRevisionTags( strval( $tags ) );
876	860	}
877	861
—	—	@@ -1120,7 +1104,8 @@
1121	1105	* @param array $flags
1122	1106	* @return bool, is this revision at basic review condition?
1123	1107	*/
1124		~~- public static function isSighted( array $flags ) {~~
	1108	+ public static function isChecked( array $flags ) {
	1109	+ self::load();
1125	1110	return self::tagsAtLevel( $flags, self::$minSL );
1126	1111	}
1127	1112
—	—	@@ -1129,6 +1114,7 @@
1130	1115	* @return bool, is this revision at quality review condition?
1131	1116	*/
1132	1117	public static function isQuality( array $flags ) {
	1118	+ self::load();
1133	1119	return self::tagsAtLevel( $flags, self::$minQL );
1134	1120	}
1135	1121
—	—	@@ -1137,11 +1123,13 @@
1138	1124	* @return bool, is this revision at pristine review condition?
1139	1125	*/
1140	1126	public static function isPristine( array $flags ) {
	1127	+ self::load();
1141	1128	return self::tagsAtLevel( $flags, self::$minPL );
1142	1129	}
1143	1130
1144	1131	// Checks if $flags meets $reqFlagLevels
1145	1132	protected static function tagsAtLevel( array $flags, $reqFlagLevels ) {
	1133	+ self::load();
1146	1134	if ( empty( $flags ) ) {
1147	1135	return false;
1148	1136	}
—	—	@@ -1156,41 +1144,32 @@
1157	1145	/**
1158	1146	* Get the quality tier of review flags
1159	1147	* @param array $flags
1160		~~- * @return int, flagging tier (-1 for non-sighted)~~
	1148	+ * @return int flagging tier (FR_PRISTINE,FR_QUALITY,FR_CHECKED,-1)
1161	1149	*/
1162	1150	public static function getLevelTier( array $flags ) {
1163	1151	if ( self::isPristine( $flags ) ) {
1164	1152	return FR_PRISTINE; // 2
1165	1153	} elseif ( self::isQuality( $flags ) ) {
1166	1154	return FR_QUALITY; // 1
1167		~~- } elseif ( self::isSighted( $flags ) ) {~~
1168		~~- return FR_SIGHTED; // 0~~
	1155	+ } elseif ( self::isChecked( $flags ) ) {
	1156	+ return FR_CHECKED; // 0
1169	1157	}
1170	1158	return -1;
1171	1159	}
1172	1160
1173	1161	/**
1174	1162	* Get minimum level tags for a tier
	1163	+ * @param int $tier FR_PRISTINE/FR_QUALITY/FR_CHECKED
1175	1164	* @return array
1176	1165	*/
1177	1166	public static function quickTags( $tier ) {
1178	1167	self::load();
1179		~~- switch( $tier ) // select reference levels~~
1180		~~- {~~
1181		~~- case FR_PRISTINE:~~
1182		~~- $minLevels = self::$minPL;~~
1183		~~- break;~~
1184		~~- case FR_QUALITY:~~
1185		~~- $minLevels = self::$minQL;~~
1186		~~- break;~~
1187		~~- default:~~
1188		~~- $minLevels = self::$minSL;~~
	1168	+ if ( $tier == FR_PRISTINE ) {
	1169	+ return self::$minPL;
	1170	+ } elseif ( $tier == FR_QUALITY ) {
	1171	+ return self::$minQL;
1189	1172	}
1190		~~- $flags = array();~~
1191		~~- foreach ( self::getDimensions() as $tag => $x ) {~~
1192		~~- $flags[$tag] = $minLevels[$tag];~~
1193		~~- }~~
1194		~~- return $flags;~~
	1173	+ return self::$minSL;
1195	1174	}
1196	1175
1197	1176	/**
—	—	@@ -1205,7 +1184,7 @@
1206	1185	return null; // shouldn't happen
1207	1186	}
1208	1187	$flags = array();
1209		~~- foreach ( self::getDimensions() as $tag => $levels ) {~~
	1188	+ foreach ( self::getTags() as $tag ) {
1210	1189	# Try to keep this tag val the same as the stable rev's
1211	1190	$val = isset( $oldFlags[$tag] ) ? $oldFlags[$tag] : 1;
1212	1191	$val = min( $val, self::maxAutoReviewLevel( $tag ) );
—	—	@@ -1326,7 +1305,7 @@
1327	1306	$flags = self::getAutoReviewTags( $user, $oldSv->getTags() );
1328	1307	}
1329	1308	} else { // new page?
1330		~~- $flags = self::quickTags( FR_SIGHTED ); // use minimal level~~
	1309	+ $flags = self::quickTags( FR_CHECKED ); // use minimal level
1331	1310	}
1332	1311	if ( !is_array( $flags ) ) {
1333	1312	wfProfileOut( __METHOD__ );
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/forms/RevisionReviewForm.php
—	—	@@ -29,7 +29,6 @@
30	30	protected $comment = '';
31	31	protected $dims = array();
32	32
33		~~- protected $unapprovedTags = 0;~~
34	33	protected $oflags = array();
35	34	protected $inputLock = 0; # Disallow bad submissions
36	35
—	—	@@ -203,35 +202,25 @@
204	203	protected function checkSettings() {
205	204	$status = $this->checkTarget();
206	205	if ( $status !== true ) {
207		~~- return $status; // bad target~~
	206	+ return $status; // bad page target
	207	+ } elseif ( !$this->oldid ) {
	208	+ return 'review_no_oldid'; // bad revision target
208	209	}
209		~~- if ( !$this->oldid ) {~~
210		~~- return 'review_no_oldid';~~
211		~~- }~~
212		~~- # Check that this is an approval or de-approval~~
	210	+ # Check that an action is specified (approve, reject, de-approve)
213	211	if ( $this->getAction() === null ) {
214	212	return 'review_param_missing'; // user didn't say
215	213	}
216	214	# Fill in implicit tag data for binary flag case
217	215	$iDims = $this->implicitDims();
218	216	if ( $iDims ) {
219		~~- $this->dims = $iDims;~~
220		~~- } else {~~
221		~~- foreach ( FlaggedRevs::getDimensions() as $tag ) {~~
222		~~- if ( $this->dims[$tag] === 0 ) {~~
223		~~- $this->unapprovedTags++;~~
224		~~- }~~
225		~~- }~~
	217	+ $this->dims = $iDims; // binary flag case
226	218	}
227		~~- # We must at least rate each category as 1, the minimum~~
228		~~- # Exception: we can rate ALL as unapproved to depreciate a revision~~
229		~~- if ( $this->unapprovedTags~~
230		~~- && $this->unapprovedTags < count( FlaggedRevs::getDimensions() ) )~~
231		~~- {~~
232		~~- return 'review_too_low';~~
233		~~- }~~
234		~~- # Special token to discourage fiddling with template/files...~~
235	219	if ( $this->getAction() === 'approve' ) {
	220	+ # We must at least rate each category as 1, the minimum
	221	+ if ( in_array( 0, $this->dims, true ) ) {
	222	+ return 'review_too_low';
	223	+ }
	224	+ # Special token to discourage fiddling with template/files...
236	225	$k = self::validationKey(
237	226	$this->templateParams, $this->imageParams, $this->fileVersion, $this->oldid );
238	227	if ( $this->validatedParams !== $k ) {
—	—	@@ -644,7 +633,7 @@
645	634	}
646	635	$oldFlags = $frev
647	636	? $frev->getTags() // existing tags
648		~~- : FlaggedRevs::quickTags( FR_SIGHTED ); // basic tags~~
	637	+ : FlaggedRevs::quickTags( FR_CHECKED ); // basic tags
649	638
650	639	# If we are reviewing updates to a page, start off with the stable revision's
651	640	# flags. Otherwise, we just fill them in with the selected revision's flags.
—	—	@@ -748,7 +737,7 @@
749	738	$form .= Xml::openElement( 'span', array( 'style' => 'white-space: nowrap;' ) );
750	739	# Hide comment input if needed
751	740	if ( !$disabled ) {
752		~~- if ( count( FlaggedRevs::getDimensions() ) > 1 ) {~~
	741	+ if ( count( FlaggedRevs::getTags() ) > 1 ) {
753	742	$form .= "<br />"; // Don't put too much on one line
754	743	}
755	744	$form .= "<span id='mw-fr-commentbox' style='clear:both'>" .
—	—	@@ -809,7 +798,6 @@
810	799	if ( $labels === false ) {
811	800	$disabled = true; // a tag is unsettable
812	801	}
813		~~- $dimensions = FlaggedRevs::getDimensions();~~
814	802	# If there are no tags, make one checkbox to approve/unapprove
815	803	if ( FlaggedRevs::binaryFlagging() ) {
816	804	return '';
—	—	@@ -818,7 +806,7 @@
819	807	# Build rating form...
820	808	if ( $disabled ) {
821	809	// Display the value for each tag as text
822		~~- foreach ( $dimensions as $quality => $levels ) {~~
	810	+ foreach ( FlaggedRevs::getTags() as $quality ) {
823	811	$selected = isset( $flags[$quality] ) ? $flags[$quality] : 0;
824	812	$items[] = FlaggedRevs::getTagMsg( $quality ) . ": " .
825	813	FlaggedRevs::getTagValueMsg( $quality, $selected );
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedRevision.php
—	—	@@ -739,23 +739,23 @@
740	740	* @return Array
741	741	*/
742	742	public static function expandRevisionTags( $tags ) {
743		~~- # Set all flags to zero~~
744	743	$flags = array();
745		~~- foreach ( FlaggedRevs::getDimensions() as $tag => $levels ) {~~
746		~~- $flags[$tag] = 0;~~
	744	+ foreach ( FlaggedRevs::getTags() as $tag ) {
	745	+ $flags[$tag] = 0; // init all flags values to zero
747	746	}
748	747	$tags = str_replace( '\n', "\n", $tags ); // B/C, old broken rows
	748	+ // Tag string format is <tag:val\ntag:val\n...>
749	749	$tags = explode( "\n", $tags );
750	750	foreach ( $tags as $tuple ) {
751	751	$set = explode( ':', $tuple, 2 );
752	752	if ( count( $set ) == 2 ) {
753	753	list( $tag, $value ) = $set;
754		~~- $value = intval( $value );~~
755		~~- # Add only currently recognized ones~~
	754	+ $value = max( 0, (int)$value ); // validate
	755	+ # Add only currently recognized tags
756	756	if ( isset( $flags[$tag] ) ) {
757		~~- # If a level was removed, default to the highest~~
758		~~- $flags[$tag] = $value < count( $levels ) ?~~
759		~~- $value : count( $levels ) - 1;~~
	757	+ $levels = FlaggedRevs::getTagLevels( $tag );
	758	+ # If a level was removed, default to the highest...
	759	+ $flags[$tag] = min( $value, count( $levels ) - 1 );
760	760	}
761	761	}
762	762	}
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/specialpages/PendingChanges_body.php
—	—	@@ -302,7 +302,7 @@
303	303	$namespace = $vnamespaces;
304	304	}
305	305	$this->namespace = $namespace;
306		~~- # Sanity check level: 0 = sighted; 1 = quality; 2 = pristine~~
	306	+ # Sanity check level: 0 = checked; 1 = quality; 2 = pristine
307	307	$this->level = ( $level >= 0 && $level <= 2 ) ? $level : - 1;
308	308	$this->category = $category ? str_replace( ' ', '_', $category ) : null;
309	309	$this->size = ( $size !== null ) ? intval( $size ) : null;
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/specialpages/RevisionReview_body.php
—	—	@@ -57,7 +57,7 @@
58	58	# Special token to discourage fiddling...
59	59	$form->setValidatedParams( $wgRequest->getVal( 'validatedParams' ) );
60	60	# Tag values
61		~~- foreach ( FlaggedRevs::getDimensions() as $tag ) {~~
	61	+ foreach ( FlaggedRevs::getTags() as $tag ) {
62	62	# This can be NULL if we uncheck a checkbox
63	63	$val = $wgRequest->getInt( "wp$tag" );
64	64	$form->setDim( $tag, $val );
—	—	@@ -136,7 +136,7 @@
137	137	if ( wfReadOnly() ) {
138	138	return '<err#>' . wfMsgExt( 'revreview-failed', 'parseinline' );
139	139	}
140		~~- $tags = FlaggedRevs::getDimensions();~~
	140	+ $tags = FlaggedRevs::getTags();
141	141	// Make review interface object
142	142	$form = new RevisionReviewForm( $wgUser );
143	143	$title = null; // target page
—	—	@@ -192,7 +192,7 @@
193	193	break;
194	194	default:
195	195	$p = preg_replace( '/^wp/', '', $par ); // kill any "wp" prefix
196		~~- if ( array_key_exists( $p, $tags ) ) {~~
	196	+ if ( in_array( $p, $tags ) ) {
197	197	$form->setDim( $p, $val );
198	198	}
199	199	break;
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/specialpages/QualityOversight_body.php
—	—	@@ -90,7 +90,7 @@
91	91	private function getActions() {
92	92	$actions = array( 'approve' => 1, 'approve2' => 1, 'approve-a' => 1, 'approve-i' => 1,
93	93	'approve-ia' => 1, 'approve2-i' => 1, 'unapprove' => 1, 'unapprove2' => 1 );
94		~~- if ( $this->level === 0 ) { // sighted revisions~~
	94	+ if ( $this->level === 0 ) { // checked revisions
95	95	$actions['approve2'] = 0;
96	96	$actions['approve2-i'] = 0;
97	97	$actions['unapprove2'] = 0;
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
—	—	@@ -278,7 +278,7 @@
279	279	$this->mForm = $form;
280	280	# Must be a content page...
281	281	$this->namespace = FlaggedRevs::getReviewNamespaces();
282		~~- # Sanity check level: 0 = sighted; 1 = quality; 2 = pristine~~
	282	+ # Sanity check level: 0 = checked; 1 = quality; 2 = pristine
283	283	$this->level = ( $level >= 0 && $level <= 2 ) ? $level : - 1;
284	284	$this->tag = $tag;
285	285	$this->category = $category ? str_replace( ' ', '_', $category ) : null;
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedRevsXML.php
—	—	@@ -182,7 +182,7 @@
183	183	if ( $prettyBox ) {
184	184	$tag .= "<table id='mw-fr-revisionratings-box' align='center' class='$css' cellpadding='0'>";
185	185	}
186		~~- foreach ( FlaggedRevs::getDimensions() as $quality ) {~~
	186	+ foreach ( FlaggedRevs::getTags() as $quality ) {
187	187	$level = isset( $flags[$quality] ) ? $flags[$quality] : 0;
188	188	$encValueText = wfMsgHtml( "revreview-$quality-$level" );
189	189	$level = $flags[$quality];
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedRevs.hooks.php
—	—	@@ -44,7 +44,7 @@
45	45	* Add FlaggedRevs css/js.
46	46	*/
47	47	protected static function injectStyleAndJS() {
48		~~- global $wgOut, $wgUser;~~
	48	+ global $wgOut, $wgUser, $wgFlaggedRevStyleVersion;
49	49	if ( $wgOut->hasHeadItem( 'FlaggedRevs' ) ) {
50	50	return true; # Don't double-load
51	51	}
—	—	@@ -53,22 +53,20 @@
54	54	if ( !$fa \|\| !$fa->isReviewable() ) {
55	55	return true;
56	56	}
57		~~- global $wgJsMimeType, $wgFlaggedRevStyleVersion;~~
58	57	$stylePath = FlaggedRevs::styleUrlPath();
59	58	# Get JS/CSS file locations
60	59	$encCssFile = htmlspecialchars( "$stylePath/flaggedrevs.css?$wgFlaggedRevStyleVersion" );
61	60	$encJsFile = htmlspecialchars( "$stylePath/flaggedrevs.js?$wgFlaggedRevStyleVersion" );
62		-
63		~~- //TODO fix this to use the correct method~~
	61	+
64	62	# Add CSS file
65		~~- //$wgOut->addExtensionStyle( $encCssFile );~~
	63	+ $linkedStyle = Html::linkedStyle( $encCssFile );
	64	+ $wgOut->addHeadItem( 'FlaggedRevs', $linkedStyle );
66	65	# Add main JS file
67		~~- $head = "<script type=\"{$wgJsMimeType}\" src=\"{$encJsFile}\"></script>";~~
68		~~- $head .= "<link rel=\"stylesheet\" href=\"{$encCssFile}\"></link>";~~
	66	+ $wgOut->addScriptFile( $encJsFile );
69	67	# Add review form JS for reviewers
70	68	if ( $wgUser->isAllowed( 'review' ) ) {
71	69	$encJsFile = htmlspecialchars( "$stylePath/review.js?$wgFlaggedRevStyleVersion" );
72		~~- $head .= "\n<script type=\"{$wgJsMimeType}\" src=\"{$encJsFile}\"></script>";~~
	70	+ $wgOut->addScriptFile( $encJsFile );
73	71	}
74	72	# Set basic messages for all users...
75	73	$msgs = array(
—	—	@@ -84,14 +82,15 @@
85	83	# Extra reviewer messages...
86	84	if ( $wgUser->isAllowed( 'review' ) ) {
87	85	$msgs['saveArticle'] = wfMsgHtml( 'savearticle' );
88		~~- $msgs['tooltipSave'] = wfMsgHtml( 'tooltip-save' ).' ['.wfMsgHtml( 'accesskey-save' ).']';~~
	86	+ $msgs['tooltipSave'] = wfMsgHtml( 'tooltip-save' ) .
	87	+ ' [' . wfMsgHtml( 'accesskey-save' ) . ']';
89	88	$msgs['submitArticle'] = wfMsg( 'revreview-submitedit' );
90	89	$msgs['tooltipSubmit'] = wfMsg( 'revreview-submitedit-title' ) .
91	90	' ['. wfMsg( 'accesskey-save' ) . ']';
92	91	}
93		~~- $head .= "\n<script type=\"{$wgJsMimeType}\">" .~~
94		~~- "FlaggedRevs.messages = " . Xml::encodeJsVar( (object)$msgs ) . ";</script>\n";~~
95		~~- $wgOut->addHeadItem( 'FlaggedRevs', $head );~~
	92	+ # Add msgs to JS
	93	+ $wgOut->addInlineScript(
	94	+ "FlaggedRevs.messages = " . Xml::encodeJsVar( (object)$msgs ) . ";" );
96	95
97	96	return true;
98	97	}
—	—	@@ -113,6 +112,11 @@
114	113	$globalVars['wgStableRevisionId'] = $stableId;
115	114	$globalVars['wgLatestRevisionId'] = $fa->getLatest();
116	115	$globalVars['wgPageId'] = $fa->getID();
	116	+ $revisionContents = (object) array(
	117	+ 'error' => wfMsgHtml( 'revcontents-error' ),
	118	+ 'waiting' => wfMsgHtml( 'revcontents-waiting' )
	119	+ );
	120	+ $globalVars['wgRevContents'] = $revisionContents;
117	121	if ( $wgUser->isAllowed( 'review' ) ) {
118	122	$ajaxReview = (object) array(
119	123	'sendMsg' => wfMsgHtml( 'revreview-submit' ),
—	—	@@ -876,7 +880,7 @@
877	881	$quality = FlaggedRevs::getRevQuality(
878	882	$rc->mAttribs['rc_cur_id'], $revId, FR_MASTER );
879	883	// Reviewed => patrolled
880		~~- if ( $quality !== false && $quality >= FR_SIGHTED ) {~~
	884	+ if ( $quality !== false && $quality >= FR_CHECKED ) {
881	885	RevisionReviewForm::updateRecentChanges( $rc->getTitle(), $revId );
882	886	$rc->mAttribs['rc_patrolled'] = 1; // make sure irc/email notifs know status
883	887	}
—	—	@@ -1122,7 +1126,7 @@
1123	1127	}
1124	1128	}
1125	1129	}
1126		~~- # Check implicitly sighted edits~~
	1130	+ # Check implicitly checked edits
1127	1131	if ( $totalCheckedEditsNeeded && $wgFlaggedRevsAutoconfirm['totalCheckedEdits'] ) {
1128	1132	$dbr = wfGetDB( DB_SLAVE );
1129	1133	$res = $dbr->select( array( 'revision', 'flaggedpages' ), '1',
—	—	@@ -1316,7 +1320,7 @@
1317	1321	return true;
1318	1322	}
1319	1323	}
1320		~~- # Check implicitly sighted edits~~
	1324	+ # Check implicitly checked edits
1321	1325	if ( $totalCheckedEditsNeeded && $wgFlaggedRevsAutopromote['totalCheckedEdits'] ) {
1322	1326	$dbr = isset( $dbr ) ? $dbr : wfGetDB( DB_SLAVE );
1323	1327	$res = $dbr->select( array( 'revision', 'flaggedpages' ), '1',
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/api/ApiQueryReviewedpages.php
—	—	@@ -173,7 +173,7 @@
174	174	'end' => 'Stop listing at this page id.',
175	175	'namespace' => 'The namespaces to enumerate.',
176	176	'filterredir' => 'How to filter for redirects',
177		~~- 'filterlevel' => 'How to filter by quality (0=sighted,1=quality)',~~
	177	+ 'filterlevel' => 'How to filter by quality (0=checked,1=quality)',
178	178	'limit' => 'How many total pages to return.',
179	179	'dir' => array(
180	180	'In which direction to list.',
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/api/ApiReview.php
—	—	@@ -62,7 +62,7 @@
63	63	$form->setNotes( $params['notes'] );
64	64	// The flagging parameters have the form 'flag_$name'.
65	65	// Extract them and put the values into $form->dims
66		~~- foreach ( FlaggedRevs::getDimensions() as $tag ) {~~
	66	+ foreach ( FlaggedRevs::getTags() as $tag ) {
67	67	$form->setDim( $tag, intval( $params['flag_' . $tag] ) );
68	68	}
69	69	if ( $form->isApproval() ) {
—	—	@@ -174,7 +174,7 @@
175	175	if ( FlaggedRevs::dimensionsEmpty() ) {
176	176	$desc['unapprove'] = "If set, revision will be unapproved rather than approved.";
177	177	} else {
178		~~- foreach ( FlaggedRevs::getDimensions() as $flagname ) {~~
	178	+ foreach ( FlaggedRevs::getTags() as $flagname ) {
179	179	$desc['flag_' . $flagname] = "Set the flag ''{$flagname}'' to the specified value";
180	180	}
181	181	}
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/api/ApiQueryUnreviewedpages.php
—	—	@@ -164,7 +164,7 @@
165	165	'end' => 'Stop listing at this page title.',
166	166	'namespace' => 'The namespaces to enumerate.',
167	167	'filterredir' => 'How to filter for redirects',
168		~~- 'filterlevel' => 'How to filter by quality (0=sighted,1=quality)',~~
	168	+ 'filterlevel' => 'How to filter by quality (0=checked,1=quality)',
169	169	'limit' => 'How many total pages to return.',
170	170	);
171	171	}
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/FlaggedArticleView.php
—	—	@@ -1801,13 +1801,13 @@
1802	1802	* If this is a diff page then replace the article contents with a link to the specific revision.
1803	1803	* This will be replaced with artice content using javascript and an api call.
1804	1804	*/
1805		~~- public function addCustomHtml( OutputPage &$out ) {~~
	1805	+ public function addCustomHtml( OutputPage $out ) {
1806	1806	global $wgTitle, $wgScript, $wgRequest;
1807	1807	$this->load();
1808	1808	if ( $wgRequest->getVal( 'oldid' ) ) {
1809	1809	$oldId = $wgRequest->getVal( 'oldid' );
1810	1810	$oldRevisionUrl = $wgScript . '?title=' . $wgTitle . '&oldid=' . $oldId;
1811		~~- $out->addHTML( "<div id='mw-fr-revisioncontents'>Click <a href='" . $oldRevisionUrl . "' >here</a> to view this revision.</div>" );~~
	1811	+ $out->addHTML( "<div id='mw-fr-revisioncontents'>" . wfMsg( 'revcontents-getcontents', $oldRevisionUrl ) . "</div>" );
1812	1812	}
1813	1813
1814	1814	}
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/client/flaggedrevs.css
—	—	@@ -333,14 +333,12 @@
334	334	.loading {
335	335	display: block;
336	336	color: #666666;
337		~~- padding-left: 32px;~~
	337	+ padding-left: 40px;
338	338	height: 32px;
339	339	}
340	340	.spinner {
341		~~- background-image: url(img/loading-small.gif) !important;~~
342	341	background-position: left center;
343		~~- background-repeat: no-repeat;~~
344		~~- margin-left: 0.5em;~~
345		~~- margin-top: -0.25em;~~
	342	+ margin-left: 1em;
	343	+ margin-top: -1.3em;
346	344	float: left;
347	345	}
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/client/flaggedrevs.js
—	—	@@ -191,39 +191,44 @@
192	192	if( contentsDiv ) {
193	193	var diffUIParams = document.getElementById("mw-fr-diff-dataform");
194	194	var oldRevId = diffUIParams.getElementsByTagName('input')[1].value;
195		~~- contentsDiv.innerHTML = "<span class='loading spinner'></span><span class='loading' >Waiting for contents</span>";~~
	195	+ var origContents = contentsDiv.innerHTML;
	196	+ contentsDiv.innerHTML = "<span class='loading mw-small-spinner spinner'></span><span class='loading' >" + wgRevContents.waiting + "</span>";
196	197	var requestArgs = 'action=parse&prop=text&format=xml';
197	198	if ( window.wgLatestRevisionId == oldRevId ) {
198	199	requestArgs += '&pageid=' + window.wgPageId;
199	200	} else {
200	201	requestArgs += '&oldid=' + oldRevId;
201	202	}
202		~~- timeoutId = window.setTimeout( function() {~~
203		~~- $.ajax({~~
	203	+ var call = $.ajax({
204	204	url : wgScriptPath + '/api.php',
205	205	type : "GET",
206	206	data : requestArgs,
207	207	dataType: "xml",
208	208	success : function( result ) {
209	209	contents = $(result).find("text");
210		~~- if ( contents ) {~~
	210	+ if ( contents && contents.text() ) {
211	211	contentsDiv.innerHTML = contents.text();
	212	+ } else {
	213	+ contentsDiv.innerHTML = wgRevContents.error + " " + origContents;
212	214	}
213	215	},
214	216	error : function(xmlHttpRequest, textStatus, errThrown) {
215		~~- alert("error: " + textStauts);~~
	217	+ contentsDiv.innerHTML = wgRevContents.error + " " + origContents;
216	218	}
217	219	});
218		~~- }, 1000 );~~
219	220	}
220		~~- if ( prevLink && timeoutId ) {~~
	221	+ if ( prevLink ) {
221	222	prevLink.onclick = function() {
222		~~- window.clearTimeout( timeoutId );~~
	223	+ if ( call ) {
	224	+ call.abort();
	225	+ }
223	226	}
224	227	}
225		~~- if ( nextLink && timeoutId ) {~~
	228	+ if ( nextLink ) {
226	229	nextLink.onclick = function() {
227		~~- window.clearTimeout( timeoutId );~~
	230	+ if ( call ) {
	231	+ call.abort();
	232	+ }
228	233	}
229	234	}
230	235	}
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/client/img/loading-small.gif
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: branches/chad-pre-wmf-merge/extensions/FlaggedRevs/client/review.js
—	—	@@ -52,10 +52,10 @@
53	53
54	54	// (a) If only a few levels are zero ("incomplete") then disable submission.
55	55	// (b) Re-enable submission for already accepted revs when ratings change.
56		~~- var rsubmit = document.getElementById('mw-fr-submit-accept');~~
57		~~- if( rsubmit ) {~~
58		~~- rsubmit.disabled = somezero ? 'disabled' : '';~~
59		~~- rsubmit.value = wgAjaxReview.flagMsg; // reset to "Accept"~~
	56	+ var asubmit = document.getElementById('mw-fr-submit-accept');
	57	+ if( asubmit ) {
	58	+ asubmit.disabled = somezero ? 'disabled' : '';
	59	+ asubmit.value = wgAjaxReview.flagMsg; // reset to "Accept"
60	60	}
61	61
62	62	// Update colors of <select>
—	—	@@ -68,9 +68,9 @@
69	69	*/
70	70	FlaggedRevs.maybeDisableAcceptButton = function() {
71	71	if ( typeof(jsReviewNeedsChange) != 'undefined' && jsReviewNeedsChange == 1 ) {
72		~~- var rsubmit = document.getElementById('mw-fr-submit-accept');~~
73		~~- if( rsubmit ) {~~
74		~~- rsubmit.disabled = 'disabled';~~
	72	+ var asubmit = document.getElementById('mw-fr-submit-accept');
	73	+ if( asubmit ) {
	74	+ asubmit.disabled = 'disabled';
75	75	}
76	76	}
77	77	}
—	—	@@ -215,48 +215,28 @@
216	216	window.clearTimeout(wgAjaxReview.timeoutID);
217	217	}
218	218	var tier = 0; // review tier
219		~~- var response = request.responseText;~~
	219	+ var response = request.responseText; // full response text
220	220	var msg = response.substr(6); // remove <err#> or <suc#>
221	221	var tierMatch = msg.match(/^<t#(\d)>/);
222	222	if( tierMatch ) {
223	223	tier = tierMatch[1];
224	224	msg = msg.substr(5); // remove <t#x>
225	225	}
226		~~- var diffRevRatings = null;~~
227		~~- // Errors: output any error response message~~
228		~~- if( response.indexOf('<err#>') == 0 ) {~~
229		~~- jsMsg( msg, 'review' ); // success/failure notice~~
230		~~- window.scroll(0,0); // scroll up to notice~~
231		~~- // OK: get new diff UI elements~~
232		~~- } else {~~
233		~~- var diffUIParams = document.getElementById("mw-fr-diff-dataform");~~
234		~~- // Diffs: update the contents of the mw-fr-diff-headeritems div~~
235		~~- if ( diffUIParams ) {~~
236		~~- wgAjaxReview.inprogress = true;~~
237		~~- var args = []; // <oldid, newid>~~
238		~~- args.push( diffUIParams.getElementsByTagName('input')[0].value );~~
239		~~- args.push( diffUIParams.getElementsByTagName('input')[1].value );~~
240		~~- // Send!~~
241		~~- var old = sajax_request_type;~~
242		~~- sajax_request_type = "GET";~~
243		~~- sajax_do_call( "FlaggedArticleView::AjaxBuildDiffHeaderItems",~~
244		~~- args, wgAjaxReview.processDiffHeaderItemsResult );~~
245		~~- sajax_request_type = old;~~
246		~~- }~~
247		~~- }~~
248		~~- var rsubmit = document.getElementById("mw-fr-submit-accept");~~
249		~~- var usubmit = document.getElementById("mw-fr-submit-unaccept");~~
250		~~- var legend = document.getElementById("mw-fr-reviewformlegend");~~
251		~~- var diffNotice = document.getElementById("mw-fr-difftostable");~~
	226	+ // Some form elements...
	227	+ var asubmit = document.getElementById('mw-fr-submit-accept');
	228	+ var usubmit = document.getElementById('mw-fr-submit-unaccept');
	229	+ var legend = document.getElementById('mw-fr-reviewformlegend');
	230	+ var diffNotice = document.getElementById('mw-fr-difftostable');
252	231	var tagBox = document.getElementById('mw-fr-revisiontag');
253	232	// On success...
254	233	if( response.indexOf('<suc#>') == 0 ) {
	234	+ // (a) Update document title and form buttons...
255	235	document.title = wgAjaxReview.actioncomplete;
256		~~- if( rsubmit && usubmit ) {~~
	236	+ if( asubmit && usubmit ) {
257	237	// Revision was flagged
258		~~- if( rsubmit.value == wgAjaxReview.sendingMsg ) {~~
259		~~- rsubmit.value = wgAjaxReview.flaggedMsg; // done!~~
260		~~- rsubmit.style.fontWeight = 'bold';~~
	238	+ if( asubmit.value == wgAjaxReview.sendingMsg ) {
	239	+ asubmit.value = wgAjaxReview.flaggedMsg; // done!
	240	+ asubmit.style.fontWeight = 'bold';
261	241	// Unlock and reset unflag button
262	242	usubmit.value = wgAjaxReview.unflagMsg;
263	243	usubmit.removeAttribute( 'style' ); // back to normal
—	—	@@ -266,29 +246,52 @@
267	247	usubmit.value = wgAjaxReview.unflaggedMsg; // done!
268	248	usubmit.style.fontWeight = 'bold';
269	249	// Unlock and reset flag button
270		~~- rsubmit.value = wgAjaxReview.flagMsg;~~
271		~~- rsubmit.removeAttribute( 'style' ); // back to normal~~
272		~~- rsubmit.disabled = '';~~
	250	+ asubmit.value = wgAjaxReview.flagMsg;
	251	+ asubmit.removeAttribute( 'style' ); // back to normal
	252	+ asubmit.disabled = '';
273	253	}
274	254	}
275		~~- // Hide "review this" box on diffs~~
276		~~- if( diffNotice ) diffNotice.style.display = 'none';~~
277		~~- // Remove review tag from draft~~
	255	+ // (b) Remove review tag from drafts
278	256	if( tagBox ) tagBox.style.display = 'none';
	257	+ // (c) Update diff-related items...
	258	+ var diffUIParams = document.getElementById('mw-fr-diff-dataform');
	259	+ if ( diffUIParams ) {
	260	+ // Hide "review this" box on diffs
	261	+ if( diffNotice ) diffNotice.style.display = 'none';
	262	+ // Update the contents of the mw-fr-diff-headeritems div
	263	+ wgAjaxReview.inprogress = true;
	264	+ var args = []; // <oldid, newid>
	265	+ args.push( diffUIParams.getElementsByTagName('input')[0].value );
	266	+ args.push( diffUIParams.getElementsByTagName('input')[1].value );
	267	+ // Send!
	268	+ var old = sajax_request_type;
	269	+ sajax_request_type = "GET";
	270	+ sajax_do_call( "FlaggedArticleView::AjaxBuildDiffHeaderItems",
	271	+ args, wgAjaxReview.processDiffHeaderItemsResult );
	272	+ sajax_request_type = old;
	273	+ }
279	274	// On failure...
280	275	} else {
	276	+ // (a) Update document title and form buttons...
281	277	document.title = wgAjaxReview.actionfailed;
282		~~- if( rsubmit && usubmit ) {~~
	278	+ if( asubmit && usubmit ) {
283	279	// Revision was flagged
284		~~- if( rsubmit.value == wgAjaxReview.sendingMsg ) {~~
285		~~- rsubmit.value = wgAjaxReview.flagMsg; // back to normal~~
286		~~- rsubmit.disabled = ''; // unlock flag button~~
	280	+ if( asubmit.value == wgAjaxReview.sendingMsg ) {
	281	+ asubmit.value = wgAjaxReview.flagMsg; // back to normal
	282	+ asubmit.disabled = ''; // unlock flag button
287	283	// Revision was unflagged
288	284	} else if( usubmit.value == wgAjaxReview.sendingMsg ) {
289	285	usubmit.value = wgAjaxReview.unflagMsg; // back to normal
290	286	usubmit.disabled = ''; // unlock
291	287	}
292	288	}
	289	+ // (b) Output any error response message
	290	+ if ( response.indexOf('<err#>') == 0 ) {
	291	+ jsMsg( msg, 'review' ); // success/failure notice
	292	+ } else {
	293	+ jsMsg( request.responseText, 'review' ); // fatal notice
	294	+ }
	295	+ window.scroll(0,0); // scroll up to notice
293	296	}
294	297	wgAjaxReview.unlockForm();
295	298	};
—	—	@@ -307,9 +310,9 @@
308	311	}
309	312
310	313	wgAjaxReview.onLoad = function() {
311		~~- var rsubmit = document.getElementById("mw-fr-submit-accept");~~
312		~~- if( rsubmit ) {~~
313		~~- rsubmit.onclick = wgAjaxReview.ajaxCall;~~
	314	+ var asubmit = document.getElementById("mw-fr-submit-accept");
	315	+ if( asubmit ) {
	316	+ asubmit.onclick = wgAjaxReview.ajaxCall;
314	317	}
315	318	var usubmit = document.getElementById("mw-fr-submit-unaccept");
316	319	if( usubmit ) {
Property changes on: branches/chad-pre-wmf-merge/extensions/FlaggedRevs
___________________________________________________________________
Modified: svn:mergeinfo
317	320	Merged /trunk/extensions/FlaggedRevs:r76039,76107,76162,76218,76229-76230,76233,76268,76272,76317,76335,76353,76360,76395,76413,76476,76489,76492-76494,76542,76577

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r76494	(bug 25849) Fixed error from r76229 that made AJAX review think all tags had ...	aaron	03:27, 11 November 2010

Status & tagging log

22:59, 3 December 2010 Reedy (talk | contribs) changed the status of r76596 [removed: new added: ok]