| Index: branches/wmf/1.16wmf4/extensions/LiquidThreads_alpha/i18n/Lqt.i18n.php |
| — | — | @@ -81,9 +81,8 @@ |
| 82 | 82 | 'lqt_protectedfromreply_link' => 'protected', |
| 83 | 83 | 'lqt_subject' => 'Subject:', |
| 84 | 84 | 'lqt_noreason' => 'No reason given.', |
| 85 | | - 'lqt_move_placeholder' => 'This thread is a placeholder indicating that a thread, $1, was moved from this page. |
| 86 | | -This move was made by $2 on $3 at $4. |
| 87 | | -The thread is now located at $5.', |
| | 85 | + 'lqt_move_placeholder' => 'A thread, $1, was moved from here to $5. |
| | 86 | +This move was made by $2 on $3 at $4.', |
| 88 | 87 | 'lqt_thread_deleted_for_sysops' => 'This thread has been \'\'\'deleted\'\'\' and is only visible to administrators.', |
| 89 | 88 | 'lqt_thread_deleted' => 'This thread has been deleted.', |
| 90 | 89 | 'lqt_summary_notice' => 'There have been no changes to this discussion for at least $2 {{PLURAL:$2|day|days}}. |
| — | — | @@ -229,8 +228,11 @@ |
| 230 | 229 | This is a notification from {{SITENAME}} that a new reply to '$2' on $5, |
| 231 | 230 | was created on $3 at $4. |
| 232 | 231 | |
| 233 | | -You can see it at <$6>", |
| | 232 | +You can see it at <$6> |
| 234 | 233 | |
| | 234 | +The text of the reply is: |
| | 235 | +$7", |
| | 236 | + |
| 235 | 237 | // Quoting functionality |
| 236 | 238 | 'lqt-quote-intro' => 'On $2 at $3, [[User:$1|$1]] wrote:', |
| 237 | 239 | 'lqt-quote' => 'Quote', |
| — | — | @@ -3134,6 +3136,7 @@ |
| 3135 | 3137 | 'lqt-drag-setsortkey' => 'Změna pozice příspěvku na stránce', |
| 3136 | 3138 | 'lqt-drag-bump' => 'Přesunutí příspěvku navrch diskusní stránky', |
| 3137 | 3139 | 'lqt-drag-save' => 'Potvrdit', |
| | 3140 | + 'lqt-drag-title' => 'Potvrdit přetažení', |
| 3138 | 3141 | 'lqt-drag-reason' => 'Důvod:', |
| 3139 | 3142 | 'lqt-drag-subject' => 'Předmět nového vlákna:', |
| 3140 | 3143 | 'lqt-edit-signature' => '(upravit podpis)', |
| — | — | @@ -6599,6 +6602,7 @@ |
| 6600 | 6603 | 'lqt-drag-setsortkey' => 'Dr Platz vum Byytrag uf dr Syte aapasse', |
| 6601 | 6604 | 'lqt-drag-bump' => 'Byytrag an dr Aafang vu dr Diskussionssyte setze', |
| 6602 | 6605 | 'lqt-drag-save' => 'Bstetige', |
| | 6606 | + 'lqt-drag-title' => 'Zie bstetige', |
| 6603 | 6607 | 'lqt-drag-reason' => 'Grund:', |
| 6604 | 6608 | 'lqt-drag-subject' => 'Thema vum neje Diskussionsstrang:', |
| 6605 | 6609 | 'lqt-edit-signature' => '(Unterschrift bearbeite)', |
| — | — | @@ -6939,6 +6943,7 @@ |
| 6940 | 6944 | 'lqt-drag-setsortkey' => 'הגדרת מיקום ההודעה בדף', |
| 6941 | 6945 | 'lqt-drag-bump' => 'העברה לראש דף הדיון', |
| 6942 | 6946 | 'lqt-drag-save' => 'אישור', |
| | 6947 | + 'lqt-drag-title' => 'אישור גרירה', |
| 6943 | 6948 | 'lqt-drag-reason' => 'סיבה:', |
| 6944 | 6949 | 'lqt-drag-subject' => 'כותרת לשרשור חדש:', |
| 6945 | 6950 | 'lqt-edit-signature' => '(עריכת החתימה)', |
| — | — | @@ -8186,6 +8191,7 @@ |
| 8187 | 8192 | 'lqt-drag-setsortkey' => 'Sesuaikan posisi kiriman pada halaman', |
| 8188 | 8193 | 'lqt-drag-bump' => 'Pindahkan kiriman ke atas halaman diskusi', |
| 8189 | 8194 | 'lqt-drag-save' => 'Konfirmasikan', |
| | 8195 | + 'lqt-drag-title' => 'Konfirmasi pemindahan', |
| 8190 | 8196 | 'lqt-drag-reason' => 'Alasan:', |
| 8191 | 8197 | 'lqt-drag-subject' => 'Subjek utas baru:', |
| 8192 | 8198 | 'lqt-edit-signature' => '(sunting tanda tangan)', |
| — | — | @@ -8225,7 +8231,7 @@ |
| 8226 | 8232 | 'lqt_youhavenewmessages' => 'I nwere [[$1|ozi ohúrù]].', |
| 8227 | 8233 | 'lqt-read-message-tooltip' => 'Wéfu ahiri nka na ozi ohúrù. |
| 8228 | 8234 | Madu nwere I ki hü ya na ihü akíkó nke sinambu.', |
| 8229 | | - 'lqt-menu-trigger' => 'Dikarírí', |
| | 8235 | + 'lqt-menu-trigger' => 'Nà nké ozór', |
| 8230 | 8236 | 'lqt-search-button' => 'Chöwá', |
| 8231 | 8237 | 'lqt-save-subject' => 'Donyéré', |
| 8232 | 8238 | 'lqt-cancel-subject-edit' => 'Emekwàlà', |
| — | — | @@ -8851,6 +8857,7 @@ |
| 8852 | 8858 | 'lqt-drag-setsortkey' => '投稿のページ上の位置を修正', |
| 8853 | 8859 | 'lqt-drag-bump' => '投稿を議論ページの先頭に移動', |
| 8854 | 8860 | 'lqt-drag-save' => '確定', |
| | 8861 | + 'lqt-drag-title' => 'ドラッグを確認', |
| 8855 | 8862 | 'lqt-drag-reason' => '理由:', |
| 8856 | 8863 | 'lqt-drag-subject' => '新しいスレッドの表題:', |
| 8857 | 8864 | 'lqt-edit-signature' => '(署名の編集)', |
| — | — | @@ -9269,8 +9276,8 @@ |
| 9270 | 9277 | * @author Ryuch |
| 9271 | 9278 | */ |
| 9272 | 9279 | $messages['ko'] = array( |
| 9273 | | - 'lqt-desc' => '토론 문서에서 스레드를 이용하는 토론을 이용', |
| 9274 | | - 'lqt_movethread' => '스레드를 다른 페이지로 이동', |
| | 9280 | + 'lqt-desc' => '토론 문서의 스레드 토론 확장기능을 추가', |
| | 9281 | + 'lqt_movethread' => '스레드를 다른 문서로 이동', |
| 9275 | 9282 | 'lqt_deletethread' => '스레드 삭제/복구', |
| 9276 | 9283 | 'lqt_contents_title' => '목차', |
| 9277 | 9284 | 'lqt_toc_thread_title' => '스레드 제목', |
| — | — | @@ -9279,14 +9286,14 @@ |
| 9280 | 9287 | 'lqt_toc_thread_modified' => '마지막으로 수정된 시각', |
| 9281 | 9288 | 'lqt_add_header' => '머리말 추가', |
| 9282 | 9289 | 'lqt_new_thread' => '새 토론 시작하기', |
| 9283 | | - 'lqt_invalid_subject' => '당신이 입력한 주제가 잘못되었습니다. |
| 9284 | | -* 주제가 너무 길거나 |
| 9285 | | -* 인터위키나 이름공간 이름의 충돌로 문제가 발생할 수 있습니다.', |
| | 9290 | + 'lqt_invalid_subject' => '주제가 잘못되었습니다. |
| | 9291 | +* 주제가 너무 길거나, |
| | 9292 | +* 인터위키나 다른 네임스페이스와의 충돌이 발생했을 수 있습니다.', |
| 9286 | 9293 | 'lqt_empty_subject' => '주제를 반드시 입력해야 합니다.', |
| 9287 | 9294 | 'lqt_reply' => '답변', |
| 9288 | 9295 | 'lqt-parent' => '상위 스레드', |
| 9289 | 9296 | 'lqt_delete' => '삭제', |
| 9290 | | - 'lqt_undelete' => '되살리기', |
| | 9297 | + 'lqt_undelete' => '복구', |
| 9291 | 9298 | 'lqt_permalink' => '링크', |
| 9292 | 9299 | 'lqt_fragment' => '$2 문서에서의 $1의 일부', |
| 9293 | 9300 | 'lqt_discussion_link' => '토론', |
| — | — | @@ -9397,7 +9404,7 @@ |
| 9398 | 9405 | 'lqt-email-undo' => '취소', |
| 9399 | 9406 | 'lqt-messages-sent' => '당신에게 직접 전달된 메시지:', |
| 9400 | 9407 | 'lqt-other-messages' => '다른 토론 문서의 메시지:', |
| 9401 | | - 'lqt-no-new-messages' => '당신에게 남겨진 메시지가 없습니다.', |
| | 9408 | + 'lqt-no-new-messages' => '새로운 메시지가 없습니다.', |
| 9402 | 9409 | 'lqt-new-messages' => '✒ 당신에게 새 메시지가 도착했습니다.', |
| 9403 | 9410 | 'lqt-email-info-undo' => '당신이 방금 없앤 스레드를 복구합니다.', |
| 9404 | 9411 | 'lqt-date-info' => '당신이 모든 날짜에 대해 스레드를 보고 있기 때문에 이 링크가 비활성화되었습니다.', |
| — | — | @@ -9502,6 +9509,7 @@ |
| 9503 | 9510 | 'lqt-drag-setsortkey' => '이 문서에서 글의 위치를 조정하기', |
| 9504 | 9511 | 'lqt-drag-bump' => '토론 문서의 맨 위로 옮기기', |
| 9505 | 9512 | 'lqt-drag-save' => '확인', |
| | 9513 | + 'lqt-drag-title' => '드래그 확인', |
| 9506 | 9514 | 'lqt-drag-reason' => '이유:', |
| 9507 | 9515 | 'lqt-drag-subject' => '새 스레드의 주제:', |
| 9508 | 9516 | 'lqt-edit-signature' => '(서명 편집하기)', |
| — | — | @@ -10272,7 +10280,7 @@ |
| 10273 | 10281 | Наместо ова, можете да $2.', |
| 10274 | 10282 | 'lqt_header_warning_bold' => 'наслов на страницата за разговор', |
| 10275 | 10283 | 'lqt_header_warning_new_discussion' => 'започнете нов разговор', |
| 10276 | | - 'lqt_sorting_order' => 'Редослед на сортирање:', |
| | 10284 | + 'lqt_sorting_order' => 'Редослед на подредување:', |
| 10277 | 10285 | 'lqt_sort_newest_changes' => 'прво најскоро променети', |
| 10278 | 10286 | 'lqt_sort_newest_threads' => 'прво најнови нишки', |
| 10279 | 10287 | 'lqt_sort_oldest_threads' => 'прво најстари нишки', |
| — | — | @@ -10348,7 +10356,7 @@ |
| 10349 | 10357 | 'lqt-log-action-merge-across' => 'преместена [[$1]] од под [[$2]]. Сега е под [[$3]].', |
| 10350 | 10358 | 'lqt-log-action-merge-down' => '[[$1]] ставена (споена) под [[$3]]', |
| 10351 | 10359 | 'lqt-log-action-subjectedit' => 'изменет насловот на [[$1]] од „$2“ на „$3“', |
| 10352 | | - 'lqt-log-action-resort' => 'изменет редоследот на сортирање на [[$1]]. Клучот за сортирање изменет од $2 на $3.', |
| | 10360 | + 'lqt-log-action-resort' => 'изменет редоследот на подредување на [[$1]]. Клучот за подредување изменет од $2 на $3.', |
| 10353 | 10361 | 'lqt-preference-notify-talk' => 'Испрати ми е-пошта кога некој ќе одговори на нишка што ја набљудувам', |
| 10354 | 10362 | 'lqt-preference-watch-threads' => 'Набљудувај ги нишките кои ги создавам или на кои одговарам', |
| 10355 | 10363 | 'prefs-lqt' => 'Нанижан разговор', |
| — | — | @@ -10508,9 +10516,9 @@ |
| 10509 | 10517 | 'lqt_thread_deleted' => 'ഈ ചരട് ഒഴിവാക്കി.', |
| 10510 | 10518 | 'lqt_summary_notice' => 'ഈ ചർച്ചയിൽ കഴിഞ്ഞ {{PLURAL:$2|ദിവസം|$2 ദിവസങ്ങളിൽ}} യാതൊരു മാറ്റവും ഉണ്ടായിട്ടില്ല. |
| 10511 | 10519 | അത് പരിസമാപ്തിയിലെത്തിയെങ്കിൽ, താങ്കൾക്ക് $1 ഉപയോഗിക്കാവുന്നതാണ്.', |
| 10512 | | - 'lqt_summary_notice_link' => 'സംഗ്രഹം എഴുതുക', |
| 10513 | | - 'lqt_summary_label' => 'ചരടിന്റെ സംഗ്രഹം:', |
| 10514 | | - 'lqt_summary_subtitle' => '"$1" എന്നതിന്റെ സംഗ്രഹം.', |
| | 10520 | + 'lqt_summary_notice_link' => 'ചുരുക്കം എഴുതുക', |
| | 10521 | + 'lqt_summary_label' => 'ചരടിന്റെ ചുരുക്കം:', |
| | 10522 | + 'lqt_summary_subtitle' => '"$1" എന്നതിന്റെ ചുരുക്കം.', |
| 10515 | 10523 | 'lqt_nosuchrevision' => 'ഈ ചരടിനു അങ്ങനെയൊരു പതിപ്പില്ല.', |
| 10516 | 10524 | 'lqt_nosuchthread' => 'താങ്കൾ ആവശ്യപ്പെട്ട ചരട് നിലവിലില്ല.', |
| 10517 | 10525 | 'lqt_nosuchthread_title' => 'അങ്ങനെ ചരടില്ല', |
| — | — | @@ -10580,7 +10588,7 @@ |
| 10581 | 10589 | 'lqt-thread-edited-others' => '{{PLURAL:$2|മറ്റൊരുപയോക്താവ്|മറ്റ് $2 ഉപയോക്താക്കൾ}} തിരുത്തിയിരിക്കുന്നു.<br /> |
| 10582 | 10590 | അവസാന തിരുത്തൽ: $1', |
| 10583 | 10591 | 'lqt-header-actions' => 'പ്രവർത്തനങ്ങൾ', |
| 10584 | | - 'lqt_summarize_link' => 'സംഗ്രഹിക്കുക', |
| | 10592 | + 'lqt_summarize_link' => 'ചുരുക്കിക്കുക', |
| 10585 | 10593 | 'lqt-summarize-intro' => 'ചരടിനു താഴെ തിരുത്തുവാനുള്ള പെട്ടിയിൽ ദയവായി ചുരുക്കരൂപം നൽകുക. |
| 10586 | 10594 | താങ്കൾ നൽകുന്ന ചുരുക്കത്തിൽ വിക്കിഎഴുത്തുകൾ ഉപയോഗിക്കാവുന്നതാണ്. |
| 10587 | 10595 | പൂർണ്ണമായാൽ, "{{int:savearticle}}" ഞെക്കുക.', |
| — | — | @@ -12211,6 +12219,7 @@ |
| 12212 | 12220 | 'lqt-drag-setsortkey' => 'Zmień kolejność wiadomości na stronie', |
| 12213 | 12221 | 'lqt-drag-bump' => 'Przenieś wiadomość na samą górę strony dyskusji', |
| 12214 | 12222 | 'lqt-drag-save' => 'Potwierdź', |
| | 12223 | + 'lqt-drag-title' => 'Zatwierdzenie przeciągnięcia', |
| 12215 | 12224 | 'lqt-drag-reason' => 'Powód', |
| 12216 | 12225 | 'lqt-drag-subject' => 'Temat nowego wątku', |
| 12217 | 12226 | 'lqt-edit-signature' => '(edytuj podpis)', |
| — | — | @@ -12483,7 +12492,7 @@ |
| 12484 | 12493 | 'lqt-drag-setsortkey' => 'Rangé la posission dël mëssagi ant la pàgina', |
| 12485 | 12494 | 'lqt-drag-bump' => 'Tramudé ël mëssagi an cò dla pàgina ëd discussion', |
| 12486 | 12495 | 'lqt-drag-save' => 'Conferma', |
| 12487 | | - 'lqt-drag-title' => 'Conferma la còpia', |
| | 12496 | + 'lqt-drag-title' => 'Confermé ël rabasté', |
| 12488 | 12497 | 'lqt-drag-reason' => 'Rason:', |
| 12489 | 12498 | 'lqt-drag-subject' => 'Soget ëd la neuva discussion:', |
| 12490 | 12499 | 'lqt-edit-signature' => '(modifiché la firma)', |
| — | — | @@ -13199,7 +13208,7 @@ |
| 13200 | 13209 | 'lqt_thread_deleted_for_sysops' => "Acest thread a fost '''șters''' și este vizibil doar administratorilor.", |
| 13201 | 13210 | 'lqt_thread_deleted' => 'Acest thread a fost șters.', |
| 13202 | 13211 | 'lqt_summary_notice_link' => 'scrieți un rezumat', |
| 13203 | | - 'lqt_summary_label' => 'Acest thread a fost rezumat ca următoarele:', |
| | 13212 | + 'lqt_summary_label' => 'Rezumatul discuției:', |
| 13204 | 13213 | 'lqt_summary_subtitle' => 'Rezumatul lui „$1”', |
| 13205 | 13214 | 'lqt_nosuchrevision' => 'Nu există nicio astfel de revizie a acestui thread.', |
| 13206 | 13215 | 'lqt_threadrequired' => 'Trebuie să specificați un thread în URL.', |
| — | — | @@ -16337,16 +16346,26 @@ |
| 16338 | 16347 | |
| 16339 | 16348 | /** Tatar (Cyrillic) (Татарча/Tatarça (Cyrillic)) |
| 16340 | 16349 | * @author Ерней |
| | 16350 | + * @author Ильнар |
| 16341 | 16351 | */ |
| 16342 | 16352 | $messages['tt-cyrl'] = array( |
| 16343 | 16353 | 'lqt_subject' => 'Тема:', |
| 16344 | 16354 | 'lqt_delete_return' => '$1 битенә кайтырга.', |
| | 16355 | + 'lqt_newmessages-title' => 'Яңа хатлар', |
| | 16356 | + 'lqt-newpost-summary' => 'Яңа элемтә: $1', |
| | 16357 | + 'lqt-reply-summary' => '[[$2|$1]]гә җавап', |
| | 16358 | + 'lqt-talkpage-history-title' => 'Аралашу битенең тарихы', |
| | 16359 | + 'lqt-talkpage-history-subtitle' => '$1 өчен', |
| | 16360 | + 'lqt-talkpage-history-tab' => 'Баш өлеш', |
| | 16361 | + 'restriction-reply' => 'җавап бирергә', |
| | 16362 | + 'restriction-newthread' => 'яңа элемтәләр ясау', |
| 16345 | 16363 | ); |
| 16346 | 16364 | |
| 16347 | 16365 | /** Ukrainian (Українська) |
| 16348 | 16366 | * @author AS |
| 16349 | 16367 | * @author NickK |
| 16350 | 16368 | * @author Prima klasy4na |
| | 16369 | + * @author Тест |
| 16351 | 16370 | */ |
| 16352 | 16371 | $messages['uk'] = array( |
| 16353 | 16372 | 'lqt-desc' => 'Додає на сторінки обговорень гілки обговорень', |
| — | — | @@ -16582,6 +16601,7 @@ |
| 16583 | 16602 | 'lqt-drag-setsortkey' => 'Змінити позицію розташування запису на сторінці', |
| 16584 | 16603 | 'lqt-drag-bump' => 'Перемістити запис на початок сторінки обговорення', |
| 16585 | 16604 | 'lqt-drag-save' => 'Підтвердити', |
| | 16605 | + 'lqt-drag-title' => 'Підтвердити перенос', |
| 16586 | 16606 | 'lqt-drag-reason' => 'Причина:', |
| 16587 | 16607 | 'lqt-drag-subject' => 'Тема для нової гілки:', |
| 16588 | 16608 | 'lqt-edit-signature' => '(редагувати підпис)', |
| — | — | @@ -16920,6 +16940,7 @@ |
| 16921 | 16941 | |
| 16922 | 16942 | /** Vietnamese (Tiếng Việt) |
| 16923 | 16943 | * @author Minh Nguyen |
| | 16944 | + * @author Trần Nguyễn Minh Huy |
| 16924 | 16945 | * @author Vinhtantran |
| 16925 | 16946 | */ |
| 16926 | 16947 | $messages['vi'] = array( |
| — | — | @@ -17027,7 +17048,7 @@ |
| 17028 | 17049 | 'lqt_header_warning_after_big' => 'Đầu đề dùng để thông báo và mở đầu. |
| 17029 | 17050 | Thay vào đó bạn có thể muốn $2.', |
| 17030 | 17051 | 'lqt_header_warning_bold' => 'tiêu đề trang thảo luận', |
| 17031 | | - 'lqt_header_warning_new_discussion' => 'bắ đầu cuộc thảo luận mới', |
| | 17052 | + 'lqt_header_warning_new_discussion' => 'bắt đầu cuộc thảo luận mới', |
| 17032 | 17053 | 'lqt_sorting_order' => 'Thứ tự xếp:', |
| 17033 | 17054 | 'lqt_sort_newest_changes' => 'xem lần cuối sửa đổi trước', |
| 17034 | 17055 | 'lqt_sort_newest_threads' => 'xem các luồng mới nhất trước', |
| — | — | @@ -17541,6 +17562,7 @@ |
| 17542 | 17563 | 'lqt-drag-setsortkey' => '调整发言在页面中的位置', |
| 17543 | 17564 | 'lqt-drag-bump' => '将发言移动到讨论页的顶部', |
| 17544 | 17565 | 'lqt-drag-save' => '确认', |
| | 17566 | + 'lqt-drag-title' => '确认', |
| 17545 | 17567 | 'lqt-drag-reason' => '原因：', |
| 17546 | 17568 | 'lqt-drag-subject' => '新话题的主题：', |
| 17547 | 17569 | 'lqt-edit-signature' => '（编辑签名）', |
| — | — | @@ -17807,6 +17829,7 @@ |
| 17808 | 17830 | 'lqt-drag-setsortkey' => '調整髮言在頁面中的位置', |
| 17809 | 17831 | 'lqt-drag-bump' => '將發言移動到討論頁的頂部', |
| 17810 | 17832 | 'lqt-drag-save' => '確認', |
| | 17833 | + 'lqt-drag-title' => '確認', |
| 17811 | 17834 | 'lqt-drag-reason' => '原因：', |
| 17812 | 17835 | 'lqt-drag-subject' => '新話題的主題：', |
| 17813 | 17836 | 'lqt-edit-signature' => '（編輯簽名檔）', |
| Index: branches/wmf/1.16wmf4/extensions/LiquidThreads_alpha/compat/Lqt-compat.i18n.php |
| — | — | @@ -90,7 +90,7 @@ |
| 91 | 91 | 'htmlform-selectorother-other' => 'Altres', |
| 92 | 92 | 'htmlform-invalid-input' => 'Hi ha problemes amb alguna de les seves entrades', |
| 93 | 93 | ), |
| 94 | | - 'ckb-arab' => |
| | 94 | + 'ckb' => |
| 95 | 95 | array ( |
| 96 | 96 | 'htmlform-reset' => 'گەڕانەوەی گۆڕانکاری', |
| 97 | 97 | ), |
| Index: branches/wmf/1.16wmf4/extensions/LiquidThreads_alpha/lqt.css |
| — | — | @@ -485,6 +485,10 @@ |
| 486 | 486 | .TalkpagePager_nav { |
| 487 | 487 | margin: 30px auto 10px; |
| 488 | 488 | } |
| | 489 | + |
| | 490 | +.lqt-drag-confirm label { |
| | 491 | + margin-right: 20px; |
| | 492 | +} |
| 489 | 493 | /* Float Clearing - If you confused, http://www.positioniseverything.net/easyclearing.html */ |
| 490 | 494 | .lqt_thread_heading:after |
| 491 | 495 | { |
| Index: branches/wmf/1.16wmf4/extensions/LiquidThreads_alpha/classes/NewMessagesController.php |
| — | — | @@ -123,7 +123,7 @@ |
| 124 | 124 | $fields = array( 'wl_user', 'ums_user', 'ums_read_timestamp' ); |
| 125 | 125 | |
| 126 | 126 | global $wgVersion; |
| 127 | | - if ( version_compare( $wgVersion, '1.15.999', '<=' ) ) { |
| | 127 | + if ( version_compare( $wgVersion, '1.16', '<' ) ) { |
| 128 | 128 | $oldPrefCompat = true; |
| 129 | 129 | |
| 130 | 130 | $tables[] = 'user'; |
| — | — | @@ -175,7 +175,7 @@ |
| 176 | 176 | |
| 177 | 177 | global $wgVersion; |
| 178 | 178 | |
| 179 | | - if ( version_compare( $wgVersion, '1.15.999', '<=' ) ) { |
| | 179 | + if ( version_compare( $wgVersion, '1.16', '<' ) ) { |
| 180 | 180 | $decodedOptions = self::decodeUserOptions( $row->user_options ); |
| 181 | 181 | |
| 182 | 182 | $wantsTalkNotification = !isset( $decodedOptions['lqtnotifytalk'] ); |
| — | — | @@ -340,7 +340,9 @@ |
| 341 | 341 | $time = $lang->time( $adjustedTimestamp ); |
| 342 | 342 | |
| 343 | 343 | $params = array( $u->getName(), $t->subjectWithoutIncrement(), |
| 344 | | - $date, $time, $talkPage, $permalink ); |
| | 344 | + $date, $time, $talkPage, |
| | 345 | + $permalink, |
| | 346 | + $t->root()->getContent() ); |
| 345 | 347 | |
| 346 | 348 | // Get message in user's own language, bug 20645 |
| 347 | 349 | $msg = wfMsgReal( $msgName, $params, true /* use DB */, $langCode, |
| — | — | @@ -392,8 +394,9 @@ |
| 393 | 395 | |
| 394 | 396 | $cval = $wgMemc->get( wfMemcKey( 'lqt-new-messages-count', $user->getId() ) ); |
| 395 | 397 | |
| 396 | | - if ( $cval ) |
| | 398 | + if ( $cval ) { |
| 397 | 399 | return $cval; |
| | 400 | + } |
| 398 | 401 | |
| 399 | 402 | $dbr = wfGetDB( DB_SLAVE ); |
| 400 | 403 | |
| Index: branches/wmf/1.16wmf4/extensions/LiquidThreads_alpha/lqt.js |
| — | — | @@ -1099,103 +1099,91 @@ |
| 1100 | 1100 | }, |
| 1101 | 1101 | |
| 1102 | 1102 | 'activateDragDrop' : function(e) { |
| | 1103 | + // FIX ME: Need a cancel drop action |
| 1103 | 1104 | e.preventDefault(); |
| 1104 | 1105 | |
| 1105 | 1106 | // Set up draggability. |
| 1106 | | - var thread = $j(this).closest('.lqt_thread'); |
| 1107 | | - var threadID = thread.find('.lqt-post-wrapper').data('thread-id'); |
| | 1107 | + var $thread = $j( this ).closest( '.lqt_thread' ); |
| | 1108 | + var threadID = $thread.find( '.lqt-post-wrapper' ).data( 'thread-id' ); |
| 1108 | 1109 | var scrollOffset; |
| 1109 | | - |
| 1110 | | - $j('html,body').each( |
| | 1110 | + // determine wether it's an entire thread or just one of the replies |
| | 1111 | + var isThreadReply = ! $thread.is( '.lqt-thread-topmost' ); |
| | 1112 | + // FIXME: what does all of this do? From here |
| | 1113 | + $j( 'html,body' ).each( |
| 1111 | 1114 | function() { |
| 1112 | | - if ( $j(this).attr('scrollTop') ) |
| 1113 | | - scrollOffset = $j(this).attr('scrollTop'); |
| | 1115 | + if ( $j(this).attr( 'scrollTop' ) ) |
| | 1116 | + scrollOffset = $j( this ).attr( 'scrollTop' ); |
| 1114 | 1117 | } ); |
| 1115 | 1118 | |
| 1116 | | - scrollOffset = scrollOffset - thread.offset().top; |
| | 1119 | + scrollOffset = scrollOffset - $thread.offset().top; |
| 1117 | 1120 | |
| 1118 | 1121 | var helperFunc; |
| 1119 | | - if ( thread.hasClass( 'lqt-thread-topmost' ) ) { |
| 1120 | | - var header = $j('#lqt-header-'+threadID); |
| 1121 | | - var headline = header.contents().filter('.mw-headline').clone(); |
| 1122 | | - var helper = $j('<h2/>').append(headline); |
| 1123 | | - helperFunc = function() { return helper; }; |
| | 1122 | + if ( $thread.hasClass( 'lqt-thread-topmost' ) ) { |
| | 1123 | + var $header = $j( '#lqt-header-' + threadID ); |
| | 1124 | + var $headline = $header.contents().filter( '.mw-headline' ).clone(); |
| | 1125 | + var $helper = $j( '<h2 />' ).append( $headline ); |
| | 1126 | + helperFunc = function() { return $helper; }; |
| 1124 | 1127 | } else { |
| 1125 | 1128 | helperFunc = |
| 1126 | 1129 | function() { |
| 1127 | | - var helper = thread.clone(); |
| 1128 | | - helper.find('.lqt-thread-replies').remove(); |
| 1129 | | - return helper; |
| | 1130 | + var $helper = $thread.clone(); |
| | 1131 | + $helper.find( '.lqt-thread-replies' ).remove(); |
| | 1132 | + return $helper; |
| 1130 | 1133 | }; |
| 1131 | 1134 | } |
| 1132 | | - |
| 1133 | | - var draggableOptions = |
| 1134 | | - { |
| | 1135 | + // to here. |
| | 1136 | + |
| | 1137 | + var draggableOptions = { |
| 1135 | 1138 | 'axis' : 'y', |
| 1136 | 1139 | 'opacity' : '0.70', |
| 1137 | 1140 | 'revert' : 'invalid', |
| 1138 | 1141 | 'helper' : helperFunc |
| 1139 | 1142 | }; |
| 1140 | | - thread.draggable( draggableOptions ); |
| | 1143 | + $thread.draggable( draggableOptions ); |
| 1141 | 1144 | |
| 1142 | 1145 | // Kill all existing drop zones |
| 1143 | | - $j('.lqt-drop-zone').remove(); |
| | 1146 | + $j( '.lqt-drop-zone' ).remove(); |
| 1144 | 1147 | |
| 1145 | 1148 | // Set up some dropping targets. Add one before the first thread, after every |
| 1146 | 1149 | // other thread, and as a subthread of every post. |
| 1147 | | - var createDropZone = function( ) { |
| 1148 | | - var element = $j('<div class="lqt-drop-zone" />'); |
| 1149 | | - element.text( wgLqtMessages['lqt-drag-drop-zone'] ); |
| 1150 | | - return element; |
| | 1150 | + var createDropZone = function( sortKey, parent ) { |
| | 1151 | + return $j( '<div class="lqt-drop-zone" />' ) |
| | 1152 | + .text( wgLqtMessages['lqt-drag-drop-zone'] ) |
| | 1153 | + .data( 'sortkey', sortKey ) |
| | 1154 | + .data( 'parent', parent ); |
| 1151 | 1155 | }; |
| 1152 | | - |
| 1153 | | - // First drop zone |
| 1154 | | - var firstDropZone = createDropZone(); |
| 1155 | | - firstDropZone.data( 'sortkey', 'now' ); |
| 1156 | | - firstDropZone.data( 'parent', 'top' ); |
| 1157 | | - var firstThread = $j('.lqt-thread-topmost:first'); |
| 1158 | | - firstThread.before(firstDropZone); |
| 1159 | | - |
| 1160 | | - // Now one after every thread |
| 1161 | | - $j('.lqt-thread-topmost').each( function() { |
| 1162 | | - var sortkeySelector = 'input[name=lqt-thread-sortkey]'; |
| 1163 | | - var sortkeyField = $j(this).contents().filter(sortkeySelector); |
| 1164 | | - var sortkey = parseInt(sortkeyField.val()); |
| 1165 | | - |
| 1166 | | - var dropZone = createDropZone(); |
| 1167 | | - dropZone.data( 'sortkey', sortkey - 1 ); |
| 1168 | | - dropZone.data( 'parent', 'top' ); |
| 1169 | | - $j(this).after(dropZone); |
| | 1156 | + |
| | 1157 | + // Add a drop zone at the very top unless the drag thread is the very first thread |
| | 1158 | + $j( '.lqt-thread-topmost:first' ) |
| | 1159 | + .not( $thread ) |
| | 1160 | + .before( createDropZone( 'now', 'top' ) ); |
| | 1161 | + |
| | 1162 | + // Now one after every thread except the drag thread |
| | 1163 | + $j( '.lqt-thread-topmost' ).not( $thread ).each( function() { |
| | 1164 | + var sortkey = parseInt( $j( this ).contents().filter( 'input[name=lqt-thread-sortkey]' ).val() ); |
| | 1165 | + $j( this ).after( createDropZone( sortkey - 1, 'top' ) ); |
| 1170 | 1166 | } ); |
| 1171 | 1167 | |
| 1172 | | - // Now one underneath every thread |
| 1173 | | - $j('.lqt_thread').not(thread).each( function() { |
| 1174 | | - var thread = $j(this); |
| 1175 | | - var repliesElement = liquidThreads.getRepliesElement( thread ); |
| 1176 | | - var dropZone = createDropZone(); |
| 1177 | | - var threadId = thread.data('thread-id'); |
| 1178 | | - |
| 1179 | | - dropZone.data( 'sortkey', 'now' ); |
| 1180 | | - dropZone.data( 'parent', threadId ); |
| 1181 | | - |
| 1182 | | - repliesElement.contents().filter('.lqt-replies-finish').before(dropZone); |
| 1183 | | - |
| | 1168 | + // Now one underneath every thread except the drag thread |
| | 1169 | + $j('.lqt_thread').not( $thread ).each( function() { |
| | 1170 | + var $curThread = $j( this ); |
| | 1171 | + var repliesElement = liquidThreads.getRepliesElement( $curThread ); |
| | 1172 | + repliesElement.contents().filter('.lqt-replies-finish').before( createDropZone( 'now', $curThread.data( 'thread-id' ) ) ); |
| 1184 | 1173 | } ); |
| 1185 | 1174 | |
| 1186 | | - var droppableOptions = |
| 1187 | | - { |
| | 1175 | + var droppableOptions = { |
| 1188 | 1176 | 'activeClass' : 'lqt-drop-zone-active', |
| 1189 | 1177 | 'hoverClass' : 'lqt-drop-zone-hover', |
| 1190 | 1178 | 'drop' : liquidThreads.completeDragDrop, |
| 1191 | 1179 | 'tolerance' : 'intersect' |
| 1192 | 1180 | }; |
| 1193 | 1181 | |
| 1194 | | - $j('.lqt-drop-zone').droppable( droppableOptions ); |
| | 1182 | + $j( '.lqt-drop-zone' ).droppable( droppableOptions ); |
| 1195 | 1183 | |
| 1196 | | - scrollOffset = scrollOffset + thread.offset().top; |
| | 1184 | + scrollOffset = scrollOffset + $thread.offset().top; |
| 1197 | 1185 | |
| 1198 | 1186 | // Reset scroll position |
| 1199 | | - $j('html,body').attr( 'scrollTop', scrollOffset ); |
| | 1187 | + $j( 'html,body' ).attr( 'scrollTop', scrollOffset ); |
| 1200 | 1188 | }, |
| 1201 | 1189 | |
| 1202 | 1190 | 'completeDragDrop' : function( e, ui ) { |
| — | — | @@ -1241,10 +1229,10 @@ |
| 1242 | 1230 | }, |
| 1243 | 1231 | |
| 1244 | 1232 | 'confirmDragDrop' : function( thread, params ) { |
| 1245 | | - var confirmDialog = $j('<div class="lqt-drag-confirm" />'); |
| | 1233 | + var confirmDialog = $j( '<div class="lqt-drag-confirm" />' ); |
| 1246 | 1234 | |
| 1247 | 1235 | // Add an intro |
| 1248 | | - var intro = $j('<p/>').text( wgLqtMessages['lqt-drag-confirm'] ); |
| | 1236 | + var intro = $j( '<p/>' ).text( wgLqtMessages['lqt-drag-confirm'] ); |
| 1249 | 1237 | confirmDialog.append( intro ); |
| 1250 | 1238 | |
| 1251 | 1239 | // Summarize changes to be made |
| — | — | @@ -1388,8 +1376,8 @@ |
| 1389 | 1377 | } |
| 1390 | 1378 | |
| 1391 | 1379 | // Do the actual physical movement |
| 1392 | | - var threadId = thread.find('.lqt-post-wrapper') |
| 1393 | | - .data('thread-id'); |
| | 1380 | + var threadId = thread.find( '.lqt-post-wrapper' ) |
| | 1381 | + .data( 'thread-id' ); |
| 1394 | 1382 | |
| 1395 | 1383 | // Assorted ways of returning a thread to its proper place. |
| 1396 | 1384 | if ( typeof params.insertAfter != 'undefined' ) { |
| Property changes on: branches/wmf/1.16wmf4/extensions/LiquidThreads_alpha |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1397 | 1385 | Merged /trunk/extensions/LiquidThreads:r70085-70099,70101-70105,70107-70377 |