Index: branches/wmf-deployment/extensions/LiquidThreads/i18n/Lqt.i18n.php |
— | — | @@ -248,6 +248,16 @@ |
249 | 249 | 'lqt-sign-not-necessary' => 'It is not necessary to sign your post with four tildes. |
250 | 250 | The signature is shown automatically.', |
251 | 251 | 'lqt-marked-as-read-placeholder' => 'The thread $1 was marked as read.', |
| 252 | + 'lqt-change-subject' => 'Change subject', |
| 253 | + 'lqt-save-subject' => 'Save', |
| 254 | + 'lqt-save-subject-failed' => 'The following error occurred while attempting to '. |
| 255 | +'change the subject of this thread: $1', |
| 256 | + 'lqt-ajax-invalid-subject' => 'The subject you specified was invalid, probably '. |
| 257 | +'because it was too long.', |
| 258 | + 'lqt-ajax-no-subject' => 'You must specify a subject.', |
| 259 | + 'lqt-save-subject-error-unknown' => 'An unknown error occurred when attempting '. |
| 260 | +'to set the subject of this thread. Please try to do this by clicking "edit" on the top post.', |
| 261 | + 'lqt-cancel-subject-edit' => 'Cancel', |
252 | 262 | |
253 | 263 | // Feeds |
254 | 264 | 'lqt-feed-title-all' => '{{SITENAME}} — New posts', |
Index: branches/wmf-deployment/extensions/LiquidThreads_alpha/i18n/Lqt.i18n.php |
— | — | @@ -242,7 +242,7 @@ |
243 | 243 | // Some AJAX stuff |
244 | 244 | 'lqt-ajax-updated' => 'This thread has new posts.', |
245 | 245 | 'lqt-ajax-update-link' => 'Update', |
246 | | - 'lqt-thread-show-replies' => 'Show $1 replies', |
| 246 | + 'lqt-thread-show-replies' => 'Show $1 {{PLURAL:$1|reply|replies}}', |
247 | 247 | 'lqt-thread-show-more' => 'Show more replies', |
248 | 248 | 'lqt-thread-link-url' => 'Link URL:', |
249 | 249 | 'lqt-thread-link-title' => 'Wikitext link:', |
— | — | @@ -250,6 +250,16 @@ |
251 | 251 | 'lqt-sign-not-necessary' => 'It is not necessary to sign your post with four tildes. |
252 | 252 | The signature is shown automatically.', |
253 | 253 | 'lqt-marked-as-read-placeholder' => 'The thread $1 was marked as read.', |
| 254 | + 'lqt-change-subject' => 'Change subject', |
| 255 | + 'lqt-save-subject' => 'Save', |
| 256 | + 'lqt-save-subject-failed' => 'The following error occurred while attempting to '. |
| 257 | +'change the subject of this thread: $1', |
| 258 | + 'lqt-ajax-invalid-subject' => 'The subject you specified was invalid, probably '. |
| 259 | +'because it was too long.', |
| 260 | + 'lqt-ajax-no-subject' => 'You must specify a subject.', |
| 261 | + 'lqt-save-subject-error-unknown' => 'An unknown error occurred when attempting '. |
| 262 | +'to set the subject of this thread. Please try to do this by clicking "edit" on the top post.', |
| 263 | + 'lqt-cancel-subject-edit' => 'Cancel', |
254 | 264 | |
255 | 265 | // Feeds |
256 | 266 | 'lqt-feed-title-all' => '{{SITENAME}} — New posts', |
— | — | @@ -263,6 +273,7 @@ |
264 | 274 | |
265 | 275 | 'lqt-newmessages-n' => 'New messages ($1)', |
266 | 276 | 'lqt_newmessages' => 'New messages', |
| 277 | + 'lqt_newmessages-title' => 'New messages', |
267 | 278 | |
268 | 279 | // Automatic summaries |
269 | 280 | 'lqt-newpost-summary' => 'New thread: $1', |
— | — | @@ -502,6 +513,8 @@ |
503 | 514 | */ |
504 | 515 | $messages['af'] = array( |
505 | 516 | 'lqt-desc' => 'Voeg besprekings in onderwerpe op besprekingsblaaie by', |
| 517 | + 'lqt_movethread' => "Skuif onderwerp na 'n ander bladsy", |
| 518 | + 'lqt_deletethread' => 'Onderwerp verwyder of terugplaas', |
506 | 519 | 'lqt_contents_title' => 'Inhoud', |
507 | 520 | 'lqt_toc_thread_title' => 'Onderwerp', |
508 | 521 | 'lqt_toc_thread_author' => 'Begin deur', |
— | — | @@ -534,6 +547,7 @@ |
535 | 548 | 'lqt_hist_edited_subject' => 'Onderwerp verander van "$2" na "$3"', |
536 | 549 | 'lqt_hist_merged_from' => "Die [[$1|antwoord]] is na 'n ander onderwerp geskuif", |
537 | 550 | 'lqt_hist_merged_to' => "Die [[$1|antwoord]] is vanuit 'n ander onderwerp geskuif", |
| 551 | + 'lqt_hist_split_from' => "Split af na 'n nuwe onderwerp", |
538 | 552 | 'lqt_revision_as_of' => 'Weergawe op $2 om $3.', |
539 | 553 | 'lqt_youhavenewmessages' => 'U het [$1 nuwe boodskappe]', |
540 | 554 | 'lqt_protectedfromreply_link' => 'beskermd', |
— | — | @@ -600,6 +614,7 @@ |
601 | 615 | 'lqt-menu-trigger' => 'Meer', |
602 | 616 | 'lqt-newmessages-from' => 'Van $1', |
603 | 617 | 'lqt-hot-topics' => 'Populêre onderwerpe', |
| 618 | + 'lqt-add-reply' => 'Antwoord', |
604 | 619 | 'right-lqt-split' => 'Split onderwerpe', |
605 | 620 | 'right-lqt-merge' => 'Versmelt onderwerpe', |
606 | 621 | 'lqt-thread-merge' => 'Versmelt met ander onderwerp', |
— | — | @@ -1189,6 +1204,7 @@ |
1190 | 1205 | 'lqt-menu-trigger' => 'Болей', |
1191 | 1206 | 'lqt-newmessages-from' => 'Ад $1', |
1192 | 1207 | 'lqt-hot-topics' => 'Папулярныя тэмы', |
| 1208 | + 'lqt-add-reply' => 'Дадаць адказ', |
1193 | 1209 | 'right-lqt-split' => 'падзел галінаў', |
1194 | 1210 | 'right-lqt-merge' => "аб'яднаньне галінаў", |
1195 | 1211 | 'lqt-thread-merge' => "Аб'яднаць у іншую галіну", |
— | — | @@ -1522,7 +1538,7 @@ |
1523 | 1539 | 'lqt-history-title' => 'Istor ar gaoz', |
1524 | 1540 | 'lqt_hist_comment_edited' => 'Testenn evezhiadennoù [$2 kemmet]', |
1525 | 1541 | 'lqt_hist_summary_changed' => 'Diverrañ kemmet', |
1526 | | - 'lqt_hist_reply_created' => 'Krouet ar respont nevez', |
| 1542 | + 'lqt_hist_reply_created' => '[[$1|Respont nevez]] krouet', |
1527 | 1543 | 'lqt_hist_thread_created' => 'Krouet ar gaoz nevez', |
1528 | 1544 | 'lqt_hist_deleted' => 'Diverket', |
1529 | 1545 | 'lqt_hist_undeleted' => 'Diziverket', |
— | — | @@ -1534,22 +1550,23 @@ |
1535 | 1551 | 'lqt_hist_tooltip_newer_disabled' => "Ne'z a ket al liamm-mañ en-dro rak war ar bajenn gentañ emaoc'h.", |
1536 | 1552 | 'lqt_hist_tooltip_older_disabled' => "Ne'z a ket al liamm-mañ en-dro rak war ar bajenn ziwezhañ emaoc'h.", |
1537 | 1553 | 'lqt_hist_split' => "Respont a-ziforc'h en un neudennad kaozioù nevez", |
1538 | | - 'lqt_hist_edited_subject' => 'Danvez bet kemmet', |
1539 | | - 'lqt_hist_merged_from' => "Dilec'hiet eo bet ar respont war-du un neudennad kaozioù all", |
1540 | | - 'lqt_hist_merged_to' => "Dilec'hiet eo bet ar respont adalek un neudennad kaozioù all", |
| 1554 | + 'lqt_hist_edited_subject' => 'Danvez bet kemmet eus "$2" da "$3"', |
| 1555 | + 'lqt_hist_edited_subject_corrupt' => 'Sujed kemmet', |
| 1556 | + 'lqt_hist_merged_from' => " Dilec'hiet eo bet ar [[$1|respont]] war-du un neudennad kaozioù all", |
| 1557 | + 'lqt_hist_merged_to' => "Dilec'hiet eo bet ar [[$1|respont]] adalek un neudennad kaozioù all", |
1541 | 1558 | 'lqt_hist_split_from' => 'Rannañ war-du un neudennad kaozioù all', |
1542 | 1559 | 'lqt_revision_as_of' => 'Adweladenn eus an $2 da $3.', |
1543 | 1560 | 'lqt_change_new_thread' => 'Homañ eo adweladenn gentañ an neudennad.', |
1544 | | - 'lqt_change_reply_created' => 'Savet eo bet an notenn lakaet war wel e-pad an adweladenn-mañ.', |
1545 | | - 'lqt_change_edited_root' => 'Kemmet eo bet an notenn lakaet war wel e-pad an adweladenn-mañ.', |
| 1561 | + 'lqt_change_reply_created' => 'Savet eo bet an [$1 notenn lakaet war wel] e-pad an adweladenn-mañ.', |
| 1562 | + 'lqt_change_edited_root' => ' Kemmet eo bet [$1 an notenn lakaet war wel] e-pad an adweladenn-mañ.', |
1546 | 1563 | 'lqt_change_edited_summary' => 'Kemmet eo bet diverradenn ar gaoz', |
1547 | | - 'lqt_change_deleted' => 'Diverket eo an neudennad-mañ pe ar respont outi.', |
| 1564 | + 'lqt_change_deleted' => 'Diverket eo bet [$1 an neudennad-mañ] pe ar respont outi.', |
1548 | 1565 | 'lqt_change_undeleted' => "Diziverket eo bet ar [$1bomm oc'h usskediñ]", |
1549 | | - 'lqt_change_moved' => "Kaset eo bet ar gaoz-mañ d'ur bajenn gaozeall all", |
1550 | | - 'lqt_change_split' => 'Dispartiet eo bet ar gaoz-mañ diouzh ur gaoz all', |
1551 | | - 'lqt_change_merged_from' => "Dilec'hiet ez eus bet unan eus ar respontoù d'ar gaoz-mañ war-du ur gaoz all", |
1552 | | - 'lqt_change_merged_to' => "Dilec'hiet eo bet ar respont oc'h usskediñ adalek ur gaoz all.", |
1553 | | - 'lqt_change_split_from' => 'Dispartiet ez eus bet un iskaoz eus ar gaoz-mañ e diabarzh ar gaoz end-eeun', |
| 1566 | + 'lqt_change_moved' => "Kaset eo bet ar [$1 gaoz-mañ] d'ur bajenn gaozeall all", |
| 1567 | + 'lqt_change_split' => 'Dispartiet eo bet ar [$1 gaoz-mañ] diouzh ur gaoz all', |
| 1568 | + 'lqt_change_merged_from' => "Dilec'hiet ez eus bet unan eus ar [$1 respontoù] d'ar gaoz-mañ war-du ur gaoz all", |
| 1569 | + 'lqt_change_merged_to' => "Dilec'hiet eo bet ar [$1 respont oc'h usskediñ] adalek ur gaoz all.", |
| 1570 | + 'lqt_change_split_from' => 'Dispartiet ez eus bet un [$1 iskaoz] eus ar gaoz-mañ e diabarzh ar gaoz end-eeun', |
1554 | 1571 | 'lqt_change_root_blanked' => 'Diverket eo bet testenn [$1 un evezhiadenn].', |
1555 | 1572 | 'lqt_youhavenewmessages' => "[$1 kemennadenn nevez] zo ganeoc'h.", |
1556 | 1573 | 'lqt_protectedfromreply' => "$1 eo bet ar gaoz-mañ. N'hallit ket respont dezhi.", |
— | — | @@ -1557,7 +1574,8 @@ |
1558 | 1575 | 'lqt_subject' => 'Danvez :', |
1559 | 1576 | 'lqt_noreason' => "N'eus bet roet abeg ebet.", |
1560 | 1577 | 'lqt_move_placeholder' => "N'eo an neudennad-mañ nemet ur merk erlec'hiañ a verk ez eus bet kaset ur gaoz, $1, eus ar bajenn-mañ war-du ur bajenn gaozeal all. |
1561 | | -Graet eo bet an dilec'hiañ gant $2 da $3 da $4", |
| 1578 | +Graet eo bet an dilec'hiañ gant $2 da $3 da $4. |
| 1579 | +An neudennad a zo lec'hiet e $5 bremañ.", |
1562 | 1580 | 'lqt_thread_deleted_for_sysops' => "'''Diverket''' eo bet ar gaoz-mañ ha n'hall bezañ gwelet nemet gant ar verourien.", |
1563 | 1581 | 'lqt_thread_deleted' => 'Diverket eo bet an neudennad-mañ', |
1564 | 1582 | 'lqt_summary_notice' => "N'eus bet degaset tamm kemm ebet er gaoz abaoe $2 {{PLURAL:$2|deiz}} da nebeutañ. |
— | — | @@ -1697,7 +1715,7 @@ |
1698 | 1716 | 'lqt-thread-show-more' => 'Diskouez respontoù all', |
1699 | 1717 | 'lqt-thread-link-url' => 'URL al liamm :', |
1700 | 1718 | 'lqt-thread-link-title' => 'Liamm wikitestenn :', |
1701 | | - 'lqt-marked-as-read-placeholder' => 'Merket eo bet an neudennad $& evel lennet.', |
| 1719 | + 'lqt-marked-as-read-placeholder' => 'Merket eo bet an neudennad $1 evel lennet.', |
1702 | 1720 | 'lqt-feed-title-all' => '{{SITENAME}} — Kemennadennoù nevez', |
1703 | 1721 | 'lqt-feed-title-all-from' => '{{SITENAME}} — Kemennadennoù nevez a-berzh $1', |
1704 | 1722 | 'lqt-feed-title-new-threads' => '{{SITENAME}} — Neudennadoù kaoz nevez', |
— | — | @@ -1708,6 +1726,7 @@ |
1709 | 1727 | 'lqt-feed-reply-intro' => 'Respontoù da $3 (war $1) postet gant $2', |
1710 | 1728 | 'lqt-newmessages-n' => 'Kemennadennoù nevez ($1)', |
1711 | 1729 | 'lqt_newmessages' => 'Kemennoù nevez', |
| 1730 | + 'lqt_newmessages-title' => 'Kemenadennoù nevez', |
1712 | 1731 | 'lqt-newpost-summary' => 'Neudennad nevez : $1', |
1713 | 1732 | 'lqt-reply-summary' => 'Respont da [[$2|$1]]', |
1714 | 1733 | 'lqt-talkpage-history-subtitle' => 'Evit $1', |
— | — | @@ -2071,6 +2090,7 @@ |
2072 | 2091 | ); |
2073 | 2092 | |
2074 | 2093 | /** Czech (Česky) |
| 2094 | + * @author Kuvaly |
2075 | 2095 | * @author Mormegil |
2076 | 2096 | */ |
2077 | 2097 | $messages['cs'] = array( |
— | — | @@ -2180,6 +2200,7 @@ |
2181 | 2201 | 'lqt-history-thread' => 'Vlákno', |
2182 | 2202 | 'lqt-thread-edited-author' => 'Upraveno autorem', |
2183 | 2203 | 'lqt-thread-edited-others' => 'Upraveno jinými uživateli', |
| 2204 | + 'lqt-header-actions' => 'Akce', |
2184 | 2205 | 'lqt_summarize_link' => 'Shrnout', |
2185 | 2206 | 'lqt-summarize-intro' => 'Napište shrnutí níže zobrazeného vlákna do editačního okna. |
2186 | 2207 | Ve shrnutí můžete používat libovolný wikitext. Až budete {{GENDER:|hotov|hotova|hotovi}}, klikněte na „{{int:savearticle}}“.', |
— | — | @@ -2336,7 +2357,7 @@ |
2337 | 2358 | 'lqt_from_talk' => 'Von $1', |
2338 | 2359 | 'lqt_newer' => '← jüngere', |
2339 | 2360 | 'lqt_older' => 'ältere →', |
2340 | | - 'lqt-history-title' => 'Threadgeschichte', |
| 2361 | + 'lqt-history-title' => 'Diskussionsgeschichte', |
2341 | 2362 | 'lqt_hist_comment_edited' => 'Kommentartext [$2 bearbeitet]', |
2342 | 2363 | 'lqt_hist_summary_changed' => 'Zusammenfassung geändert', |
2343 | 2364 | 'lqt_hist_reply_created' => '[[$1|Neue Antwort]] erstellt', |
— | — | @@ -2355,20 +2376,20 @@ |
2356 | 2377 | 'lqt_hist_edited_subject_corrupt' => 'Betreff geändert', |
2357 | 2378 | 'lqt_hist_merged_from' => 'Die [[$1|Antwort]] zu einem anderen Diskussionsstrang verschoben', |
2358 | 2379 | 'lqt_hist_merged_to' => 'Die [[$1|Antwort]] wurde von einem anderen Diskussionsstrang verschoben', |
2359 | | - 'lqt_hist_split_from' => 'Zu neuem Thread aufteilen', |
| 2380 | + 'lqt_hist_split_from' => 'Zu einer neue Diskussion abtrennen', |
2360 | 2381 | 'lqt_hist_root_blanked' => 'Entfernter Kommentar', |
2361 | 2382 | 'lqt_revision_as_of' => 'Versionsgeschichte vom $2 um $3 Uhr.', |
2362 | 2383 | 'lqt_change_new_thread' => 'Dies ist die erste Version des Diskussionsstrangs.', |
2363 | 2384 | 'lqt_change_reply_created' => 'Der [$1 hervorgehobene Kommentar] wurde in dieser Version erstellt.', |
2364 | 2385 | 'lqt_change_edited_root' => 'Der [$1 hervorgehobene Kommentar] wurde in dieser Version bearbeitet.', |
2365 | | - 'lqt_change_edited_summary' => 'Die Threadzusammenfassung wurde bearbeitet', |
2366 | | - 'lqt_change_deleted' => '[$1 Dieser] oder sein übergeordneter Thread wurde gelöscht', |
| 2386 | + 'lqt_change_edited_summary' => 'Die Zusammenfassung der Diskussion wurde bearbeitet', |
| 2387 | + 'lqt_change_deleted' => '[$1 Diese] oder eine übergeordnete Diskussion wurde gelöscht', |
2367 | 2388 | 'lqt_change_undeleted' => 'Der [$1 hervorgehobene Beitrag] wurde wiederhergestellt', |
2368 | | - 'lqt_change_moved' => '[$1 Dieser Thread] wurde auf eine andere Diskussionsseite verschoben', |
| 2389 | + 'lqt_change_moved' => '[$1 Dieser Diskussionsstrang] wurde auf eine andere Diskussionsseite verschoben', |
2369 | 2390 | 'lqt_change_split' => '[$1 Dieser Diskussionsstrang] wurde von einem anderen Diskussionsstrang aufgeteilt', |
2370 | 2391 | 'lqt_change_edited_subject' => 'Das Thema dieses Diskussionsstranges wurde von „$2“ zu „$3“ geändert', |
2371 | | - 'lqt_change_merged_from' => 'Eine [$1 Antwort] auf diesen Thread wurde zu einem anderen Thread verschoben', |
2372 | | - 'lqt_change_merged_to' => 'Die [$1 hervorgehobene Antwort] wurde von einem anderen Thread verschoben', |
| 2392 | + 'lqt_change_merged_from' => 'Eine [$1 Antwort] auf diese Diskussion wurde in einen anderen Diskussionsstrang verschoben', |
| 2393 | + 'lqt_change_merged_to' => 'Die [$1 hervorgehobene Antwort] wurde aus einem anderen Diskussionsstrang hierhin verschoben', |
2373 | 2394 | 'lqt_change_split_from' => 'Ein [$1 Unterstrang] dieses Diskussionsstrangs wurde in seinen eigenen Strang aufgeteilt', |
2374 | 2395 | 'lqt_change_root_blanked' => 'Der Text [$1 eines Kommentars] wurde entfernt.', |
2375 | 2396 | 'lqt_youhavenewmessages' => 'Du hast [$1 neue Nachrichten].', |
— | — | @@ -2377,7 +2398,7 @@ |
2378 | 2399 | 'lqt_subject' => 'Thema:', |
2379 | 2400 | 'lqt_noreason' => 'kein Grund angegeben.', |
2380 | 2401 | 'lqt_move_placeholder' => 'Dieser Diskussionsstrang ist ein Platzhalter um anzuzeigen, dass ein Diskussionsstrang, $1, von dieser Seite auf eine andere Diskussionsseite verschoben wurde. |
2381 | | -Die Verschiebung erfolgte durch $2 am $3 um $4. Der Diskussionsstrang befindet sich jetzt auf $5.', |
| 2402 | +Die Verschiebung erfolgte durch $2 am $3 um $4 Uhr. Der Diskussionsstrang befindet sich jetzt auf $5.', |
2382 | 2403 | 'lqt_thread_deleted_for_sysops' => "Dieser Diskussionsstrang wurde '''gelöscht''' und ist nur für Administratoren sichtbar.", |
2383 | 2404 | 'lqt_thread_deleted' => 'Diskussionsstrang wurde gelöscht.', |
2384 | 2405 | 'lqt_summary_notice' => 'Zu dieser Diskussion gibt es seit $2 {{PLURAL:$2|Tag|Tagen}} keine neuen Beiträge. |
— | — | @@ -2408,7 +2429,7 @@ |
2409 | 2430 | 'lqt_delete_deleted' => 'Der Diskussionsstrang wurde gelöscht.', |
2410 | 2431 | 'lqt_delete_undeleted' => 'Der Diskussionsstrang wurde wiederhergestellt.', |
2411 | 2432 | 'lqt_delete_return' => 'Zurück zu $1.', |
2412 | | - 'lqt_delete_return_link' => 'die Diskussionsseite', |
| 2433 | + 'lqt_delete_return_link' => 'der Diskussionsseite', |
2413 | 2434 | 'lqt_delete_unallowed' => 'Du hast nicht die Berechtigung Diskussionsstränge zu löschen.', |
2414 | 2435 | 'lqt_delete_show_checkbox' => 'Zeige gelöschte Diskussionsstränge', |
2415 | 2436 | 'lqt_talkpage_autocreate_summary' => 'Diskussionsseite automatisch mit dem ersten Diskussionsstrang erstellt.', |
— | — | @@ -2472,25 +2493,26 @@ |
2473 | 2494 | Auch seine Antworten werden automatisch gelöscht. |
2474 | 2495 | Um dies zu vermeiden, teile sie von diesem Diskussionsstrang auf, bevor du ihn löscht.', |
2475 | 2496 | 'lqt-delete-parent-deleted' => 'Der übergeordnete Diskussionsstrang wurde gelöscht ($1)', |
2476 | | - 'lqt-delete-replies-done' => 'Sämtliche Antworten auf diesen Thread wurden ebenfalls gelöscht.', |
| 2497 | + 'lqt-delete-replies-done' => 'Sämtliche Antworten zum dieser Diskussion wurden ebenfalls gelöscht.', |
2477 | 2498 | 'lqt-movethread' => 'Verschieben', |
2478 | 2499 | 'lqt-menu-trigger' => 'Mehr', |
2479 | 2500 | 'lqt-newmessages-from' => 'Von $1', |
2480 | 2501 | 'lqt-hot-topics' => 'Heiße Themen', |
2481 | | - 'right-lqt-split' => 'Threads teilen', |
2482 | | - 'right-lqt-merge' => 'Threads zusammenführen', |
2483 | | - 'lqt-thread-merge' => 'Mit einem anderen Thread zusammenführen', |
2484 | | - 'lqt-thread-merge-to' => 'Mit diesem Thread zusammenführen', |
2485 | | - 'lqt_merge_thread' => 'Thread zusammenführen', |
2486 | | - 'lqt-thread-merge-source' => 'Ursprünglicher Thread:', |
2487 | | - 'lqt-thread-merge-dest' => 'Zielthread:', |
| 2502 | + 'lqt-add-reply' => 'Antwort hinzufügen', |
| 2503 | + 'right-lqt-split' => 'Diskussion aufteilen', |
| 2504 | + 'right-lqt-merge' => 'Diskussionen zusammenführen', |
| 2505 | + 'lqt-thread-merge' => 'Mit einem anderen Diskussionsstrang zusammenführen', |
| 2506 | + 'lqt-thread-merge-to' => 'Mit diesem Diskussionsstrang zusammenführen', |
| 2507 | + 'lqt_merge_thread' => 'Diskussionen zusammenführen', |
| 2508 | + 'lqt-thread-merge-source' => 'Ursprungsdiskussion:', |
| 2509 | + 'lqt-thread-merge-dest' => 'Zieldiskussion:', |
2488 | 2510 | 'lqt-merge-submit' => 'Zusammenführen', |
2489 | | - 'lqt-merge-success' => 'Du hast den Thread $1 erfolgreich unter $2 zusammengeführt.', |
| 2511 | + 'lqt-merge-success' => 'Der Diskussionsstrang $1 wurde erfolgreich mit $2 zusammengeführt.', |
2490 | 2512 | 'lqt-log-name' => 'Diskussionsstränge-Logbuch', |
2491 | 2513 | 'lqt-log-header' => 'Dieses Logbuch enthält Details zu Aktionen, die auf Diskussionssträngen ausgeführt wurden.', |
2492 | 2514 | 'lqt-log-action-move' => 'hat [[$1]] von [[$2]] nach [[$3]] verschoben.', |
2493 | 2515 | 'lqt-preference-notify-talk' => 'Bei Antworten auf beobachtete Diskussionsstränge E-Mails senden', |
2494 | | - 'lqt-preference-watch-threads' => 'Selbst erstellte oder von mir beantwortete Threads beobachten', |
| 2516 | + 'lqt-preference-watch-threads' => 'Selbst erstellte oder von mir beantwortete Diskussionen beobachten', |
2495 | 2517 | 'prefs-lqt' => 'Diskussionsstrang', |
2496 | 2518 | 'lqt-preference-display-depth' => 'Maximale Antworttiefe:', |
2497 | 2519 | 'lqt-preference-display-count' => 'Maximale Anzahl der Antworten:', |
— | — | @@ -2498,11 +2520,11 @@ |
2499 | 2521 | 'lqt-enotif-subject-reply' => '{{SITENAME}}-Diskussion - Antwort: $1', |
2500 | 2522 | 'lqt-enotif-subject-newthread' => '{{SITENAME}}-Diskussion - Neuer Diskussionsstrang: $1', |
2501 | 2523 | 'lqt-enotif-newthread' => 'Hallo $1, |
2502 | | -dies ist eine Benachrichtigung von {{SITENAME}}, dass am $3 um $4 auf der Seite „$5“ der neue Diskussionsstrang „$2“ eröffnet wurde. |
| 2524 | +dies ist eine Benachrichtigung von {{SITENAME}}, dass am $3 um $4 Uhr auf der Seite „$5“ der neue Diskussionsstrang „$2“ eröffnet wurde. |
2503 | 2525 | |
2504 | 2526 | Du kannst ihn auf <$6> einsehen.', |
2505 | 2527 | 'lqt-enotif-reply' => 'Hallo $1, |
2506 | | -dies ist eine Benachrichtigung von {{SITENAME}}, dass am $3 um $4 auf der Seite „$5“ ein neue Antwort im Diskussionsstrang „$2“ geschrieben wurde. |
| 2528 | +dies ist eine Benachrichtigung von {{SITENAME}}, dass am $3 um $4 Uhr auf der Seite „$5“ ein neue Antwort im Diskussionsstrang „$2“ geschrieben wurde. |
2507 | 2529 | |
2508 | 2530 | Du kannst sie auf <$6> einsehen.', |
2509 | 2531 | 'lqt-quote-intro' => 'Am $2 um $3 Uhr schrieb [[User:$1|$1]]:', |
— | — | @@ -2514,7 +2536,7 @@ |
2515 | 2537 | 'searchprofile-threads-tooltip' => 'Diskussionsstränge und Diskussionsseiten durchsuchen', |
2516 | 2538 | 'lqt-ajax-updated' => 'Dieser Diskussionsstrang hat neue Beiträge.', |
2517 | 2539 | 'lqt-ajax-update-link' => 'Aktualisieren', |
2518 | | - 'lqt-thread-show-replies' => '$1 Antwort(en) anzeigen', |
| 2540 | + 'lqt-thread-show-replies' => '$1 {{PLURAL:$1|Antwort anzeigen|Antworten anzeigen}}', |
2519 | 2541 | 'lqt-thread-show-more' => 'Mehr Antworten anzeigen', |
2520 | 2542 | 'lqt-thread-link-url' => 'Link-URL:', |
2521 | 2543 | 'lqt-thread-link-title' => 'Wikitext-Link:', |
— | — | @@ -2542,6 +2564,7 @@ |
2543 | 2565 | 'lqt-protected-reply-thread' => 'Da dieser Diskussionsstrang geschützt ist, kannst du hierauf nicht antworten.', |
2544 | 2566 | 'lqt-protected-reply-talkpage' => 'Diese Diskussionsseite wurde geschützt, so dass du auf die Diskussionsstränge nicht antworten kannst.', |
2545 | 2567 | 'lqt-protected-newthread' => 'Diese Diskussionsseite wurde geschützt, so dass du keine neuen Diskussionsstränge erstellen kannst.', |
| 2568 | + 'lqt-edit-bump' => 'Diese Diskussion anstoßen', |
2546 | 2569 | 'lqt-edit-bump-tooltip' => 'Diesen Diskussionsstrang an den Seitenanfang verschieben', |
2547 | 2570 | 'lqt-historicalrevision-error' => 'Die ausgewählte Version ist beschädigt und kann nicht angezeigt werden.', |
2548 | 2571 | ); |
— | — | @@ -2754,6 +2777,7 @@ |
2755 | 2778 | 'lqt-menu-trigger' => 'hema/hona zêd', |
2756 | 2779 | 'lqt-newmessages-from' => 'şawıtox $1', |
2757 | 2780 | 'lqt-hot-topics' => 'sernameyê neweyi', |
| 2781 | + 'lqt-add-reply' => 'Yew cewab cı ke', |
2758 | 2782 | 'right-lqt-split' => 'gıreyan ciya ker', |
2759 | 2783 | 'right-lqt-merge' => 'gıreyan piyawan (bıbesn)', |
2760 | 2784 | 'lqt-thread-merge' => 'piyawan (bıbesn) gıreyo bin', |
— | — | @@ -2991,6 +3015,7 @@ |
2992 | 3016 | 'lqt-menu-trigger' => 'Wěcej', |
2993 | 3017 | 'lqt-newmessages-from' => 'Wót $1', |
2994 | 3018 | 'lqt-hot-topics' => 'Nejcesćej cytane temy', |
| 3019 | + 'lqt-add-reply' => 'Wótegrono pśidaś', |
2995 | 3020 | 'right-lqt-split' => 'Nitki rozdźěliś', |
2996 | 3021 | 'right-lqt-merge' => 'Nitki zjadnośiś', |
2997 | 3022 | 'lqt-thread-merge' => 'Z drugeju nitku zjadnośiś', |
— | — | @@ -3950,7 +3975,7 @@ |
3951 | 3976 | 'searchprofile-threads' => 'Keskustelut', |
3952 | 3977 | 'lqt-ajax-updated' => 'Tässä ketjussa on uusia viestejä.', |
3953 | 3978 | 'lqt-ajax-update-link' => 'Päivitä', |
3954 | | - 'lqt-thread-show-replies' => 'Näytä {{PLURAL:$1|vastaus|vastausta}}', |
| 3979 | + 'lqt-thread-show-replies' => 'Näytä {{PLURAL:$1|vastaus|$1 vastausta}}', |
3955 | 3980 | 'lqt-thread-show-more' => 'Näytä lisää vastauksia', |
3956 | 3981 | 'lqt-thread-link-copy' => 'Kopioi leikepöydälle', |
3957 | 3982 | 'lqt-feed-title-new-threads' => '{{SITENAME}} – Uudet viestiketjut', |
— | — | @@ -4138,6 +4163,7 @@ |
4139 | 4164 | 'lqt-menu-trigger' => 'Plus', |
4140 | 4165 | 'lqt-newmessages-from' => 'Depuis $1', |
4141 | 4166 | 'lqt-hot-topics' => 'Sujets brûlants', |
| 4167 | + 'lqt-add-reply' => 'Ajouter une réponse', |
4142 | 4168 | 'right-lqt-split' => 'Scinder les fils de discussion', |
4143 | 4169 | 'right-lqt-merge' => 'Fusionner les fils de discussion', |
4144 | 4170 | 'lqt-thread-merge' => 'Fusionner dans un autre fil', |
— | — | @@ -4400,6 +4426,7 @@ |
4401 | 4427 | 'lqt-menu-trigger' => 'Máis', |
4402 | 4428 | 'lqt-newmessages-from' => 'De $1', |
4403 | 4429 | 'lqt-hot-topics' => 'Temas máis vistos', |
| 4430 | + 'lqt-add-reply' => 'Engadir unha resposta', |
4404 | 4431 | 'right-lqt-split' => 'Separar fíos', |
4405 | 4432 | 'right-lqt-merge' => 'Fusionar fíos', |
4406 | 4433 | 'lqt-thread-merge' => 'Fusionar noutro fío', |
— | — | @@ -4672,6 +4699,7 @@ |
4673 | 4700 | 'lqt-menu-trigger' => 'Meh', |
4674 | 4701 | 'lqt-newmessages-from' => 'Vu $1', |
4675 | 4702 | 'lqt-hot-topics' => 'Heißi Themene', |
| 4703 | + 'lqt-add-reply' => 'Antwort zuefiege', |
4676 | 4704 | 'right-lqt-split' => 'Strang ufteile', |
4677 | 4705 | 'right-lqt-merge' => 'Strang zämmefiere', |
4678 | 4706 | 'lqt-thread-merge' => 'In e andere Strang yyfiege', |
— | — | @@ -5379,6 +5407,7 @@ |
5380 | 5408 | 'lqt-menu-trigger' => 'Wjac', |
5381 | 5409 | 'lqt-newmessages-from' => 'Wot $1', |
5382 | 5410 | 'lqt-hot-topics' => 'Najčasćišo čitane temy', |
| 5411 | + 'lqt-add-reply' => 'Wotmołwu přidać', |
5383 | 5412 | 'right-lqt-split' => 'Nitki rozdźělić', |
5384 | 5413 | 'right-lqt-merge' => 'Nitki zjednoćić', |
5385 | 5414 | 'lqt-thread-merge' => 'z druhej nitku zjednoćić', |
— | — | @@ -5433,7 +5462,7 @@ |
5434 | 5463 | 'lqt-feed-new-thread-intro' => 'Nowa nitka na $1 pósłana wot $2', |
5435 | 5464 | 'lqt-feed-reply-intro' => 'Wotmołwa na $3 (na $1) pósłana wot $2', |
5436 | 5465 | 'lqt-newmessages-n' => 'nowe powěsće ($1)', |
5437 | | - 'lqt_newmessages' => 'Nowe powěsće', |
| 5466 | + 'lqt_newmessages' => 'nowe powěsće', |
5438 | 5467 | 'lqt-newpost-summary' => 'Nowa nitka: $1', |
5439 | 5468 | 'lqt-reply-summary' => 'Wotmołwa na [[$2|$1]]', |
5440 | 5469 | 'lqt-talkpage-history-title' => 'Historija diskusijneje strony', |
— | — | @@ -5854,6 +5883,7 @@ |
5855 | 5884 | 'lqt-menu-trigger' => 'Plus', |
5856 | 5885 | 'lqt-newmessages-from' => 'De $1', |
5857 | 5886 | 'lqt-hot-topics' => 'Topicos popular', |
| 5887 | + 'lqt-add-reply' => 'Adder un responsa', |
5858 | 5888 | 'right-lqt-split' => 'Separar filos', |
5859 | 5889 | 'right-lqt-merge' => 'Fusionar filos', |
5860 | 5890 | 'lqt-thread-merge' => 'Fusionar in un altere filo', |
— | — | @@ -5922,7 +5952,7 @@ |
5923 | 5953 | 'lqt-protected-reply-talkpage' => 'Tu non pote participar in iste filo proque iste pagina de discussion ha essite protegite contra responsas a su filos.', |
5924 | 5954 | 'lqt-protected-newthread' => 'Tu non pote initiar nove filos in iste pagina de discussion proque illo ha essite protegite contra nove filos.', |
5925 | 5955 | 'lqt-edit-bump' => 'Altiar iste filo', |
5926 | | - 'lqt-edit-bump-tooltip' => 'Displaciar iste filo in alto del pagina de discussion', |
| 5956 | + 'lqt-edit-bump-tooltip' => 'Repositionar iste filo in alto del pagina de discussion', |
5927 | 5957 | 'lqt-historicalrevision-error' => 'Le version que tu ha seligite es defecte e non pote esser visualisate.', |
5928 | 5958 | ); |
5929 | 5959 | |
— | — | @@ -6540,6 +6570,7 @@ |
6541 | 6571 | 'lqt-menu-trigger' => 'その他', |
6542 | 6572 | 'lqt-newmessages-from' => '$1 より', |
6543 | 6573 | 'lqt-hot-topics' => 'ホットな話題', |
| 6574 | + 'lqt-add-reply' => '返信', |
6544 | 6575 | 'right-lqt-split' => 'スレッドを分割する', |
6545 | 6576 | 'right-lqt-merge' => 'スレッドを統合する', |
6546 | 6577 | 'lqt-thread-merge' => '別のスレッドに統合する', |
— | — | @@ -7001,6 +7032,7 @@ |
7002 | 7033 | 'lqt-movethread' => 'Ömträke', |
7003 | 7034 | 'lqt-menu-trigger' => 'Wigger', |
7004 | 7035 | 'lqt-newmessages-from' => 'Vun $1', |
| 7036 | + 'lqt-add-reply' => 'Donn en Antwoot derbei', |
7005 | 7037 | 'right-lqt-split' => '{{int:lqt-history-thread}}e opdeile', |
7006 | 7038 | 'right-lqt-merge' => '{{int:lqt-history-thread}}e zosammelääje', |
7007 | 7039 | 'lqt-thread-merge' => 'Met enem andere {{int:lqt-history-thread}} zosamme donn', |
— | — | @@ -7250,6 +7282,7 @@ |
7251 | 7283 | 'lqt-menu-trigger' => 'Méi', |
7252 | 7284 | 'lqt-newmessages-from' => 'Vu(n) $1', |
7253 | 7285 | 'lqt-hot-topics' => 'Waarm Sujeten', |
| 7286 | + 'lqt-add-reply' => 'Eng Äntwert derbäisetzen', |
7254 | 7287 | 'right-lqt-split' => 'Rubriken opdeelen', |
7255 | 7288 | 'right-lqt-merge' => 'Rubriken zesummeleeën', |
7256 | 7289 | 'lqt-thread-merge' => 'An eng anerer Rubrik zesummeleeën', |
— | — | @@ -7761,6 +7794,7 @@ |
7762 | 7795 | 'lqt-menu-trigger' => 'കൂടുതൽ', |
7763 | 7796 | 'lqt-newmessages-from' => '$1 മുതൽ', |
7764 | 7797 | 'lqt-hot-topics' => 'ചൂടുപിടിച്ച വിഷയങ്ങൾ', |
| 7798 | + 'lqt-add-reply' => 'മറുപടി നൽകുകു', |
7765 | 7799 | 'right-lqt-split' => 'ചരടുകൾ വിഘടിപ്പിക്കുക', |
7766 | 7800 | 'right-lqt-merge' => 'ചരടുകൾ സംയോജിപ്പിക്കുക', |
7767 | 7801 | 'lqt-thread-merge' => 'മറ്റൊരു ചരടിലേയ്ക്ക് സംയോജിപ്പിക്കുക', |
— | — | @@ -8145,6 +8179,7 @@ |
8146 | 8180 | 'lqt-menu-trigger' => 'Meer', |
8147 | 8181 | 'lqt-newmessages-from' => 'Van $1', |
8148 | 8182 | 'lqt-hot-topics' => 'Populaire onderwerpen', |
| 8183 | + 'lqt-add-reply' => 'Antwoorden', |
8149 | 8184 | 'right-lqt-split' => 'Onderwerpen splitsen', |
8150 | 8185 | 'right-lqt-merge' => 'Onderwerpen samenvoegen', |
8151 | 8186 | 'lqt-thread-merge' => 'Aan ander onderwerp toevoegen', |
— | — | @@ -9272,6 +9307,7 @@ |
9273 | 9308 | 'lqt-menu-trigger' => 'Mais', |
9274 | 9309 | 'lqt-newmessages-from' => 'De $1', |
9275 | 9310 | 'lqt-hot-topics' => 'Tópicos populares', |
| 9311 | + 'lqt-add-reply' => 'Adicionar resposta', |
9276 | 9312 | 'right-lqt-split' => 'Separar tópicos', |
9277 | 9313 | 'right-lqt-merge' => 'Juntar tópicos', |
9278 | 9314 | 'lqt-thread-merge' => 'Juntar a outro tópico', |
— | — | @@ -9284,7 +9320,7 @@ |
9285 | 9321 | 'lqt-log-name' => 'Registo de discussões em tópico', |
9286 | 9322 | 'lqt-log-header' => 'Este registo detalha as acções tomadas nos tópicos de discussão.', |
9287 | 9323 | 'lqt-log-action-move' => 'movido [[$1]] de [[$2]] para [[$3]].', |
9288 | | - 'lqt-preference-notify-talk' => 'Notificar-me por mensagem electrónica das respostas a um tópico que esteja a vigiar', |
| 9324 | + 'lqt-preference-notify-talk' => 'Notificar-me por correio electrónico das respostas a um tópico que esteja a vigiar', |
9289 | 9325 | 'lqt-preference-watch-threads' => 'Vigiar tópicos que eu criar ou aos quais responda', |
9290 | 9326 | 'prefs-lqt' => 'Discussão em tópicos', |
9291 | 9327 | 'lqt-preference-display-depth' => 'Profundidade máxima de respostas a mostrar:', |
— | — | @@ -9788,6 +9824,7 @@ |
9789 | 9825 | 'lqt-menu-trigger' => 'Дополнительно', |
9790 | 9826 | 'lqt-newmessages-from' => 'Со страницы $1', |
9791 | 9827 | 'lqt-hot-topics' => 'Горячие темы', |
| 9828 | + 'lqt-add-reply' => 'Добавить ответ', |
9792 | 9829 | 'right-lqt-split' => 'разделение ветвей', |
9793 | 9830 | 'right-lqt-merge' => 'объединение ветвей', |
9794 | 9831 | 'lqt-thread-merge' => 'Присоединить к другой ветке', |
— | — | @@ -10652,7 +10689,7 @@ |
10653 | 10690 | 'lqt_from_talk' => '$1 నుండి', |
10654 | 10691 | 'lqt_newer' => '←కొత్తవి', |
10655 | 10692 | 'lqt_older' => 'పాతవి→', |
10656 | | - 'lqt_hist_comment_edited' => 'వ్యాఖ్య పాఠ్యాన్ని మార్చారు', |
| 10693 | + 'lqt_hist_comment_edited' => 'వ్యాఖ్య పాఠ్యాన్ని [$2 మార్చారు]', |
10657 | 10694 | 'lqt_hist_summary_changed' => 'సంగ్రహం మార్చారు', |
10658 | 10695 | 'lqt_hist_thread_created' => 'కొత్త చర్చాహారాన్ని సృష్టించారు', |
10659 | 10696 | 'lqt_hist_deleted' => 'తొలగించారు', |
— | — | @@ -10720,6 +10757,7 @@ |
10721 | 10758 | 'lqt-search-button' => 'వెతుకు', |
10722 | 10759 | 'searchprofile-threads' => 'చర్చలు', |
10723 | 10760 | 'lqt-thread-show-more' => 'మరిన్ని స్పందనలని చూపించు', |
| 10761 | + 'lqt-thread-link-title' => 'వికీపాఠ్యపు లింకు:', |
10724 | 10762 | 'lqt-feed-title-all' => '{{SITENAME}} — కొత్త టపాలు', |
10725 | 10763 | 'lqt-feed-title-all-from' => '{{SITENAME}} — $1 నుండి కొత్త టపాలు', |
10726 | 10764 | 'lqt-feed-title-replies' => '{{SITENAME}} — స్పందనలు', |
— | — | @@ -11346,6 +11384,7 @@ |
11347 | 11385 | 'lqt-menu-trigger' => 'Piassè', |
11348 | 11386 | 'lqt-newmessages-from' => 'Da $1', |
11349 | 11387 | 'lqt-hot-topics' => 'Argomenti caldi', |
| 11388 | + 'lqt-add-reply' => 'Zonta na risposta', |
11350 | 11389 | 'right-lqt-split' => 'Divìdar dei argomenti', |
11351 | 11390 | 'right-lqt-merge' => 'Unir dei argomenti', |
11352 | 11391 | 'lqt-thread-merge' => "Unissi co n'altro argomento", |
Index: branches/wmf-deployment/extensions/LiquidThreads_alpha/classes/View.php |
— | — | @@ -409,24 +409,23 @@ |
410 | 410 | |
411 | 411 | $e = new EditPage( $article ); |
412 | 412 | |
413 | | - // Display an error if a subject is specified but it's invalid |
414 | | - if ( $subject_expected && $this->request->wasPosted() && !$valid_subject ) { |
415 | | - if ( !$subject ) { |
416 | | - $msg = 'lqt_empty_subject'; |
417 | | - } else { |
418 | | - $msg = 'lqt_invalid_subject'; |
419 | | - } |
420 | | - |
421 | | - $e->editFormPageTop .= |
422 | | - Xml::tags( 'div', array( 'class' => 'error' ), |
423 | | - wfMsgExt( $msg, 'parse' ) ); |
424 | | - } |
425 | | - |
426 | 413 | global $wgRequest; |
427 | 414 | // Quietly force a preview if no subject has been specified. |
428 | 415 | if ( ( !$valid_subject && $subject ) || ( $subject_expected && !$subject ) ) { |
429 | 416 | // Dirty hack to prevent saving from going ahead |
430 | 417 | $wgRequest->setVal( 'wpPreview', true ); |
| 418 | + |
| 419 | + if ( $this->request->wasPosted() ) { |
| 420 | + if ( !$subject ) { |
| 421 | + $msg = 'lqt_empty_subject'; |
| 422 | + } else { |
| 423 | + $msg = 'lqt_invalid_subject'; |
| 424 | + } |
| 425 | + |
| 426 | + $e->editFormPageTop .= |
| 427 | + Xml::tags( 'div', array( 'class' => 'error' ), |
| 428 | + wfMsgExt( $msg, 'parse' ) ); |
| 429 | + } |
431 | 430 | } |
432 | 431 | |
433 | 432 | // For new posts and replies, remove the summary field and use a boilerplate |
— | — | @@ -853,6 +852,12 @@ |
854 | 853 | 'lqt-sign-not-necessary', |
855 | 854 | 'lqt-marked-as-read-placeholder', |
856 | 855 | 'lqt-email-undo', |
| 856 | + 'lqt-change-subject', |
| 857 | + 'lqt-save-subject', |
| 858 | + 'lqt-ajax-no-subject', |
| 859 | + 'lqt-ajax-invalid-subject', |
| 860 | + 'lqt-save-subject-error-unknown', |
| 861 | + 'lqt-cancel-subject-edit', |
857 | 862 | ); |
858 | 863 | |
859 | 864 | $data = array(); |
— | — | @@ -1093,8 +1098,9 @@ |
1094 | 1099 | |
1095 | 1100 | $id = 'lqt-header-' . $thread->id(); |
1096 | 1101 | |
1097 | | - $html = $this->output->parseInline( $thread->subjectWithoutIncrement() ); |
| 1102 | + $html = $this->output->parseInline( $thread->subject() ); |
1098 | 1103 | $html = Xml::tags( 'span', array( 'class' => 'mw-headline' ), $html ); |
| 1104 | + $html .= Xml::hidden( 'raw-header', $thread->subject() ); |
1099 | 1105 | $html = Xml::tags( 'h' . $this->headerLevel, |
1100 | 1106 | array( 'class' => 'lqt_header', 'id' => $id ), |
1101 | 1107 | $html ) . $commands_html; |
Index: branches/wmf-deployment/extensions/LiquidThreads_alpha/classes/ThreadRevision.php |
— | — | @@ -56,6 +56,10 @@ |
57 | 57 | $timestamp = wfTimestampNow(); |
58 | 58 | } |
59 | 59 | |
| 60 | + if ( is_null( $comment ) ) { |
| 61 | + $comment = ''; |
| 62 | + } |
| 63 | + |
60 | 64 | $rev = new ThreadRevision; |
61 | 65 | |
62 | 66 | $rev->mThreadId = $thread->topmostThread()->id(); |
Index: branches/wmf-deployment/extensions/LiquidThreads_alpha/classes/Thread.php |
— | — | @@ -1408,6 +1408,7 @@ |
1409 | 1409 | $restrictions = array_merge( $threadRestrictions, $talkpageRestrictions ); |
1410 | 1410 | |
1411 | 1411 | foreach( $restrictions as $right => $source ) { |
| 1412 | + if ( $right == 'sysop' ) $right = 'protect'; |
1412 | 1413 | if ( !$user->isAllowed( $right ) ) { |
1413 | 1414 | return $source; |
1414 | 1415 | } |
Index: branches/wmf-deployment/extensions/LiquidThreads_alpha/pages/ThreadPermalinkView.php |
— | — | @@ -108,8 +108,6 @@ |
109 | 109 | |
110 | 110 | $talkClasses = array(); |
111 | 111 | if ( !$talkTitle->exists() ) $talkClasses[] = 'new'; |
112 | | - if ( $talkTitle->equals( $view->thread->article()->getTitle() ) ) |
113 | | - $talkClasses[] = 'selected'; |
114 | 112 | |
115 | 113 | $tabs['article'] = |
116 | 114 | array( |
Index: branches/wmf-deployment/extensions/LiquidThreads_alpha/pages/SpecialNewMessages.php |
— | — | @@ -15,7 +15,7 @@ |
16 | 16 | */ |
17 | 17 | function getDescription() { |
18 | 18 | wfLoadExtensionMessages( 'LiquidThreads' ); |
19 | | - return wfMsg( 'lqt_newmessages' ); |
| 19 | + return wfMsg( 'lqt_newmessages-title' ); |
20 | 20 | } |
21 | 21 | |
22 | 22 | function execute( $par ) { |
Index: branches/wmf-deployment/extensions/LiquidThreads_alpha/pages/TalkpageView.php |
— | — | @@ -255,7 +255,7 @@ |
256 | 256 | array( ), |
257 | 257 | array( 'lqt_method' => 'talkpage_new_thread' ), |
258 | 258 | array( 'known' ) ); |
259 | | - |
| 259 | + |
260 | 260 | $talkpageHeader .= Xml::tags( 'strong', |
261 | 261 | array( 'class' => 'lqt_start_discussion' ), |
262 | 262 | $newThreadLink ); |
Index: branches/wmf-deployment/extensions/LiquidThreads_alpha/api/ApiThreadAction.php |
— | — | @@ -550,6 +550,8 @@ |
551 | 551 | return; |
552 | 552 | } |
553 | 553 | |
| 554 | + $talkpage = $thread->article(); |
| 555 | + |
554 | 556 | $subject = $params['subject']; |
555 | 557 | $title = null; |
556 | 558 | $subjectOk = Thread::validateSubject( $subject, $title, null, $talkpage ); |
Index: branches/wmf-deployment/extensions/LiquidThreads_alpha/lqt.js |
— | — | @@ -333,7 +333,133 @@ |
334 | 334 | } |
335 | 335 | } ); |
336 | 336 | }, |
| 337 | + |
| 338 | + 'setupThreadMenu' : function( menu, id ) { |
| 339 | + if ( menu.find('.lqt-command-edit-subject').length ) { |
| 340 | + return; |
| 341 | + } |
337 | 342 | |
| 343 | + var editSubjectField = $j('<li/>'); |
| 344 | + var editSubjectLink = $j('<a href="#"/>'); |
| 345 | + editSubjectLink.text( wgLqtMessages['lqt-change-subject'] ); |
| 346 | + editSubjectField.append( editSubjectLink ); |
| 347 | + editSubjectField.click( liquidThreads.handleChangeSubject ); |
| 348 | + editSubjectField.data( 'thread-id', id ) |
| 349 | + |
| 350 | + editSubjectField.addClass( 'lqt-command-edit-subject' ); |
| 351 | + |
| 352 | + menu.append( editSubjectField ); |
| 353 | + }, |
| 354 | + |
| 355 | + 'handleChangeSubject' : function(e) { |
| 356 | + e.preventDefault(); |
| 357 | + |
| 358 | + // Grab the h2 |
| 359 | + var threadId = $j(this).data('thread-id'); |
| 360 | + var header = $j('#lqt-header-'+threadId); |
| 361 | + var headerText = header.find("input[name='raw-header']").val(); |
| 362 | + |
| 363 | + var textbox = $j('<input type="textbox" />').val(headerText); |
| 364 | + textbox.attr('id', 'lqt-subject-input-'+threadId); |
| 365 | + textbox.attr('size', '75'); |
| 366 | + textbox.val(headerText); |
| 367 | + |
| 368 | + var saveText = wgLqtMessages['lqt-save-subject']; |
| 369 | + var saveButton = $j('<input type="button" />'); |
| 370 | + saveButton.val( saveText ); |
| 371 | + saveButton.click( liquidThreads.handleSubjectSave ); |
| 372 | + |
| 373 | + var cancelButton = $j('<input type="button" />'); |
| 374 | + cancelButton.val( wgLqtMessages['lqt-cancel-subject-edit'] ); |
| 375 | + cancelButton.click( function(e) { |
| 376 | + var form = $j(this).closest('.mw-subject-editor'); |
| 377 | + var header = form.closest('.lqt_header'); |
| 378 | + header.contents().filter('.mw-headline').show(); |
| 379 | + form.remove(); |
| 380 | + |
| 381 | + } ); |
| 382 | + |
| 383 | + header.contents().filter('span.mw-headline').hide(); |
| 384 | + |
| 385 | + var subjectForm = $j('<span class="mw-subject-editor"/>'); |
| 386 | + subjectForm.append(textbox); |
| 387 | + subjectForm.append( ' ' ); |
| 388 | + subjectForm.append(saveButton); |
| 389 | + subjectForm.append( ' ' ); |
| 390 | + subjectForm.append( cancelButton ); |
| 391 | + subjectForm.data( 'thread-id', threadId ); |
| 392 | + |
| 393 | + header.append(subjectForm); |
| 394 | + |
| 395 | + }, |
| 396 | + |
| 397 | + 'handleSubjectSave' : function(e) { |
| 398 | + var button = $j(this); |
| 399 | + var subjectForm = button.closest('.mw-subject-editor'); |
| 400 | + var header = subjectForm.closest('.lqt_header'); |
| 401 | + var threadId = subjectForm.data('thread-id'); |
| 402 | + var textbox = $j('#lqt-subject-input-'+threadId); |
| 403 | + var newSubject = textbox.val().trim(); |
| 404 | + |
| 405 | + if (!newSubject) { |
| 406 | + alert( wgLqtMessages['lqt-ajax-no-subject'] ); |
| 407 | + return; |
| 408 | + } |
| 409 | + |
| 410 | + // Add a spinner |
| 411 | + var spinner = $j('<div class="mw-ajax-loader"/>'); |
| 412 | + header.append(spinner); |
| 413 | + subjectForm.hide(); |
| 414 | + |
| 415 | + var request = { |
| 416 | + 'action' : 'threadaction', |
| 417 | + 'threadaction' : 'setsubject', |
| 418 | + 'subject' : newSubject.trim(), |
| 419 | + 'thread' : threadId |
| 420 | + }; |
| 421 | + |
| 422 | + var errorHandler = function(reply) { |
| 423 | + try { |
| 424 | + code = reply.error.code; |
| 425 | + description = reply.error.info; |
| 426 | + |
| 427 | + if (code == 'invalid-subject') { |
| 428 | + alert( wgLqtMessages['lqt-ajax-invalid-subject'] ); |
| 429 | + } else { |
| 430 | + var msg = wgLqtMessages['lqt-save-subject-failed']; |
| 431 | + msg.replace( '$1', description ); |
| 432 | + } |
| 433 | + |
| 434 | + subjectForm.show(); |
| 435 | + spinner.remove(); |
| 436 | + } catch (err) { |
| 437 | + alert( wgLqtMessages['lqt-save-subject-error-unknown'] ); |
| 438 | + subjectForm.remove(); |
| 439 | + spinner.remove(); |
| 440 | + header.contents().filter('.mw-headline').show(); |
| 441 | + } |
| 442 | + } |
| 443 | + |
| 444 | + // Set new subject through API. |
| 445 | + liquidThreads.apiRequest( request, function(reply) { |
| 446 | + var result; |
| 447 | + |
| 448 | + try { |
| 449 | + result = reply.threadaction.thread.result; |
| 450 | + } catch (err) { |
| 451 | + result = 'error'; |
| 452 | + } |
| 453 | + |
| 454 | + if ( result == 'success' ) { |
| 455 | + spinner.remove(); |
| 456 | + var thread = $j('#lqt_thread_id_'+threadId); |
| 457 | + liquidThreads.doReloadThread( thread ); |
| 458 | + } else { |
| 459 | + errorHandler(reply); |
| 460 | + } |
| 461 | + } ); |
| 462 | + }, |
| 463 | + |
338 | 464 | 'handleDocumentClick' : function(e) { |
339 | 465 | // Collapse all menus |
340 | 466 | $j('.lqt-thread-toolbar-command-list').hide('fast'); |
— | — | @@ -483,6 +609,14 @@ |
484 | 610 | // Update menus |
485 | 611 | $j(threadContainer).each( liquidThreads.setupMenus ); |
486 | 612 | |
| 613 | + // Update thread-level menu, if appropriate |
| 614 | + if ( $j(threadWrapper).hasClass( 'lqt-thread-topmost' ) ) { |
| 615 | + var threadLevelCommandSelector = '#lqt-threadlevel-commands-'+threadId; |
| 616 | + |
| 617 | + var menu = $j(threadLevelCommandSelector); |
| 618 | + liquidThreads.setupThreadMenu( menu, threadId ); |
| 619 | + } |
| 620 | + |
487 | 621 | // Check for a "show replies" button |
488 | 622 | $j('a.lqt-show-replies').click( liquidThreads.showReplies ); |
489 | 623 | |
— | — | @@ -876,6 +1010,28 @@ |
877 | 1011 | } else { |
878 | 1012 | prevWarning.remove(); |
879 | 1013 | } |
| 1014 | + }, |
| 1015 | + |
| 1016 | + 'apiRequest' : function( request, callback ) { |
| 1017 | + // Set new subject through API. |
| 1018 | + liquidThreads.getToken( function(token) { |
| 1019 | + |
| 1020 | + if ( typeof request == 'function' ) { |
| 1021 | + request = request(token); |
| 1022 | + } else { |
| 1023 | + request.token = token; |
| 1024 | + } |
| 1025 | + |
| 1026 | + request.format = 'json'; |
| 1027 | + |
| 1028 | + var path = wgScriptPath+'/api'+wgScriptExtension; |
| 1029 | + $j.post( path, request, |
| 1030 | + function(data) { |
| 1031 | + if (callback) { |
| 1032 | + callback(data); |
| 1033 | + } |
| 1034 | + }, 'json' ); |
| 1035 | + } ); |
880 | 1036 | } |
881 | 1037 | } |
882 | 1038 | |
Property changes on: branches/wmf-deployment/extensions/LiquidThreads_alpha |
___________________________________________________________________ |
Modified: svn:mergeinfo |
883 | 1039 | Merged /trunk/extensions/LiquidThreads:r59666-59743 |