Index: trunk/extensions/GroupPermissionsManager/plugins/ExtendedPermissions.php |
— | — | @@ -15,7 +15,7 @@ |
16 | 16 | 'name' => 'Extended Permissions', |
17 | 17 | 'author' => 'Ryan Schmidt', |
18 | 18 | 'url' => 'http://www.mediawiki.org/wiki/Extension:GroupPermissionsManager', |
19 | | - 'version' => '1.3', |
| 19 | + 'version' => '1.4', |
20 | 20 | 'description' => 'Extended permissions system', |
21 | 21 | 'descriptionmsg' => 'grouppermissions-desc2', |
22 | 22 | ); |
— | — | @@ -167,7 +167,7 @@ |
168 | 168 | } |
169 | 169 | } |
170 | 170 | } |
171 | | - if( ($wgRequest->getVal('diff') || $wgRequest->getVal('oldid')) && !$wgUser->isAllowed('readold') ) { |
| 171 | + if( ($wgRequest->getVal('diff') || $wgRequest->getVal('oldid')) && !$user->isAllowed('readold') ) { |
172 | 172 | //if they can't read it, they shouldn't be able to do other stuff with it anyway |
173 | 173 | $result = $err; |
174 | 174 | return false; |
Index: trunk/extensions/GroupPermissionsManager/GroupPermissionsManager_body.php |
— | — | @@ -249,7 +249,10 @@ |
250 | 250 | $form .= '<fieldset><legend>'.wfMsgHtml("grouppermissions-sort-$type").'</legend>'; |
251 | 251 | $form .= "\n<h2>".wfMsgHtml("grouppermissions-sort-$type")."</h2>\n<table>"; |
252 | 252 | foreach($list as $right => $value) { |
253 | | - $msg = wfMsg('grouppermissions-display', wfMsg('right-' . $right), $right); |
| 253 | + $rightmsg = wfMsg('right-' . $right); |
| 254 | + if(wfEmptyMsg('right-' . $right, $rightmsg)) |
| 255 | + $rightmsg = $right; |
| 256 | + $msg = wfMsg('grouppermissions-display', $rightmsg, $right); |
254 | 257 | $form .= "\n<tr><td>$msg</td><td>"; |
255 | 258 | if($value) { |
256 | 259 | $form .= $this->makeRadio($right, 'true', true) . $this->makeRadio($right, 'false') . $this->makeRadio($right, 'never'); |
Index: trunk/extensions/GroupPermissionsManager/GroupPermissionsManager.i18n.php |
— | — | @@ -50,7 +50,7 @@ |
51 | 51 | 'grouppermissions-log-name' => 'Group permissions log', |
52 | 52 | 'grouppermissions-log-header' => 'This page tracks changes to the underlying permissions of user groups.', |
53 | 53 | 'grouppermissions-needjs' => 'Warning: JavaScript is disabled on your browser. Some features may not work!', |
54 | | - 'grouppermissions-sp-header' => 'You may use this page to manage how permissions are sorted and add new permissions.', |
| 54 | + 'grouppermissions-sp-header' => 'You may use this page to manage how permissions are sorted and add new permissions. Hover over a permission to read its description', |
55 | 55 | 'grouppermissions-sp-sort' => 'Sort permissions', |
56 | 56 | 'grouppermissions-sp-save' => 'Save', |
57 | 57 | 'grouppermissions-sp-success' => 'Permissions have been successfully sorted', |
— | — | @@ -61,7 +61,7 @@ |
62 | 62 | 'grouppermissions-rug-header' => 'You may use this page to remove users from unused (deleted) groups.', |
63 | 63 | 'grouppermissions-rug-success' => 'Successfully removed users from unused groups!', |
64 | 64 | 'grouppermissions-rug-confirm' => 'Remove users from unused groups', |
65 | | - 'right-grouppermissions' => 'Manage group permissions (special pages: [[Special:GroupPermissions|GroupPermissions]] and [[Special:SortPermissions|SortPermissions]])', |
| 65 | + 'right-grouppermissions' => 'Manage group permissions', |
66 | 66 | 'right-viewsource' => 'View wiki source of protected pages', |
67 | 67 | 'right-raw' => 'View raw pages', |
68 | 68 | 'right-render' => 'View rendered pages without navigation', |
— | — | @@ -174,7 +174,7 @@ |
175 | 175 | 'grouppermissions-rug-header' => 'أنت يمكنك استخدام هذه الصفحة لإزالة المستخدمين من المجموعات غير المستخدمة (المحذوفة).', |
176 | 176 | 'grouppermissions-rug-success' => 'تمت إزالة المستخدمون من المجموعات غير المستخدمة بنجاح!', |
177 | 177 | 'grouppermissions-rug-confirm' => 'أزل المستخدمون من المجموعات غير المستخدمة', |
178 | | - 'right-grouppermissions' => 'التحكم بسماحات المجموعة (صفحات خاصة: [[Special:GroupPermissions|سماحات المجموعة]] و [[Special:SortPermissions|ترتيب السماحات]])', |
| 178 | + 'right-grouppermissions' => 'التحكم بسماحات المجموعة', |
179 | 179 | 'right-viewsource' => 'رؤية مصدر الويكي للصفحات المحمية', |
180 | 180 | 'right-raw' => 'رؤية الصفحات الخام', |
181 | 181 | 'right-render' => 'رؤية الصفحات الناتجة بدون إبحار', |
— | — | @@ -242,7 +242,7 @@ |
243 | 243 | 'grouppermissions-rug-header' => 'أنت يمكنك استخدام هذه الصفحة لإزالة المستخدمين من المجموعات غير المستخدمة (المحذوفة).', |
244 | 244 | 'grouppermissions-rug-success' => 'تمت إزالة المستخدمون من المجموعات غير المستخدمة بنجاح!', |
245 | 245 | 'grouppermissions-rug-confirm' => 'أزل المستخدمون من المجموعات غير المستخدمة', |
246 | | - 'right-grouppermissions' => 'التحكم بسماحات المجموعة (صفحات خاصة: [[Special:GroupPermissions|سماحات المجموعة]] و [[Special:SortPermissions|ترتيب السماحات]])', |
| 246 | + 'right-grouppermissions' => 'التحكم بسماحات المجموعة', |
247 | 247 | 'right-viewsource' => 'رؤية مصدر الويكى للصفحات المحمية', |
248 | 248 | 'right-raw' => 'رؤية الصفحات الخام', |
249 | 249 | 'right-render' => 'رؤية الصفحات الناتجة بدون إبحار', |
— | — | @@ -360,7 +360,7 @@ |
361 | 361 | 'grouppermissions-rug-header' => 'Auf dieser Seite kannst du Benutzer aus unbenutzten (gelöschten) Gruppen entfernen.', |
362 | 362 | 'grouppermissions-rug-success' => 'Benutzer wurden erfolgreich aus unbenutzten Gruppen entfernt!', |
363 | 363 | 'grouppermissions-rug-confirm' => 'Benutzer aus unbenutzten Gruppen entfernen', |
364 | | - 'right-grouppermissions' => 'Gruppenrechte verwalten (Spezialseiten: [[Special:GroupPermissions|GroupPermissions]] und [[Special:SortPermissions|SortPermissions]])', |
| 364 | + 'right-grouppermissions' => 'Gruppenrechte verwalten', |
365 | 365 | 'right-viewsource' => 'Wiki-Quelltext von geschützten Seiten ansehen', |
366 | 366 | 'right-raw' => 'Rohseiten ansehen', |
367 | 367 | 'right-render' => 'Gerenderte Seiten ohne Navigation ansehen', |
— | — | @@ -484,7 +484,7 @@ |
485 | 485 | 'grouppermissions-rug-header' => 'Vous pouvez utiliser cette page pour retirer les utilisateurs des groupes inutilisés ou supprimés.', |
486 | 486 | 'grouppermissions-rug-success' => 'Utilisateurs retirés avec succès des groupes inutilisés !', |
487 | 487 | 'grouppermissions-rug-confirm' => 'Retirer les utilisateurs des groupes inutilisés', |
488 | | - 'right-grouppermissions' => 'Gère les permissions des groupes (pages spéciales : [[Special:GroupPermissions|GroupPermissions]] et [[Special:SortPermissions|SortPermissions]])', |
| 488 | + 'right-grouppermissions' => 'Gère les permissions des groupes', |
489 | 489 | 'right-viewsource' => 'Voir le code source wiki des pages protégées', |
490 | 490 | 'right-raw' => 'Voir les pages brutes', |
491 | 491 | 'right-render' => 'Voir le rendu des pages sans navigation', |
— | — | @@ -560,7 +560,7 @@ |
561 | 561 | 'grouppermissions-rug-header' => 'Pode usar esta páxina para eliminar usuarios dos grupos sen uso (borrados).', |
562 | 562 | 'grouppermissions-rug-success' => 'Foron eliminados con éxito os usuarios dos grupos sen uso!', |
563 | 563 | 'grouppermissions-rug-confirm' => 'Eliminar os usuarios dos grupos sen uso', |
564 | | - 'right-grouppermissions' => 'Xestionar os permisos de grupo (páxina especial: [[Special:GroupPermissions|Permisos de grupo]] e [[Special:SortPermissions|Tipos de permisos]])', |
| 564 | + 'right-grouppermissions' => 'Xestionar os permisos de grupo', |
565 | 565 | 'right-viewsource' => 'Ver o código fonte das páxinas protexidas', |
566 | 566 | 'right-raw' => 'Ver as páxinas "brutas"', |
567 | 567 | 'right-render' => 'Ver as páxinas renderizadas sen navegación', |
— | — | @@ -628,7 +628,7 @@ |
629 | 629 | 'grouppermissions-rug-header' => 'Ovu stranicu možete koristiti za uklanjanje suradnika iz nekorištenih (izbrisanih) skupina.', |
630 | 630 | 'grouppermissions-rug-success' => 'Uspješno uklonjeni suradnici iz nekorištenih skupina!', |
631 | 631 | 'grouppermissions-rug-confirm' => 'Ukloni suradnike iz nekorištenih skupina', |
632 | | - 'right-grouppermissions' => 'Uređivanje prava skupina (posebne stranice: [[Special:GroupPermissions|prava skupina]] i [[Special:SortPermissions|raspored prava]])', |
| 632 | + 'right-grouppermissions' => 'Uređivanje prava skupina', |
633 | 633 | 'right-viewsource' => 'Gledanje izvora zaštićenih stranica', |
634 | 634 | 'right-raw' => 'Gledanje stranica u raw-u', |
635 | 635 | 'right-render' => 'Gledanje uređene stranice bez navigacije', |
— | — | @@ -695,7 +695,7 @@ |
696 | 696 | 'grouppermissions-rug-header' => 'Tu pote usar iste pagina pro remover usatores de gruppos non usate (delite).', |
697 | 697 | 'grouppermissions-rug-success' => 'Usatores removite con successo de gruppos non usate!', |
698 | 698 | 'grouppermissions-rug-confirm' => 'Remover usatores de gruppos non usate', |
699 | | - 'right-grouppermissions' => 'Gerer permissiones de gruppos (paginas special: [[Special:GroupPermissions|GroupPermissions]] e [[Special:SortPermissions|SortPermissions]])', |
| 699 | + 'right-grouppermissions' => 'Gerer permissiones de gruppos', |
700 | 700 | 'right-viewsource' => 'Vider le codice fonte wiki de paginas protegite', |
701 | 701 | 'right-raw' => 'Vider paginas crude', |
702 | 702 | 'right-render' => 'Vider le rendition de paginas sin navigaton', |
— | — | @@ -762,7 +762,7 @@ |
763 | 763 | 'grouppermissions-rug-header' => 'È possibile usare questa pagina per rimuovere utenti dai gruppi inutilizzati (cancellati).', |
764 | 764 | 'grouppermissions-rug-success' => 'Utenti rimossi con successo dai gruppi inutilizzati!', |
765 | 765 | 'grouppermissions-rug-confirm' => 'Rimuovi utenti dai gruppi inutilizzati', |
766 | | - 'right-grouppermissions' => 'Gestisce i permessi di gruppo (pagine speciali: [[Special:GroupPermissions|Permessi di gruppo]] e [[Special:SortPermissions|Ordina permessi]])', |
| 766 | + 'right-grouppermissions' => 'Gestisce i permessi di gruppo', |
767 | 767 | 'right-viewsource' => 'Visualizza il sorgente wiki di pagine protette', |
768 | 768 | 'right-info' => 'Visualizza le informazioni delle pagine', |
769 | 769 | 'right-history' => 'Visualizza le cronologie delle pagine', |
— | — | @@ -948,7 +948,7 @@ |
949 | 949 | 'grouppermissions-rug-header' => 'U kunt deze pagina gebruiken om gebruikers uit ongebruikte (verwijderde) groepen te verwijderen.', |
950 | 950 | 'grouppermissions-rug-success' => 'De gebruikers zijn uit de ongebruikte groepen verwijderd!', |
951 | 951 | 'grouppermissions-rug-confirm' => 'Gebruikers uit ongebruikte groepen verwijderen', |
952 | | - 'right-grouppermissions' => "Groepsrechten bekeren (speciale pagina's: [[Special:GroupPermissions|groepsrechten]] en [[Special:SortPermissions|rechten sorteren]])", |
| 952 | + 'right-grouppermissions' => "Groepsrechten bekeren", |
953 | 953 | 'right-viewsource' => "Brontekst van beveiligde pagina's bekijken", |
954 | 954 | 'right-raw' => "Ruwe pagina's bekijken", |
955 | 955 | 'right-render' => "Gerenderde pagina's zonder navigatie bekijken", |
— | — | @@ -1016,7 +1016,7 @@ |
1017 | 1017 | 'grouppermissions-rug-header' => 'Du kan bruke denne siden for å fjerne brukere fra ubrukte (slettede) grupper.', |
1018 | 1018 | 'grouppermissions-rug-success' => 'Fjernet brukere fra ubrukte grupper.', |
1019 | 1019 | 'grouppermissions-rug-confirm' => 'Fjern brukere fra ubrukte grupper', |
1020 | | - 'right-grouppermissions' => 'Behandle gruppetillatelser (spesialsider: [[Special:GroupPermissions|gruppetillatelser]] og [[Special:SortPermissions|sorter tillatelser]])', |
| 1020 | + 'right-grouppermissions' => 'Behandle gruppetillatelser', |
1021 | 1021 | 'right-viewsource' => 'Se kilden til beskyttede sider', |
1022 | 1022 | 'right-raw' => 'Se sider i råformat', |
1023 | 1023 | 'right-render' => 'Se sider uten navigasjon', |
— | — | @@ -1083,7 +1083,7 @@ |
1084 | 1084 | 'grouppermissions-rug-header' => 'Podètz utilizar aquesta pagina per levar los utilizaires dels gropes inutilizats o suprimits.', |
1085 | 1085 | 'grouppermissions-rug-success' => 'Utilizaires levats amb succès dels gropes inutilizats !', |
1086 | 1086 | 'grouppermissions-rug-confirm' => 'Levar los utilizaires dels gropes inutilizats', |
1087 | | - 'right-grouppermissions' => 'Gerís las permissions dels gropes (paginas especialas : [[Special:GroupPermissions|GroupPermissions]] e [[Special:SortPermissions|SortPermissions]])', |
| 1087 | + 'right-grouppermissions' => 'Gerís las permissions dels gropes', |
1088 | 1088 | 'right-viewsource' => 'Veire lo còde font wiki de las paginas protegidas', |
1089 | 1089 | 'right-raw' => 'Veire las paginas brutas', |
1090 | 1090 | 'right-render' => 'Veire lo rendut de las paginas sens navigacion', |
— | — | @@ -1267,7 +1267,7 @@ |
1268 | 1268 | 'grouppermissions-rug-header' => 'Túto stránku môžete použiť na odstránenie používateľov z nepoužívaných (zmazaných) skupín.', |
1269 | 1269 | 'grouppermissions-rug-success' => 'Používatelia boli úspešne odstránení z nepoužívaných skupín.', |
1270 | 1270 | 'grouppermissions-rug-confirm' => 'Odstrániť používateľov z nepoužívaných skupín', |
1271 | | - 'right-grouppermissions' => 'Správa skupinových oprávnení (špeciálne stránky: [[Special:GroupPermissions|GroupPermissions]] a [[Special:SortPermissions|SortPermissions]])', |
| 1271 | + 'right-grouppermissions' => 'Správa skupinových oprávnení', |
1272 | 1272 | 'right-viewsource' => 'Zobraziť zdrojový text chránených stránok', |
1273 | 1273 | 'right-raw' => 'Zobraziť nespracované stránky', |
1274 | 1274 | 'right-render' => 'Zobraziť vykreslené stránky bez navigácie', |
— | — | @@ -1337,7 +1337,7 @@ |
1338 | 1338 | 'grouppermissions-rug-header' => 'Du kan använda denna sida för att ta bort användare från oanvända (raderade) användargrupper.', |
1339 | 1339 | 'grouppermissions-rug-success' => 'Användarna har tagits bort från oanvända användargrupper!', |
1340 | 1340 | 'grouppermissions-rug-confirm' => 'Ta bort användare från oanvända användargrupper', |
1341 | | - 'right-grouppermissions' => 'Behandla gruppbehörigheter (specialsidor: [[Special:GroupPermissions|gruppbehörigheter]] och [[Special:SortPermissions|sortera behörigheter]])', |
| 1341 | + 'right-grouppermissions' => 'Behandla gruppbehörigheter', |
1342 | 1342 | 'right-viewsource' => 'Se skyddade sidors wiki-kod', |
1343 | 1343 | 'right-raw' => 'Se sidor i råformat', |
1344 | 1344 | 'right-render' => 'Se renderade sidor utan navigation', |
Index: trunk/extensions/GroupPermissionsManager/GroupPermissionsManager.php |
— | — | @@ -15,7 +15,7 @@ |
16 | 16 | 'name' => 'GroupPermissions Manager', |
17 | 17 | 'author' => 'Ryan Schmidt', |
18 | 18 | 'url' => 'http://www.mediawiki.org/wiki/Extension:GroupPermissionsManager', |
19 | | - 'version' => '3.2.5', |
| 19 | + 'version' => '3.2.6', |
20 | 20 | 'description' => 'Manage group permissions via a special page', |
21 | 21 | 'descriptionmsg' => 'grouppermissions-desc', |
22 | 22 | ); |
Index: trunk/extensions/GroupPermissionsManager/SortPermissions.php |
— | — | @@ -109,7 +109,8 @@ |
110 | 110 | */ |
111 | 111 | function makeRadios($perm, $types) { |
112 | 112 | global $wgGPManagerSort; |
113 | | - $ret = "\n<tr id=\"right-$perm\"><td>$perm (<a href=\"javascript:removePerm('$perm');\">".wfMsg('grouppermissions-sp-remove')."</a>)</td>"; |
| 113 | + $permmsg = wfEmptyMsg('right-' . $perm, wfMsg('right-' . $perm)) ? $perm : wfMsg('right-' . $perm); |
| 114 | + $ret = "\n<tr id=\"right-$perm\"><td><span title=\"$permmsg\">$perm</span> (<a href=\"javascript:removePerm('$perm');\">".wfMsg('grouppermissions-sp-remove')."</a>)</td>"; |
114 | 115 | foreach($types as $type) { |
115 | 116 | if(array_key_exists($type, $wgGPManagerSort) && in_array($perm, $wgGPManagerSort[$type])) { |
116 | 117 | $ret .= "\n<td><input type=\"radio\" name=\"right-$perm\" id=\"$perm-$type\" class=\"type-$type\" value=\"$type\" checked=\"checked\" />"; |