| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -893,7 +893,7 @@ |
| 894 | 894 | } |
| 895 | 895 | |
| 896 | 896 | /* |
| 897 | | - * Output a notice that a page is protected. Only give details for move/edit |
| | 897 | + * Output a notice that a page is protected. Only give details for edit |
| 898 | 898 | * restrictions. Cares only about the first permission in the arrays, which is |
| 899 | 899 | * part of a larger shitty inconsistency about requiring several permissions... |
| 900 | 900 | * @param Array $editrestr, edit restrictions |
| — | — | @@ -902,25 +902,18 @@ |
| 903 | 903 | function addProtectionNotice( $editrestr, $moverestr ) { |
| 904 | 904 | global $wgOut; |
| 905 | 905 | |
| 906 | | - $editGroups = $moveGroups = wfMsg('protected-anyone'); |
| | 906 | + $editGroups = ''; |
| 907 | 907 | # Get groups that have each right |
| 908 | 908 | if( !empty( $editrestr ) ) { |
| 909 | 909 | $permission = ($editrestr[0]=='sysop') ? 'protect' : $editrestr[0]; |
| 910 | 910 | $editGroups = $wgOut->getGroupsWithPermission( $permission ); |
| 911 | 911 | $editGroups = implode( ', ', $editGroups ); |
| 912 | 912 | } |
| 913 | | - if( !empty( $moverestr ) ) { |
| 914 | | - $permission = ($moverestr[0]=='sysop') ? 'protect' : $moverestr[0]; |
| 915 | | - $moveGroups = $wgOut->getGroupsWithPermission( $permission ); |
| 916 | | - $moveGroups = implode( ', ', $moveGroups ); |
| 917 | | - } |
| 918 | 913 | # Use general messages if no groups found for a type |
| 919 | | - if( !$editGroups || !$moveGroups ) { |
| 920 | | - $msg = wfMsg( 'protected-subtitle' ); |
| 921 | | - } else if( $editGroups == $moveGroups ) { |
| 922 | | - $msg = wfMsg( 'protected-subtitle-same', $editGroups, $moveGroups ); |
| | 914 | + if( !$editGroups ) { |
| | 915 | + $msg = wfMsgExt( 'protected-subtitle', array('parsemag') ); |
| 923 | 916 | } else { |
| 924 | | - $msg = wfMsg( 'protected-subtitle-each', $editGroups, $moveGroups ); |
| | 917 | + $msg = wfMsgExt( 'protected-subtitle-edit', array('parsemag'), $editGroups, $editrestr, $moverestr ); |
| 925 | 918 | } |
| 926 | 919 | if( $wgOut->getSubtitle() ) |
| 927 | 920 | $msg = " $msg"; |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -798,9 +798,7 @@ |
| 799 | 799 | 'customcssjsprotected' => "You do not have permission to edit this page, because it contains another user's personal settings.", |
| 800 | 800 | 'ns-specialprotected' => "Pages in the {{ns:special}} namespace cannot be edited.", |
| 801 | 801 | 'protected-subtitle' => "(This page is protected)", |
| 802 | | -'protected-subtitle-same' => "(This page is protected. Some users ($1) can still edit or move it.)", |
| 803 | | -'protected-subtitle-each' => "(This page is protected. Some users ($1) can still edit it while others ($2) can move it.)", |
| 804 | | -'protected-anyone' => 'anyone', |
| | 802 | +'protected-subtitle-edit' => "(This page is protected. Only certain users ($1) can edit it.)", |
| 805 | 803 | |
| 806 | 804 | # Login and logout pages |
| 807 | 805 | 'logouttitle' => 'User logout', |