| Index: branches/wmf/1.18wmf1/extensions/Contest/test/ContestValidationTests.php |
| — | — | @@ -33,8 +33,8 @@ |
| 34 | 34 | 'https://gitorious.org/statusnet/mainline/merge_requests/2224' => true, |
| 35 | 35 | ); |
| 36 | 36 | |
| 37 | | - foreach ( $tests as $test => $isValdid ) { |
| 38 | | - if ( $isValdid ) { |
| | 37 | + foreach ( $tests as $test => $isValid ) { |
| | 38 | + if ( $isValid ) { |
| 39 | 39 | $this->assertEquals( true, SpecialMyContests::validateSubmissionField( $test ) ); |
| 40 | 40 | } |
| 41 | 41 | else { |
| Index: branches/wmf/1.18wmf1/extensions/Contest/Contest.i18n.php |
| — | — | @@ -25,7 +25,7 @@ |
| 26 | 26 | |
| 27 | 27 | // Rights |
| 28 | 28 | 'right-contestadmin' => 'Manage contests', |
| 29 | | - 'right-contestparticipant' => 'Participate in contests', |
| | 29 | + 'right-contestant' => 'Participate in contests', |
| 30 | 30 | 'right-contestjudge' => 'Judge contest submissions', |
| 31 | 31 | |
| 32 | 32 | // Groups |
| — | — | @@ -33,9 +33,9 @@ |
| 34 | 34 | 'group-contestadmin-member' => '{{GENDER:$1|contest admin}}', |
| 35 | 35 | 'grouppage-contestadmin' => 'Project:Contest_admins', |
| 36 | 36 | |
| 37 | | - 'group-contestparticipant' => 'Contest participants', |
| 38 | | - 'group-contestparticipant-member' => '{{GENDER:$1|contest participant}}', |
| 39 | | - 'grouppage-contestparticipant' => 'Project:Contest_participants', |
| | 37 | + 'group-contestant' => 'Contestant', |
| | 38 | + 'group-contestant-member' => '{{GENDER:$1|Contestant}}', |
| | 39 | + 'grouppage-contestant' => 'Project:Contestant', |
| 40 | 40 | |
| 41 | 41 | 'group-contestjudge' => 'Contest judges', |
| 42 | 42 | 'group-contestjudge-member' => '{{GENDER:$1|contest judge}}', |
| — | — | @@ -296,14 +296,14 @@ |
| 297 | 297 | 'contest-desc' => 'Ermöglicht Wettbewerbe sowie die anschließende Ermittlung der Gewinner durch Juroren', |
| 298 | 298 | 'contest-toplink' => 'Meine Wettbewerbe', |
| 299 | 299 | 'right-contestadmin' => 'Wettbewerbe verwalten', |
| 300 | | - 'right-contestparticipant' => 'An Wettbewerben teilnehmen', |
| | 300 | + 'right-contestant' => 'An Wettbewerben teilnehmen', |
| 301 | 301 | 'right-contestjudge' => 'Wettbewerbsbeiträge beurteilen', |
| 302 | 302 | 'group-contestadmin' => 'Wettbewerbsadministratoren', |
| 303 | 303 | 'group-contestadmin-member' => '{{GENDER:$1|Wettbewerbsadministrator|Wettbewerbsadministratorin}}', |
| 304 | 304 | 'grouppage-contestadmin' => 'Project:Wettbewerbsadministratoren', |
| 305 | | - 'group-contestparticipant' => 'Wettbewerbsteilnehmer', |
| 306 | | - 'group-contestparticipant-member' => '{{GENDER:$1|Wettbewerbsteilnehmer|Wettbewerbsteilnehmerin}}', |
| 307 | | - 'grouppage-contestparticipant' => 'Project:Wettbewerbsteilnehmer', |
| | 305 | + 'group-contestant' => 'Wettbewerbsteilnehmer', |
| | 306 | + 'group-contestant-member' => '{{GENDER:$1|Wettbewerbsteilnehmer|Wettbewerbsteilnehmerin}}', |
| | 307 | + 'grouppage-contestant' => 'Project:Wettbewerbsteilnehmer', |
| 308 | 308 | 'group-contestjudge' => 'Wettbewerbsjuroren', |
| 309 | 309 | 'group-contestjudge-member' => '{{GENDER:$1|Wettbewerbsjuror|Wettbewerbsjurorin}}', |
| 310 | 310 | 'grouppage-contestjudge' => 'Project:Wettbewerbsjuroren', |
| — | — | @@ -480,14 +480,14 @@ |
| 481 | 481 | '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.', |
| 482 | 482 | 'contest-toplink' => 'Mes concours', |
| 483 | 483 | 'right-contestadmin' => 'Gérer les concours', |
| 484 | | - 'right-contestparticipant' => 'Participer aux concours', |
| | 484 | + 'right-contestant' => 'Participer aux concours', |
| 485 | 485 | 'right-contestjudge' => 'Juger les réponses au concours', |
| 486 | 486 | 'group-contestadmin' => 'Administrateurs du concours', |
| 487 | 487 | 'group-contestadmin-member' => '{{GENDER:$1|administrateur du concours}}', |
| 488 | 488 | 'grouppage-contestadmin' => 'Project:Contest_admins', |
| 489 | | - 'group-contestparticipant' => 'Participants au concours', |
| 490 | | - 'group-contestparticipant-member' => '{{GENDER:$1|participant au concours}}', |
| 491 | | - 'grouppage-contestparticipant' => 'Project:Contest_participants', |
| | 489 | + 'group-contestant' => 'Participants au concours', |
| | 490 | + 'group-contestant-member' => '{{GENDER:$1|participant au concours}}', |
| | 491 | + 'grouppage-contestant' => 'Project:Contest_participants', |
| 492 | 492 | 'group-contestjudge' => 'Juges du concours', |
| 493 | 493 | 'group-contestjudge-member' => '{{GENDER:$1|juge du concours}}', |
| 494 | 494 | 'grouppage-contestjudge' => 'Project:Contest_judges', |
| — | — | @@ -635,14 +635,14 @@ |
| 636 | 636 | '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.', |
| 637 | 637 | 'contest-toplink' => 'Mi concursos', |
| 638 | 638 | 'right-contestadmin' => 'Gerer concursos', |
| 639 | | - 'right-contestparticipant' => 'Participar in concursos', |
| | 639 | + 'right-contestant' => 'Participar in concursos', |
| 640 | 640 | 'right-contestjudge' => 'Judicar submissiones de concurso', |
| 641 | 641 | 'group-contestadmin' => 'Administratores de concurso', |
| 642 | 642 | 'group-contestadmin-member' => '{{GENDER:$1|administrator|administratrice}} de concurso', |
| 643 | 643 | 'grouppage-contestadmin' => 'Project:Administratores de concurso', |
| 644 | | - 'group-contestparticipant' => 'Participantes del concurso', |
| 645 | | - 'group-contestparticipant-member' => '{{GENDER:$1|participante}} de concurso', |
| 646 | | - 'grouppage-contestparticipant' => 'Project:Participantes de concurso', |
| | 644 | + 'group-contestant' => 'Participantes del concurso', |
| | 645 | + 'group-contestant-member' => '{{GENDER:$1|participante}} de concurso', |
| | 646 | + 'grouppage-contestant' => 'Project:Participantes de concurso', |
| 647 | 647 | 'group-contestjudge' => 'Judices de concurso', |
| 648 | 648 | 'group-contestjudge-member' => '{{GENDER:$1|judice}} de concurso', |
| 649 | 649 | 'grouppage-contestjudge' => 'Project:Judices de concurso', |
| — | — | @@ -790,14 +790,14 @@ |
| 791 | 791 | 'contest-desc' => 'Додаток што им овозможува на корисниците да учествуваат во конкурси (задачи) приредени од администраторите. Жири комисијата има свој посредник за дискутирање и гласање за поднесеното.', |
| 792 | 792 | 'contest-toplink' => 'Мои конкурси', |
| 793 | 793 | 'right-contestadmin' => 'Раководење со конкурси', |
| 794 | | - 'right-contestparticipant' => 'Учество во конкурси', |
| | 794 | + 'right-contestant' => 'Учество во конкурси', |
| 795 | 795 | 'right-contestjudge' => 'Оценување на учесници во конкурс', |
| 796 | 796 | 'group-contestadmin' => 'Конкурсни администратори', |
| 797 | 797 | 'group-contestadmin-member' => '{{GENDER:$1|конкурсен администратор}}', |
| 798 | 798 | 'grouppage-contestadmin' => 'Project:Конкурсни_администратори', |
| 799 | | - 'group-contestparticipant' => 'Учесници во конкурси', |
| 800 | | - 'group-contestparticipant-member' => '{{GENDER:$1|учесник во конкурси}}', |
| 801 | | - 'grouppage-contestparticipant' => 'Project:Учесници_во_конкурси', |
| | 799 | + 'group-contestant' => 'Учесници во конкурси', |
| | 800 | + 'group-contestant-member' => '{{GENDER:$1|учесник во конкурси}}', |
| | 801 | + 'grouppage-contestant' => 'Project:Учесници_во_конкурси', |
| 802 | 802 | 'group-contestjudge' => 'Конкурсно жири', |
| 803 | 803 | 'group-contestjudge-member' => '{{GENDER:$1|член на конкурсно жири}}', |
| 804 | 804 | 'grouppage-contestjudge' => 'Project:Конкурсно_жири', |
| — | — | @@ -944,13 +944,13 @@ |
| 945 | 945 | $messages['nl'] = array( |
| 946 | 946 | 'contest-toplink' => 'Mijn wedstrijden', |
| 947 | 947 | 'right-contestadmin' => 'Wedstrijden beheren', |
| 948 | | - 'right-contestparticipant' => 'Deelnemen aan wedstrijden', |
| | 948 | + 'right-contestant' => 'Deelnemen aan wedstrijden', |
| 949 | 949 | 'group-contestadmin' => 'Wedstrijdbeheerders', |
| 950 | 950 | 'group-contestadmin-member' => '{{GENDER:$1|wedstrijdbeheerder}}', |
| 951 | 951 | 'grouppage-contestadmin' => 'Project:Wedstrijdbeheerders', |
| 952 | | - 'group-contestparticipant' => 'Wedstrijddeelnemers', |
| 953 | | - 'group-contestparticipant-member' => '{{GENDER:$1|wedstrijddeelnemer|wedstrijddeelneemster}}', |
| 954 | | - 'grouppage-contestparticipant' => 'Project:Wedstrijddeelnemers', |
| | 952 | + 'group-contestant' => 'Wedstrijddeelnemers', |
| | 953 | + 'group-contestant-member' => '{{GENDER:$1|wedstrijddeelnemer|wedstrijddeelneemster}}', |
| | 954 | + 'grouppage-contestant' => 'Project:Wedstrijddeelnemers', |
| 955 | 955 | 'prefs-contest' => 'Wedstrijden', |
| 956 | 956 | 'contest-prefs-showtoplink' => 'Een verwijzing naar [[Special:MyContests|mijn wedstrijden]] weergeven in het bovenste menu.', |
| 957 | 957 | 'contest-status-draft' => 'Ontwerp (uitgeschakeld)', |
| Index: branches/wmf/1.18wmf1/extensions/Contest/specials/SpecialMyContests.php |
| — | — | @@ -21,7 +21,7 @@ |
| 22 | 22 | * @since 0.1 |
| 23 | 23 | */ |
| 24 | 24 | public function __construct() { |
| 25 | | - parent::__construct( 'MyContests', 'contestparticipant' ); |
| | 25 | + parent::__construct( 'MyContests', 'contestant' ); |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | /** |
| Index: branches/wmf/1.18wmf1/extensions/Contest/specials/SpecialContestPage.php |
| — | — | @@ -125,7 +125,7 @@ |
| 126 | 126 | |
| 127 | 127 | $pages['contest-nav-contestwelcome'] = array( 'ContestWelcome', $contestName ); |
| 128 | 128 | |
| 129 | | - if ( $user->isAllowed( 'contestparticipant' ) ) { |
| | 129 | + if ( $user->isAllowed( 'contestant' ) ) { |
| 130 | 130 | $pages['contest-nav-contestsignup'] = array( 'ContestSignup', $contestName ); |
| 131 | 131 | } |
| 132 | 132 | |
| Index: branches/wmf/1.18wmf1/extensions/Contest/specials/SpecialContests.php |
| — | — | @@ -165,7 +165,7 @@ |
| 166 | 166 | |
| 167 | 167 | $fields = array(); |
| 168 | 168 | |
| 169 | | - if ( $user->isAllowed( 'contestparticipant' ) ) { |
| | 169 | + if ( $user->isAllowed( 'contestant' ) ) { |
| 170 | 170 | $name = Html::element( |
| 171 | 171 | 'a', |
| 172 | 172 | array( |
| — | — | @@ -237,7 +237,7 @@ |
| 238 | 238 | wfMsg( 'contest-nav-contestwelcome' ) |
| 239 | 239 | ); |
| 240 | 240 | |
| 241 | | - if ( $user->isAllowed( 'contestparticipant' ) ) { |
| | 241 | + if ( $user->isAllowed( 'contestant' ) ) { |
| 242 | 242 | $links[] = Html::element( |
| 243 | 243 | 'a', |
| 244 | 244 | array( |
| Index: branches/wmf/1.18wmf1/extensions/Contest/Contest.settings.php |
| — | — | @@ -21,9 +21,9 @@ |
| 22 | 22 | /** |
| 23 | 23 | * Returns the default values for the settings. |
| 24 | 24 | * setting name (string) => setting value (mixed) |
| 25 | | - * |
| | 25 | + * |
| 26 | 26 | * @since 0.1 |
| 27 | | - * |
| | 27 | + * |
| 28 | 28 | * @return array |
| 29 | 29 | */ |
| 30 | 30 | protected static function getDefaultSettings() { |
| — | — | @@ -39,9 +39,9 @@ |
| 40 | 40 | * Retruns an array with all settings after making sure they are |
| 41 | 41 | * initialized (ie set settings have been merged with the defaults). |
| 42 | 42 | * setting name (string) => setting value (mixed) |
| 43 | | - * |
| | 43 | + * |
| 44 | 44 | * @since 0.1 |
| 45 | | - * |
| | 45 | + * |
| 46 | 46 | * @return array |
| 47 | 47 | */ |
| 48 | 48 | public static function getSettings() { |
| — | — | @@ -59,21 +59,21 @@ |
| 60 | 60 | |
| 61 | 61 | /** |
| 62 | 62 | * Gets the value of the specified setting. |
| 63 | | - * |
| | 63 | + * |
| 64 | 64 | * @since 0.1 |
| 65 | | - * |
| | 65 | + * |
| 66 | 66 | * @param string $settingName |
| 67 | | - * |
| | 67 | + * |
| 68 | 68 | * @throws MWException |
| 69 | 69 | * @return mixed |
| 70 | 70 | */ |
| 71 | 71 | public static function get( $settingName ) { |
| 72 | 72 | $settings = self::getSettings(); |
| 73 | | - |
| | 73 | + |
| 74 | 74 | if ( !array_key_exists( $settingName, $settings ) ) { |
| 75 | 75 | throw new MWException( 'Attempt to get non-existing setting "' . $settingName . '"' ); |
| 76 | 76 | } |
| 77 | | - |
| | 77 | + |
| 78 | 78 | return $settings[$settingName]; |
| 79 | 79 | } |
| 80 | 80 | |
| Index: branches/wmf/1.18wmf1/extensions/Contest/Contest.php |
| — | — | @@ -112,7 +112,7 @@ |
| 113 | 113 | // Rights |
| 114 | 114 | |
| 115 | 115 | $wgAvailableRights[] = 'contestadmin'; |
| 116 | | -$wgAvailableRights[] = 'contestparticipant'; |
| | 116 | +$wgAvailableRights[] = 'contestant'; |
| 117 | 117 | $wgAvailableRights[] = 'contestjudge'; |
| 118 | 118 | |
| 119 | 119 | # Users that can manage the contests. |
| — | — | @@ -124,12 +124,12 @@ |
| 125 | 125 | $wgGroupPermissions['contestadmin' ]['contestadmin'] = true; |
| 126 | 126 | |
| 127 | 127 | # Users that can be contest participants. |
| 128 | | -$wgGroupPermissions['*' ]['contestparticipant'] = false; |
| 129 | | -$wgGroupPermissions['user' ]['contestparticipant'] = true; |
| 130 | | -//$wgGroupPermissions['autoconfirmed']['contestparticipant'] = true; |
| 131 | | -//$wgGroupPermissions['bot' ]['contestparticipant'] = false; |
| 132 | | -$wgGroupPermissions['sysop' ]['contestparticipant'] = true; |
| 133 | | -$wgGroupPermissions['contestparticipant']['contestparticipant'] = true; |
| | 128 | +$wgGroupPermissions['*' ]['contestant'] = false; |
| | 129 | +$wgGroupPermissions['user' ]['contestant'] = true; |
| | 130 | +//$wgGroupPermissions['autoconfirmed']['contestant'] = true; |
| | 131 | +//$wgGroupPermissions['bot' ]['contestant'] = false; |
| | 132 | +$wgGroupPermissions['sysop' ]['contestant'] = true; |
| | 133 | +$wgGroupPermissions['contestant']['contestant'] = true; |
| 134 | 134 | |
| 135 | 135 | # Users that can vote and comment on submissions. |
| 136 | 136 | $wgGroupPermissions['*' ]['contestjudge'] = false; |
| Index: branches/wmf/1.18wmf1/extensions/Contest/api/ApiContestQuery.php |
| — | — | @@ -229,6 +229,7 @@ |
| 230 | 230 | */ |
| 231 | 231 | public function getPossibleErrors() { |
| 232 | 232 | return array_merge( parent::getPossibleErrors(), array( |
| | 233 | + array( 'badaccess-groups' ), |
| 233 | 234 | ) ); |
| 234 | 235 | } |
| 235 | 236 | |
| Property changes on: branches/wmf/1.18wmf1/extensions/Contest |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 236 | 237 | Merged /branches/REL1_17/phase3/extensions/Contest:r81445,81448 |
| 237 | 238 | Merged /trunk/extensions/Contest:r99592,99653,100190-100191,100193 |
| 238 | 239 | Merged /branches/sqlite/extensions/Contest:r58211-58321 |
| 239 | 240 | Merged /trunk/phase3/extensions/Contest:r92580,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 |
| 240 | 241 | Merged /branches/new-installer/phase3/extensions/Contest:r43664-66004 |
| 241 | 242 | Merged /branches/REL1_15/phase3/extensions/Contest:r51646 |