http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100195
Revision: 100195 Author: reedy Date: 2011-10-19 00:41:59 +0000 (Wed, 19 Oct 2011) Log Message: ----------- 1.18wmf1 MFT r100190, r100191, r100193 Modified Paths: -------------- branches/wmf/1.18wmf1/extensions/Contest/Contest.i18n.php branches/wmf/1.18wmf1/extensions/Contest/Contest.php branches/wmf/1.18wmf1/extensions/Contest/Contest.settings.php branches/wmf/1.18wmf1/extensions/Contest/api/ApiContestQuery.php branches/wmf/1.18wmf1/extensions/Contest/specials/SpecialContestPage.php branches/wmf/1.18wmf1/extensions/Contest/specials/SpecialContests.php branches/wmf/1.18wmf1/extensions/Contest/specials/SpecialMyContests.php branches/wmf/1.18wmf1/extensions/Contest/test/ContestValidationTests.php Property Changed: ---------------- branches/wmf/1.18wmf1/extensions/Contest/ Property changes on: branches/wmf/1.18wmf1/extensions/Contest ___________________________________________________________________ Added: svn:mergeinfo + /branches/REL1_15/phase3/extensions/Contest:51646 /branches/REL1_17/phase3/extensions/Contest:81445,81448 /branches/new-installer/phase3/extensions/Contest:43664-66004 /branches/sqlite/extensions/Contest:58211-58321 /trunk/extensions/Contest:99592,99653,100190-100191,100193 /trunk/phase3/extensions/Contest:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,98578,98598,98656 Modified: branches/wmf/1.18wmf1/extensions/Contest/Contest.i18n.php =================================================================== --- branches/wmf/1.18wmf1/extensions/Contest/Contest.i18n.php 2011-10-19 00:38:09 UTC (rev 100194) +++ branches/wmf/1.18wmf1/extensions/Contest/Contest.i18n.php 2011-10-19 00:41:59 UTC (rev 100195) @@ -25,7 +25,7 @@ // Rights 'right-contestadmin' => 'Manage contests', - 'right-contestparticipant' => 'Participate in contests', + 'right-contestant' => 'Participate in contests', 'right-contestjudge' => 'Judge contest submissions', // Groups @@ -33,9 +33,9 @@ 'group-contestadmin-member' => '{{GENDER:$1|contest admin}}', 'grouppage-contestadmin' => 'Project:Contest_admins', - 'group-contestparticipant' => 'Contest participants', - 'group-contestparticipant-member' => '{{GENDER:$1|contest participant}}', - 'grouppage-contestparticipant' => 'Project:Contest_participants', + 'group-contestant' => 'Contestant', + 'group-contestant-member' => '{{GENDER:$1|Contestant}}', + 'grouppage-contestant' => 'Project:Contestant', 'group-contestjudge' => 'Contest judges', 'group-contestjudge-member' => '{{GENDER:$1|contest judge}}', @@ -296,14 +296,14 @@ 'contest-desc' => 'Ermöglicht Wettbewerbe sowie die anschließende Ermittlung der Gewinner durch Juroren', 'contest-toplink' => 'Meine Wettbewerbe', 'right-contestadmin' => 'Wettbewerbe verwalten', - 'right-contestparticipant' => 'An Wettbewerben teilnehmen', + 'right-contestant' => 'An Wettbewerben teilnehmen', 'right-contestjudge' => 'Wettbewerbsbeiträge beurteilen', 'group-contestadmin' => 'Wettbewerbsadministratoren', 'group-contestadmin-member' => '{{GENDER:$1|Wettbewerbsadministrator|Wettbewerbsadministratorin}}', 'grouppage-contestadmin' => 'Project:Wettbewerbsadministratoren', - 'group-contestparticipant' => 'Wettbewerbsteilnehmer', - 'group-contestparticipant-member' => '{{GENDER:$1|Wettbewerbsteilnehmer|Wettbewerbsteilnehmerin}}', - 'grouppage-contestparticipant' => 'Project:Wettbewerbsteilnehmer', + 'group-contestant' => 'Wettbewerbsteilnehmer', + 'group-contestant-member' => '{{GENDER:$1|Wettbewerbsteilnehmer|Wettbewerbsteilnehmerin}}', + 'grouppage-contestant' => 'Project:Wettbewerbsteilnehmer', 'group-contestjudge' => 'Wettbewerbsjuroren', 'group-contestjudge-member' => '{{GENDER:$1|Wettbewerbsjuror|Wettbewerbsjurorin}}', 'grouppage-contestjudge' => 'Project:Wettbewerbsjuroren', @@ -480,14 +480,14 @@ 'contest-desc' => 'Extension de concours qui permet aux utilisateurs de participer à des défis de concours organisés par un administrateur. Via une interface de jugement, les juges peuvent discuter et voter sur les propositions.', 'contest-toplink' => 'Mes concours', 'right-contestadmin' => 'Gérer les concours', - 'right-contestparticipant' => 'Participer aux concours', + 'right-contestant' => 'Participer aux concours', 'right-contestjudge' => 'Juger les réponses au concours', 'group-contestadmin' => 'Administrateurs du concours', 'group-contestadmin-member' => '{{GENDER:$1|administrateur du concours}}', 'grouppage-contestadmin' => 'Project:Contest_admins', - 'group-contestparticipant' => 'Participants au concours', - 'group-contestparticipant-member' => '{{GENDER:$1|participant au concours}}', - 'grouppage-contestparticipant' => 'Project:Contest_participants', + 'group-contestant' => 'Participants au concours', + 'group-contestant-member' => '{{GENDER:$1|participant au concours}}', + 'grouppage-contestant' => 'Project:Contest_participants', 'group-contestjudge' => 'Juges du concours', 'group-contestjudge-member' => '{{GENDER:$1|juge du concours}}', 'grouppage-contestjudge' => 'Project:Contest_judges', @@ -635,14 +635,14 @@ 'contest-desc' => 'Permitte al usatores de participar in concursos definite per administratores. Via un interfacie de judicamento, le judices pote discuter e votar sur submissiones.', 'contest-toplink' => 'Mi concursos', 'right-contestadmin' => 'Gerer concursos', - 'right-contestparticipant' => 'Participar in concursos', + 'right-contestant' => 'Participar in concursos', 'right-contestjudge' => 'Judicar submissiones de concurso', 'group-contestadmin' => 'Administratores de concurso', 'group-contestadmin-member' => '{{GENDER:$1|administrator|administratrice}} de concurso', 'grouppage-contestadmin' => 'Project:Administratores de concurso', - 'group-contestparticipant' => 'Participantes del concurso', - 'group-contestparticipant-member' => '{{GENDER:$1|participante}} de concurso', - 'grouppage-contestparticipant' => 'Project:Participantes de concurso', + 'group-contestant' => 'Participantes del concurso', + 'group-contestant-member' => '{{GENDER:$1|participante}} de concurso', + 'grouppage-contestant' => 'Project:Participantes de concurso', 'group-contestjudge' => 'Judices de concurso', 'group-contestjudge-member' => '{{GENDER:$1|judice}} de concurso', 'grouppage-contestjudge' => 'Project:Judices de concurso', @@ -790,14 +790,14 @@ 'contest-desc' => 'Додаток што им овозможува на корисниците да учествуваат во конкурси (задачи) приредени од администраторите. Жири комисијата има свој посредник за дискутирање и гласање за поднесеното.', 'contest-toplink' => 'Мои конкурси', 'right-contestadmin' => 'Раководење со конкурси', - 'right-contestparticipant' => 'Учество во конкурси', + 'right-contestant' => 'Учество во конкурси', 'right-contestjudge' => 'Оценување на учесници во конкурс', 'group-contestadmin' => 'Конкурсни администратори', 'group-contestadmin-member' => '{{GENDER:$1|конкурсен администратор}}', 'grouppage-contestadmin' => 'Project:Конкурсни_администратори', - 'group-contestparticipant' => 'Учесници во конкурси', - 'group-contestparticipant-member' => '{{GENDER:$1|учесник во конкурси}}', - 'grouppage-contestparticipant' => 'Project:Учесници_во_конкурси', + 'group-contestant' => 'Учесници во конкурси', + 'group-contestant-member' => '{{GENDER:$1|учесник во конкурси}}', + 'grouppage-contestant' => 'Project:Учесници_во_конкурси', 'group-contestjudge' => 'Конкурсно жири', 'group-contestjudge-member' => '{{GENDER:$1|член на конкурсно жири}}', 'grouppage-contestjudge' => 'Project:Конкурсно_жири', @@ -944,13 +944,13 @@ $messages['nl'] = array( 'contest-toplink' => 'Mijn wedstrijden', 'right-contestadmin' => 'Wedstrijden beheren', - 'right-contestparticipant' => 'Deelnemen aan wedstrijden', + 'right-contestant' => 'Deelnemen aan wedstrijden', 'group-contestadmin' => 'Wedstrijdbeheerders', 'group-contestadmin-member' => '{{GENDER:$1|wedstrijdbeheerder}}', 'grouppage-contestadmin' => 'Project:Wedstrijdbeheerders', - 'group-contestparticipant' => 'Wedstrijddeelnemers', - 'group-contestparticipant-member' => '{{GENDER:$1|wedstrijddeelnemer|wedstrijddeelneemster}}', - 'grouppage-contestparticipant' => 'Project:Wedstrijddeelnemers', + 'group-contestant' => 'Wedstrijddeelnemers', + 'group-contestant-member' => '{{GENDER:$1|wedstrijddeelnemer|wedstrijddeelneemster}}', + 'grouppage-contestant' => 'Project:Wedstrijddeelnemers', 'prefs-contest' => 'Wedstrijden', 'contest-prefs-showtoplink' => 'Een verwijzing naar [[Special:MyContests|mijn wedstrijden]] weergeven in het bovenste menu.', 'contest-status-draft' => 'Ontwerp (uitgeschakeld)', Modified: branches/wmf/1.18wmf1/extensions/Contest/Contest.php =================================================================== --- branches/wmf/1.18wmf1/extensions/Contest/Contest.php 2011-10-19 00:38:09 UTC (rev 100194) +++ branches/wmf/1.18wmf1/extensions/Contest/Contest.php 2011-10-19 00:41:59 UTC (rev 100195) @@ -112,7 +112,7 @@ // Rights $wgAvailableRights[] = 'contestadmin'; -$wgAvailableRights[] = 'contestparticipant'; +$wgAvailableRights[] = 'contestant'; $wgAvailableRights[] = 'contestjudge'; # Users that can manage the contests. @@ -124,12 +124,12 @@ $wgGroupPermissions['contestadmin' ]['contestadmin'] = true; # Users that can be contest participants. -$wgGroupPermissions['*' ]['contestparticipant'] = false; -$wgGroupPermissions['user' ]['contestparticipant'] = true; -//$wgGroupPermissions['autoconfirmed']['contestparticipant'] = true; -//$wgGroupPermissions['bot' ]['contestparticipant'] = false; -$wgGroupPermissions['sysop' ]['contestparticipant'] = true; -$wgGroupPermissions['contestparticipant']['contestparticipant'] = true; +$wgGroupPermissions['*' ]['contestant'] = false; +$wgGroupPermissions['user' ]['contestant'] = true; +//$wgGroupPermissions['autoconfirmed']['contestant'] = true; +//$wgGroupPermissions['bot' ]['contestant'] = false; +$wgGroupPermissions['sysop' ]['contestant'] = true; +$wgGroupPermissions['contestant']['contestant'] = true; # Users that can vote and comment on submissions. $wgGroupPermissions['*' ]['contestjudge'] = false; Modified: branches/wmf/1.18wmf1/extensions/Contest/Contest.settings.php =================================================================== --- branches/wmf/1.18wmf1/extensions/Contest/Contest.settings.php 2011-10-19 00:38:09 UTC (rev 100194) +++ branches/wmf/1.18wmf1/extensions/Contest/Contest.settings.php 2011-10-19 00:41:59 UTC (rev 100195) @@ -21,9 +21,9 @@ /** * Returns the default values for the settings. * setting name (string) => setting value (mixed) - * + * * @since 0.1 - * + * * @return array */ protected static function getDefaultSettings() { @@ -39,9 +39,9 @@ * Retruns an array with all settings after making sure they are * initialized (ie set settings have been merged with the defaults). * setting name (string) => setting value (mixed) - * + * * @since 0.1 - * + * * @return array */ public static function getSettings() { @@ -59,21 +59,21 @@ /** * Gets the value of the specified setting. - * + * * @since 0.1 - * + * * @param string $settingName - * + * * @throws MWException * @return mixed */ public static function get( $settingName ) { $settings = self::getSettings(); - + if ( !array_key_exists( $settingName, $settings ) ) { throw new MWException( 'Attempt to get non-existing setting "' . $settingName . '"' ); } - + return $settings[$settingName]; } Modified: branches/wmf/1.18wmf1/extensions/Contest/api/ApiContestQuery.php =================================================================== --- branches/wmf/1.18wmf1/extensions/Contest/api/ApiContestQuery.php 2011-10-19 00:38:09 UTC (rev 100194) +++ branches/wmf/1.18wmf1/extensions/Contest/api/ApiContestQuery.php 2011-10-19 00:41:59 UTC (rev 100195) @@ -229,6 +229,7 @@ */ public function getPossibleErrors() { return array_merge( parent::getPossibleErrors(), array( + array( 'badaccess-groups' ), ) ); } Modified: branches/wmf/1.18wmf1/extensions/Contest/specials/SpecialContestPage.php =================================================================== --- branches/wmf/1.18wmf1/extensions/Contest/specials/SpecialContestPage.php 2011-10-19 00:38:09 UTC (rev 100194) +++ branches/wmf/1.18wmf1/extensions/Contest/specials/SpecialContestPage.php 2011-10-19 00:41:59 UTC (rev 100195) @@ -125,7 +125,7 @@ $pages['contest-nav-contestwelcome'] = array( 'ContestWelcome', $contestName ); - if ( $user->isAllowed( 'contestparticipant' ) ) { + if ( $user->isAllowed( 'contestant' ) ) { $pages['contest-nav-contestsignup'] = array( 'ContestSignup', $contestName ); } Modified: branches/wmf/1.18wmf1/extensions/Contest/specials/SpecialContests.php =================================================================== --- branches/wmf/1.18wmf1/extensions/Contest/specials/SpecialContests.php 2011-10-19 00:38:09 UTC (rev 100194) +++ branches/wmf/1.18wmf1/extensions/Contest/specials/SpecialContests.php 2011-10-19 00:41:59 UTC (rev 100195) @@ -165,7 +165,7 @@ $fields = array(); - if ( $user->isAllowed( 'contestparticipant' ) ) { + if ( $user->isAllowed( 'contestant' ) ) { $name = Html::element( 'a', array( @@ -237,7 +237,7 @@ wfMsg( 'contest-nav-contestwelcome' ) ); - if ( $user->isAllowed( 'contestparticipant' ) ) { + if ( $user->isAllowed( 'contestant' ) ) { $links[] = Html::element( 'a', array( Modified: branches/wmf/1.18wmf1/extensions/Contest/specials/SpecialMyContests.php =================================================================== --- branches/wmf/1.18wmf1/extensions/Contest/specials/SpecialMyContests.php 2011-10-19 00:38:09 UTC (rev 100194) +++ branches/wmf/1.18wmf1/extensions/Contest/specials/SpecialMyContests.php 2011-10-19 00:41:59 UTC (rev 100195) @@ -21,7 +21,7 @@ * @since 0.1 */ public function __construct() { - parent::__construct( 'MyContests', 'contestparticipant' ); + parent::__construct( 'MyContests', 'contestant' ); } /** Modified: branches/wmf/1.18wmf1/extensions/Contest/test/ContestValidationTests.php =================================================================== --- branches/wmf/1.18wmf1/extensions/Contest/test/ContestValidationTests.php 2011-10-19 00:38:09 UTC (rev 100194) +++ branches/wmf/1.18wmf1/extensions/Contest/test/ContestValidationTests.php 2011-10-19 00:41:59 UTC (rev 100195) @@ -33,8 +33,8 @@ 'https://gitorious.org/statusnet/mainline/merge_requests/2224' => true, ); - foreach ( $tests as $test => $isValdid ) { - if ( $isValdid ) { + foreach ( $tests as $test => $isValid ) { + if ( $isValid ) { $this->assertEquals( true, SpecialMyContests::validateSubmissionField( $test ) ); } else { _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs