Index: trunk/extensions/LiquidThreads/Lqt.i18n.php |
— | — | @@ -114,13 +114,15 @@ |
115 | 115 | 'lqt-newer' => 'newer', |
116 | 116 | 'lqt-searching' => 'Searching for threads', |
117 | 117 | 'lqt-read-email' => 'Read', |
118 | | - 'lqt-email-remove' => 'Remove this thread from New Messages.', |
119 | | - 'lqt-marked-read' => 'Thread <b>$1</b> marked as read.', |
120 | | - 'lqt-count-marked-read' => '$1 {{PLURAL:$1|messages|messages}} marked as read.', |
| 118 | + 'lqt-email-remove' => 'Remove this thread from new messages.', |
| 119 | + 'lqt-marked-read' => 'Thread \'\'\'$1\'\'\' marked as read.', |
| 120 | + 'lqt-count-marked-read' => '$1 {{PLURAL:$1|message|messages}} marked as read.', |
121 | 121 | 'lqt-email-undo' => 'Undo', |
122 | 122 | 'lqt-messages-sent' => 'Messages sent to you:', |
123 | | - 'lqt-other-messages' => 'Messages on other talkpages:', |
| 123 | + 'lqt-other-messages' => 'Messages on other talk pages:', |
124 | 124 | 'lqt-new-messages' => 'There are new messages for you.', |
| 125 | + 'lqt-email-info-undo' => 'Bring back the thread you just dismissed.', |
| 126 | + 'lqt-date-info' => 'This link is disabled because you are viewing threads from all dates.', |
125 | 127 | ); |
126 | 128 | |
127 | 129 | /** Message documentation (Message documentation) |
— | — | @@ -755,6 +757,8 @@ |
756 | 758 | 'lqt-older' => 'plus ancien', |
757 | 759 | 'lqt-newer' => 'plus récent', |
758 | 760 | 'lqt-searching' => 'Recherche des fils', |
| 761 | + 'lqt-email-info-undo' => 'Rétablir le fil que vous venez juste de révoquer.', |
| 762 | + 'lqt-date-info' => 'Ce lien est désactivé parce que vous êtes en train de voir les fils à partir de toutes les dates. ', |
759 | 763 | ); |
760 | 764 | |
761 | 765 | /** Western Frisian (Frysk) |
Index: trunk/extensions/LiquidThreads/LqtPages.php |
— | — | @@ -171,31 +171,31 @@ |
172 | 172 | $i++; |
173 | 173 | } |
174 | 174 | $toclines[] = $sk->tocUnindent(1); |
175 | | - |
| 175 | + |
176 | 176 | $this->openDiv('lqt_toc_wrapper'); |
177 | 177 | $this->output->addHTML('<h2 class="lqt_toc_title">'.wfMsg('lqt_contents_title').'</h2> <ul>'); |
178 | | - |
| 178 | + |
179 | 179 | foreach($threads as $t) { |
180 | 180 | $this->output->addHTML('<li><a href="#'.$this->anchorName($t).'">'.$t->subjectWithoutIncrement().'</a></li>'); |
181 | 181 | } |
182 | | - |
| 182 | + |
183 | 183 | $this->output->addHTML('</ul></div>'); |
184 | 184 | } |
185 | 185 | |
186 | 186 | function showArchiveWidget($threads) { |
187 | 187 | $threadlinks = $this->permalinksForThreads($threads); |
188 | 188 | $url = $this->talkpageUrl($this->title, 'talkpage_archive'); |
189 | | - |
| 189 | + |
190 | 190 | if ( count($threadlinks) > 0 ) { |
191 | 191 | $this->openDiv('lqt_archive_teaser'); |
192 | 192 | $this->output->addHTML('<h2 class="lqt_recently_archived">'.wfMsg('lqt_recently_archived').'</h2>'); |
193 | 193 | // $this->output->addHTML("<span class=\"lqt_browse_archive\">[<a href=\"$url\">".wfMsg('lqt_browse_archive_with_recent')."</a>]</span></h2>"); |
194 | 194 | $this->outputList('ul', '', '', $threadlinks); |
195 | 195 | $this->closeDiv(); |
196 | | - } else { |
| 196 | + } else { |
197 | 197 | } |
198 | 198 | } |
199 | | - |
| 199 | + |
200 | 200 | function show() { |
201 | 201 | global $wgHooks, $wgUser; |
202 | 202 | $wgHooks['SkinTemplateTabs'][] = array($this, 'customizeTabs'); |
— | — | @@ -203,7 +203,7 @@ |
204 | 204 | $this->output->setPageTitle( $this->title->getTalkpage()->getPrefixedText() ); |
205 | 205 | self::addJSandCSS(); |
206 | 206 | $article = new Article( $this->title ); |
207 | | - |
| 207 | + |
208 | 208 | if( $this->methodApplies('talkpage_sort_order') ) { |
209 | 209 | global $wgRequest; |
210 | 210 | $remember_sort_checked = $wgRequest->getVal('lqt_remember_sort') ? 'checked ' : ''; |
— | — | @@ -233,8 +233,8 @@ |
234 | 234 | $lqt_sort_newest_threads = wfMsg('lqt_sort_newest_threads'); |
235 | 235 | $lqt_sort_oldest_threads = wfMsg('lqt_sort_oldest_threads'); |
236 | 236 | $go=wfMsg('go'); |
237 | | - if($wgUser->isLoggedIn()) { |
238 | | - $remember_sort = |
| 237 | + if($wgUser->isLoggedIn()) { |
| 238 | + $remember_sort = |
239 | 239 | <<<HTML |
240 | 240 | <br /> |
241 | 241 | <label for="lqt_remember_sort_checkbox"> |
— | — | @@ -245,7 +245,7 @@ |
246 | 246 | $remember_sort = ''; |
247 | 247 | } |
248 | 248 | $this->openDiv('lqt_view_options'); |
249 | | - $this->output->addHTML( |
| 249 | + $this->output->addHTML( |
250 | 250 | |
251 | 251 | <<<HTML |
252 | 252 | <form name="lqt_sort" action="$form_action_url" method="post">$lqt_sorting_order |
— | — | @@ -268,7 +268,7 @@ |
269 | 269 | $threads = $this->queries->query('fresh'); |
270 | 270 | |
271 | 271 | $this->openDiv('lqt_toc_archive_wrapper'); |
272 | | - |
| 272 | + |
273 | 273 | $this->openDiv('lqt_archive_teaser_empty'); |
274 | 274 | $this->output->addHTML("<div class=\"lqt_browse_archive\"><a href=\"{$this->talkpageUrl($this->title, 'talkpage_archive')}\">".wfMsg('lqt_browse_archive_without_recent')."</a></div>"); |
275 | 275 | $this->closeDiv(); |
— | — | @@ -280,7 +280,7 @@ |
281 | 281 | $this->closeDiv(); |
282 | 282 | // Clear any floats |
283 | 283 | $this->output->addHTML('<br clear="all" />'); |
284 | | - |
| 284 | + |
285 | 285 | foreach($threads as $t) { |
286 | 286 | $this->showThread($t); |
287 | 287 | } |
— | — | @@ -418,7 +418,7 @@ |
419 | 419 | $only_date= wfMsg ( 'lqt-only-date' ); |
420 | 420 | $date_from= wfMsg ( 'lqt-date-from' ); |
421 | 421 | $date_to = wfMsg ( 'lqt-date-to' ); |
422 | | - |
| 422 | + $date_info = wfMsg ( 'lqt-date-info' ); |
423 | 423 | if( isset($this->datespan) ) { |
424 | 424 | $oatte = $this->starti + 1; |
425 | 425 | $oatts = $this->starti + 1 + $this->datespan; |
— | — | @@ -441,9 +441,9 @@ |
442 | 442 | 'lqt_archive_end' => $months[$ne])) |
443 | 443 | . '">'.wfMsg ( 'lqt-newer' ).'»</a>'; |
444 | 444 | } |
445 | | - else { |
446 | | - $older = '<span class="lqt_newer_older_disabled" title="This link is disabled because you are viewing threads from all dates.">«'.wfMsg ( 'lqt-older' ).'</span>'; |
447 | | - $newer = '<span class="lqt_newer_older_disabled" title="This link is disabled because you are viewing threads from all dates.">'.wfMsg ( 'lqt-newer' ).'»</span>'; |
| 445 | + else { |
| 446 | + $older = '<span class="lqt_newer_older_disabled" title="'.wfMsg ( 'lqt-date-info' ).'">«'.wfMsg ( 'lqt-older' ).'</span>'; |
| 447 | + $newer = '<span class="lqt_newer_older_disabled" title="'.wfMsg ( 'lqt-date-info' ).'">'.wfMsg ( 'lqt-newer' ).'»</span>'; |
448 | 448 | } |
449 | 449 | |
450 | 450 | $this->output->addHTML(<<<HTML |
— | — | @@ -642,18 +642,18 @@ |
643 | 643 | function show() { |
644 | 644 | global $wgHooks, $wgOut, $wgTitle, $wgRequest; |
645 | 645 | $wgHooks['SkinTemplateTabs'][] = array($this, 'customizeTabs'); |
646 | | - |
| 646 | + |
647 | 647 | if( $wgRequest->getVal('action') === 'edit' ) { |
648 | 648 | $warn_bold = '<strong>' . wfMsg('lqt_header_warning_bold') . '</strong>'; |
649 | 649 | $warn_link = '<a href="'.$this->talkpageUrl($wgTitle, 'talkpage_new_thread').'">'. |
650 | 650 | wfMsg('lqt_header_warning_new_discussion').'</a>'; |
651 | 651 | $wgOut->addHTML('<p class="lqt_header_warning">' . |
652 | 652 | wfMsg('lqt_header_warning_before_big', $warn_bold, $warn_link) . |
653 | | - '<big>' . wfMsg('lqt_header_warning_big', $warn_bold, $warn_link) . '</big>' . |
| 653 | + '<big>' . wfMsg('lqt_header_warning_big', $warn_bold, $warn_link) . '</big>' . |
654 | 654 | wfMsg('lqt_header_warning_after_big', $warn_bold, $warn_link) . |
655 | 655 | '</p>'); |
656 | 656 | } |
657 | | - |
| 657 | + |
658 | 658 | return true; |
659 | 659 | } |
660 | 660 | } |
— | — | @@ -1217,12 +1217,13 @@ |
1218 | 1218 | } |
1219 | 1219 | $operand = implode(',', $ids); |
1220 | 1220 | $lqt_email_undo = wfMsg ( 'lqt-email-undo' ); |
| 1221 | + $lqt_info_undo = wfMsg ( 'lqt-email-info-undo' ); |
1221 | 1222 | $this->output->addHTML(<<<HTML |
1222 | 1223 | <form method="POST" class="lqt_undo_mark_as_read"> |
1223 | 1224 | $msg |
1224 | 1225 | <input type="hidden" name="lqt_method" value="mark_as_unread" /> |
1225 | 1226 | <input type="hidden" name="lqt_operand" value="{$operand}" /> |
1226 | | - <input type="submit" value="{$lqt_email_undo}" name="lqt_read_button" title="Bring back the thread you just dismissed." /> |
| 1227 | + <input type="submit" value="{$lqt_email_undo}" name="lqt_read_button" title="{$lqt_info_undo}" /> |
1227 | 1228 | </form> |
1228 | 1229 | HTML |
1229 | 1230 | ); |