| Index: trunk/phase3/includes/Article.php |
| — | — | @@ -1943,7 +1943,9 @@ |
| 1944 | 1944 | $protect_description .= "[$action=$restrictions] ("; |
| 1945 | 1945 | if( $encodedExpiry[$action] != 'infinity' ) { |
| 1946 | 1946 | $protect_description .= wfMsgForContent( 'protect-expiring', |
| 1947 | | - $wgContLang->timeanddate( $expiry[$action], false, false ) ); |
| | 1947 | + $wgContLang->timeanddate( $expiry[$action], false, false ) , |
| | 1948 | + $wgContLang->date( $expiry[$action], false, false ) , |
| | 1949 | + $wgContLang->time( $expiry[$action], false, false ) ); |
| 1948 | 1950 | } else { |
| 1949 | 1951 | $protect_description .= wfMsgForContent( 'protect-expiry-indefinite' ); |
| 1950 | 1952 | } |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -1319,7 +1319,7 @@ |
| 1320 | 1320 | |
| 1321 | 1321 | $expiry_description = ''; |
| 1322 | 1322 | if ( $encodedExpiry != 'infinity' ) { |
| 1323 | | - $expiry_description = ' (' . wfMsgForContent( 'protect-expiring', $wgContLang->timeanddate( $expiry ) ).')'; |
| | 1323 | + $expiry_description = ' (' . wfMsgForContent( 'protect-expiring', $wgContLang->timeanddate( $expiry ) , $wgContLang->date( $expiry ) , $wgContLang->time( $expiry ) ).')'; |
| 1324 | 1324 | } |
| 1325 | 1325 | else { |
| 1326 | 1326 | $expiry_description .= ' (' . wfMsgForContent( 'protect-expiry-indefinite' ).')'; |
| Index: trunk/phase3/includes/specials/SpecialProtectedtitles.php |
| — | — | @@ -75,7 +75,7 @@ |
| 76 | 76 | if ( $row->pt_expiry != 'infinity' && strlen($row->pt_expiry) ) { |
| 77 | 77 | $expiry = Block::decodeExpiry( $row->pt_expiry ); |
| 78 | 78 | |
| 79 | | - $expiry_description = wfMsgForContent( 'protect-expiring', $wgLang->timeanddate( $expiry ) ); |
| | 79 | + $expiry_description = wfMsgForContent( 'protect-expiring', $wgLang->timeanddate( $expiry ) , $wgLang->date( $expiry ) , $wgLang->time( $expiry ) ); |
| 80 | 80 | |
| 81 | 81 | $description_items[] = $expiry_description; |
| 82 | 82 | } |
| Index: trunk/phase3/includes/specials/SpecialProtectedpages.php |
| — | — | @@ -84,7 +84,7 @@ |
| 85 | 85 | if ( $row->pr_expiry != 'infinity' && strlen($row->pr_expiry) ) { |
| 86 | 86 | $expiry = Block::decodeExpiry( $row->pr_expiry ); |
| 87 | 87 | |
| 88 | | - $expiry_description = wfMsgForContent( 'protect-expiring', $wgLang->timeanddate( $expiry ) ); |
| | 88 | + $expiry_description = wfMsgForContent( 'protect-expiring' , $wgLang->timeanddate( $expiry ) , $wgLang->date( $expiry ) , $wgLang->time( $expiry ) ); |
| 89 | 89 | |
| 90 | 90 | $description_items[] = $expiry_description; |
| 91 | 91 | } |
| Index: trunk/phase3/languages/messages/MessagesQqq.php |
| — | — | @@ -1624,8 +1624,12 @@ |
| 1625 | 1625 | 'protect-default' => '{{Identical|Default}}', |
| 1626 | 1626 | 'protect-fallback' => 'This message is used as an option in the protection form on wikis were extra protection levels have been configured.', |
| 1627 | 1627 | 'protect-summary-cascade' => 'Used in edit summary when cascade protecting a page.', |
| 1628 | | -'protect-expiring' => 'Used in page history. |
| | 1628 | +'protect-expiring' => 'Used in page history, and in [[Special:Protectedtitles]], [[Special:Protectedpages]]. |
| 1629 | 1629 | |
| | 1630 | +$1 = date and time, |
| | 1631 | +$2 = date, |
| | 1632 | +$3 = time. |
| | 1633 | + |
| 1630 | 1634 | {{Identical|Expires $1 (UTC)}}', |
| 1631 | 1635 | 'protect-cascade' => 'See [[meta:Protect]] for more information.', |
| 1632 | 1636 | 'protect-othertime' => 'Used on the page protection form as label for the following input field (text) |
| Index: trunk/phase3/languages/messages/MessagesKsh.php |
| — | — | @@ -2106,7 +2106,7 @@ |
| 2107 | 2107 | 'protect-level-autoconfirmed' => 'nor Metmaacher dranlooße, die sich aanjemeldt han', |
| 2108 | 2108 | 'protect-level-sysop' => 'Nor de Wiki-Köbesse dranlooße', |
| 2109 | 2109 | 'protect-summary-cascade' => 'met Schotz-Kaskad', |
| 2110 | | -'protect-expiring' => 'bes $1 (UTC)', |
| | 2110 | +'protect-expiring' => 'bes öm $2 Uhr (UTC) aam $3', |
| 2111 | 2111 | 'protect-expiry-indefinite' => 'för iewich', |
| 2112 | 2112 | 'protect-cascade' => 'Maach en Schoz-Kaskaade — all de Schablone en dä Sigg krijje dersellve Schoz, wi die Sigg sellver en kritt.', |
| 2113 | 2113 | 'protect-cantedit' => 'Do kanns dä Siggeschotz hee nit ändere, esu lang wie De di Sigg nit ändere darfs.', |