diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 76866499f..3ff6e997e 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -18,6 +18,10 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] [[v3.9]] == Version 3.9 (under dev) +New features:: + + * irc: add option `join` in command `/autojoin` + Bug fixes:: * core: fix display glitch in command errors when a wide char is set in option weechat.look.command_chars (issue #1871) diff --git a/doc/de/includes/autogen_user_commands.de.adoc b/doc/de/includes/autogen_user_commands.de.adoc index 94c7fb6ea..ee2245f76 100644 --- a/doc/de/includes/autogen_user_commands.de.adoc +++ b/doc/de/includes/autogen_user_commands.de.adoc @@ -131,17 +131,19 @@ Beispiele: addraw [,...] [[,...]] del [ [...]] apply + join sort - add: Hinzufügen des aktuellen Kanals oder einer Liste von Kanälen (mit optionalen Schlüsseln) zur autojoin-Option; Wenn Sie sich in dem Kanal befinden und der Schlüssel nicht übergeben wird, wird der Schlüssel im Kanal gelesen - addraw: das IRC Roh-Format wird genutzt (wie beim /join Befehl): alle Kanäle werden durch Kommata voneinander getrennt und optional werden die Schlüssel durch Kommata separiert - del: Löschen des aktuellen Kanals oder eine Liste von Kanälen aus der autoJoin-Option -channel: Kanalname - key: Schlüssel für den Kanal - apply: fügt die aktuell besuchten Kanäle in der autojoin-Option hinzu - sort: sortiert die Kanäle alphabetisch in der autojoin Option + add: add current channel or a list of channels (with optional keys) to the autojoin option; if you are on the channel and the key is not provided, the key is read in the channel + addraw: use the IRC raw format (same as /join command): all channels separated by commas, optional keys separated by commas + del: delete current channel or a list of channels from the autojoin option +channel: channel name + key: key for the channel + apply: set currently joined channels in the autojoin option + join: join the channels in the autojoin option + sort: sort alphabetically channels in the autojoin option -Beispiele: +Examples: /autojoin add /autojoin add #test /autojoin add #chan1 #chan2 @@ -150,6 +152,7 @@ Beispiele: /autojoin del /autojoin del #chan1 /autojoin apply + /autojoin join /autojoin sort ---- @@ -303,7 +306,7 @@ nick: Nick oder Maske (Platzhalter "*" kann verwendet werden) * -yes nick: Nick oder Maske (Platzhalter "*" kann verwendet werden) - *: entzieht allen Nicks im Kanal den voice-Status + *: entzieht allen Nicks im Kanal die Stimme ---- [[command_irc_die]] @@ -520,7 +523,7 @@ Kanal-Eigenschaften: i: geschlossener Kanal (Zutritt nur mit Einladung) t: nur Operatoren dürfen das Thema setzen n: keine Nachrichten von außerhalb des Kanals zulassen - m: moderierter Kanal (schreiben nur mit Voice) + m: moderierter Kanal (schreiben nur mit Stimme) l: maximale Anzahl an Usern im Kanal festlegen b: Bannmaske für zu sperrende User (in nick!ident@host-Form) e: legt Ausnahmemaske fest @@ -997,14 +1000,14 @@ target: Servername ---- [[command_irc_voice]] -* `+voice+`: Voice an Nick(s) vergeben +* `+voice+`: Stimme an Nick(s) vergeben ---- /voice [...] * -yes nick: Nick oder Maske (Platzhalter "*" kann verwendet werden) - *: vergibt an alle Nicks im Kanal den voice-Status + *: vergibt an alle Nicks im Kanal eine Stimme ---- [[command_irc_wallchops]] diff --git a/doc/en/includes/autogen_user_commands.en.adoc b/doc/en/includes/autogen_user_commands.en.adoc index 8a1432f85..0a5f76dc7 100644 --- a/doc/en/includes/autogen_user_commands.en.adoc +++ b/doc/en/includes/autogen_user_commands.en.adoc @@ -131,6 +131,7 @@ Examples: addraw [,...] [[,...]] del [ [...]] apply + join sort add: add current channel or a list of channels (with optional keys) to the autojoin option; if you are on the channel and the key is not provided, the key is read in the channel @@ -139,6 +140,7 @@ Examples: channel: channel name key: key for the channel apply: set currently joined channels in the autojoin option + join: join the channels in the autojoin option sort: sort alphabetically channels in the autojoin option Examples: @@ -150,6 +152,7 @@ Examples: /autojoin del /autojoin del #chan1 /autojoin apply + /autojoin join /autojoin sort ---- diff --git a/doc/fr/includes/autogen_user_commands.fr.adoc b/doc/fr/includes/autogen_user_commands.fr.adoc index 71f9f6bea..10b33e9a8 100644 --- a/doc/fr/includes/autogen_user_commands.fr.adoc +++ b/doc/fr/includes/autogen_user_commands.fr.adoc @@ -131,6 +131,7 @@ Exemples : addraw [,...] [[,...]] del [ [...]] apply + join sort add : ajouter le canal courant ou une liste de canaux (avec clés facultatives) dans l'option autojoin ; si vous êtes sur le canal et que la clé n'est pas fournie, la clé est lue sur ce canal @@ -139,6 +140,7 @@ Exemples : channel : nom du canal key : clé pour le canal apply : définir les canaux actuellement joints dans l'option autojoin + join : joindre les canaux de l'option autojoin sort : trier les canaux de l'option autojoin par ordre alphabétique Exemples : @@ -150,6 +152,7 @@ Exemples : /autojoin del /autojoin del #chan1 /autojoin apply + /autojoin join /autojoin sort ---- diff --git a/doc/it/includes/autogen_user_commands.it.adoc b/doc/it/includes/autogen_user_commands.it.adoc index 4299fd24b..7a64ad907 100644 --- a/doc/it/includes/autogen_user_commands.it.adoc +++ b/doc/it/includes/autogen_user_commands.it.adoc @@ -131,6 +131,7 @@ Examples: addraw [,...] [[,...]] del [ [...]] apply + join sort add: add current channel or a list of channels (with optional keys) to the autojoin option; if you are on the channel and the key is not provided, the key is read in the channel @@ -139,6 +140,7 @@ Examples: channel: channel name key: key for the channel apply: set currently joined channels in the autojoin option + join: join the channels in the autojoin option sort: sort alphabetically channels in the autojoin option Examples: @@ -150,6 +152,7 @@ Examples: /autojoin del /autojoin del #chan1 /autojoin apply + /autojoin join /autojoin sort ---- diff --git a/doc/ja/includes/autogen_user_commands.ja.adoc b/doc/ja/includes/autogen_user_commands.ja.adoc index 7fb25702e..8f6e0a6ec 100644 --- a/doc/ja/includes/autogen_user_commands.ja.adoc +++ b/doc/ja/includes/autogen_user_commands.ja.adoc @@ -131,6 +131,7 @@ Examples: addraw [,...] [[,...]] del [ [...]] apply + join sort add: add current channel or a list of channels (with optional keys) to the autojoin option; if you are on the channel and the key is not provided, the key is read in the channel @@ -139,6 +140,7 @@ Examples: channel: channel name key: key for the channel apply: set currently joined channels in the autojoin option + join: join the channels in the autojoin option sort: sort alphabetically channels in the autojoin option Examples: @@ -150,6 +152,7 @@ Examples: /autojoin del /autojoin del #chan1 /autojoin apply + /autojoin join /autojoin sort ---- diff --git a/doc/pl/includes/autogen_user_commands.pl.adoc b/doc/pl/includes/autogen_user_commands.pl.adoc index 834d9b6f2..02a89144a 100644 --- a/doc/pl/includes/autogen_user_commands.pl.adoc +++ b/doc/pl/includes/autogen_user_commands.pl.adoc @@ -127,21 +127,23 @@ Przykłady: * `+autojoin+`: konfiguruje opcje serwera "autojoin" ---- -/autojoin add [ [...]] - addraw [,...] [[,...]] - del [ [...]] +/autojoin add [ [...]] + addraw [,...] [[,...]] + del [ [...]] apply + join sort - add: dodaje obecny kanał albo listę kanałów (z opcjonalnymi hasłami) do opcji autojoin; jeśli jesteś na kanale i hasło nie zostało podane, jest ono odczytywane z kanału - addraw: użyj nieprzetworzonego formatu IRC (taki jak dla komendy /join): nazwy kanałów oddzielone przecinkami, opcjonalne hasła oddzielone przecinkami - del: usuwa obecny kanał lub listę kanałów z opcji autojoin -kanał: nazwa kanału - hasło: hasło do kanału - apply: ustawia obecne kanały w opcji autojoin - sort: sortuje alfabetycznie kanały w opcji autojoin + add: add current channel or a list of channels (with optional keys) to the autojoin option; if you are on the channel and the key is not provided, the key is read in the channel + addraw: use the IRC raw format (same as /join command): all channels separated by commas, optional keys separated by commas + del: delete current channel or a list of channels from the autojoin option +channel: channel name + key: key for the channel + apply: set currently joined channels in the autojoin option + join: join the channels in the autojoin option + sort: sort alphabetically channels in the autojoin option -Przykłady: +Examples: /autojoin add /autojoin add #test /autojoin add #chan1 #chan2 @@ -150,6 +152,7 @@ Przykłady: /autojoin del /autojoin del #chan1 /autojoin apply + /autojoin join /autojoin sort ---- diff --git a/doc/sr/includes/autogen_user_commands.sr.adoc b/doc/sr/includes/autogen_user_commands.sr.adoc index 0c93d9d52..bae808605 100644 --- a/doc/sr/includes/autogen_user_commands.sr.adoc +++ b/doc/sr/includes/autogen_user_commands.sr.adoc @@ -127,19 +127,21 @@ * `+autojoin+`: конфигурисање „autojoin” (аутоприступ) серверске опције ---- -/autojoin add [<канал1> [<канал2>...]] - addraw <канал1>[,<канал2>...] [<кључ1>[,<кључ2>...]] - del [<канал1> [<канал2>...]] +/autojoin add [ [...]] + addraw [,...] [[,...]] + del [ [...]] apply + join sort - add: додаје текући канал или листу канала (са необавезним кључевима) у autojoin опцију; ако се налазите на каналу и не наведете кључ, он се чита са канала -addraw: користи се IRC сирови формат (исто као за /join команду): сви канали су раздвојени запетама, небавезни кључеви су раздвојени запетама - del: брише текући канал или листу канала из autojoin опције - канал: име канала - кључ: кључ за канал - apply: поставља канале на које сте тренутно пријављени у autojoin опцију - sort: сортира по абецеди канале у autojoin опцији + add: add current channel or a list of channels (with optional keys) to the autojoin option; if you are on the channel and the key is not provided, the key is read in the channel + addraw: use the IRC raw format (same as /join command): all channels separated by commas, optional keys separated by commas + del: delete current channel or a list of channels from the autojoin option +channel: channel name + key: key for the channel + apply: set currently joined channels in the autojoin option + join: join the channels in the autojoin option + sort: sort alphabetically channels in the autojoin option Examples: /autojoin add @@ -150,6 +152,7 @@ Examples: /autojoin del /autojoin del #chan1 /autojoin apply + /autojoin join /autojoin sort ---- diff --git a/po/cs.po b/po/cs.po index 418f9f740..50445dfab 100644 --- a/po/cs.po +++ b/po/cs.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-01-15 21:01+0100\n" +"POT-Creation-Date: 2023-01-24 20:52+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -7037,7 +7037,8 @@ msgstr "konfigurační nastavení" msgid "" "add [ [...]] || addraw [,...] " -"[[,...]] || del [ [...]] || apply || sort" +"[[,...]] || del [ [...]] || apply || join || " +"sort" msgstr "" msgid "" @@ -7051,6 +7052,7 @@ msgid "" "channel: channel name\n" " key: key for the channel\n" " apply: set currently joined channels in the autojoin option\n" +" join: join the channels in the autojoin option\n" " sort: sort alphabetically channels in the autojoin option\n" "\n" "Examples:\n" @@ -7062,6 +7064,7 @@ msgid "" " /autojoin del\n" " /autojoin del #chan1\n" " /autojoin apply\n" +" /autojoin join\n" " /autojoin sort" msgstr "" diff --git a/po/de.po b/po/de.po index 67425bdbb..e5c5dbac1 100644 --- a/po/de.po +++ b/po/de.po @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-01-15 21:01+0100\n" +"POT-Creation-Date: 2023-01-24 20:52+0100\n" "PO-Revision-Date: 2023-01-16 08:43+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German - Germany \n" @@ -8851,13 +8851,42 @@ msgstr "" msgid "configure the \"autojoin\" server option" msgstr "Konfigurieren der Serveroption \"autojoin\"" +#, fuzzy +#| msgid "" +#| "add [ [...]] || addraw [,...] " +#| "[[,...]] || del [ [...]] || apply || sort" msgid "" "add [ [...]] || addraw [,...] " -"[[,...]] || del [ [...]] || apply || sort" +"[[,...]] || del [ [...]] || apply || join || " +"sort" msgstr "" "add [ [...]] || addraw [,...] " "[[,...]] || del [ [...]] || apply || sort" +#, fuzzy +#| msgid "" +#| " add: add current channel or a list of channels (with optional keys) " +#| "to the autojoin option; if you are on the channel and the key is not " +#| "provided, the key is read in the channel\n" +#| " addraw: use the IRC raw format (same as /join command): all channels " +#| "separated by commas, optional keys separated by commas\n" +#| " del: delete current channel or a list of channels from the autojoin " +#| "option\n" +#| "channel: channel name\n" +#| " key: key for the channel\n" +#| " apply: set currently joined channels in the autojoin option\n" +#| " sort: sort alphabetically channels in the autojoin option\n" +#| "\n" +#| "Examples:\n" +#| " /autojoin add\n" +#| " /autojoin add #test\n" +#| " /autojoin add #chan1 #chan2\n" +#| " /allchan /autojoin add\n" +#| " /autojoin addraw #chan1,#chan2,#chan3 key1,key2\n" +#| " /autojoin del\n" +#| " /autojoin del #chan1\n" +#| " /autojoin apply\n" +#| " /autojoin sort" msgid "" " add: add current channel or a list of channels (with optional keys) to " "the autojoin option; if you are on the channel and the key is not provided, " @@ -8869,6 +8898,7 @@ msgid "" "channel: channel name\n" " key: key for the channel\n" " apply: set currently joined channels in the autojoin option\n" +" join: join the channels in the autojoin option\n" " sort: sort alphabetically channels in the autojoin option\n" "\n" "Examples:\n" @@ -8880,6 +8910,7 @@ msgid "" " /autojoin del\n" " /autojoin del #chan1\n" " /autojoin apply\n" +" /autojoin join\n" " /autojoin sort" msgstr "" " add: Hinzufügen des aktuellen Kanals oder einer Liste von Kanälen (mit " diff --git a/po/es.po b/po/es.po index c718c8305..488716971 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-01-15 21:01+0100\n" +"POT-Creation-Date: 2023-01-24 20:52+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Santiago Forero \n" "Language-Team: weechat-dev \n" @@ -7609,7 +7609,8 @@ msgstr "opciones de configuración" msgid "" "add [ [...]] || addraw [,...] " -"[[,...]] || del [ [...]] || apply || sort" +"[[,...]] || del [ [...]] || apply || join || " +"sort" msgstr "" msgid "" @@ -7623,6 +7624,7 @@ msgid "" "channel: channel name\n" " key: key for the channel\n" " apply: set currently joined channels in the autojoin option\n" +" join: join the channels in the autojoin option\n" " sort: sort alphabetically channels in the autojoin option\n" "\n" "Examples:\n" @@ -7634,6 +7636,7 @@ msgid "" " /autojoin del\n" " /autojoin del #chan1\n" " /autojoin apply\n" +" /autojoin join\n" " /autojoin sort" msgstr "" diff --git a/po/fr.po b/po/fr.po index f64411a70..83f74b517 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-01-15 21:01+0100\n" -"PO-Revision-Date: 2023-01-15 21:07+0100\n" +"POT-Creation-Date: 2023-01-24 20:52+0100\n" +"PO-Revision-Date: 2023-01-24 20:53+0100\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -8682,10 +8682,11 @@ msgstr "configurer l'option serveur \"autojoin\"" msgid "" "add [ [...]] || addraw [,...] " -"[[,...]] || del [ [...]] || apply || sort" +"[[,...]] || del [ [...]] || apply || join || " +"sort" msgstr "" "add [ [...]] || addraw [,...] [[," -"...]] || del [ [...]] || apply || sort" +"...]] || del [ [...]] || apply || join || sort" msgid "" " add: add current channel or a list of channels (with optional keys) to " @@ -8698,6 +8699,7 @@ msgid "" "channel: channel name\n" " key: key for the channel\n" " apply: set currently joined channels in the autojoin option\n" +" join: join the channels in the autojoin option\n" " sort: sort alphabetically channels in the autojoin option\n" "\n" "Examples:\n" @@ -8709,6 +8711,7 @@ msgid "" " /autojoin del\n" " /autojoin del #chan1\n" " /autojoin apply\n" +" /autojoin join\n" " /autojoin sort" msgstr "" " add : ajouter le canal courant ou une liste de canaux (avec clés " @@ -8722,6 +8725,7 @@ msgstr "" "channel : nom du canal\n" " key : clé pour le canal\n" " apply : définir les canaux actuellement joints dans l'option autojoin\n" +" join : joindre les canaux de l'option autojoin\n" " sort : trier les canaux de l'option autojoin par ordre alphabétique\n" "\n" "Exemples :\n" @@ -8733,6 +8737,7 @@ msgstr "" " /autojoin del\n" " /autojoin del #chan1\n" " /autojoin apply\n" +" /autojoin join\n" " /autojoin sort" msgid "ban nicks or hosts" diff --git a/po/hu.po b/po/hu.po index c653257cd..a3980e407 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-01-15 21:01+0100\n" +"POT-Creation-Date: 2023-01-24 20:52+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -6524,7 +6524,8 @@ msgstr "Nem található az opció\n" msgid "" "add [ [...]] || addraw [,...] " -"[[,...]] || del [ [...]] || apply || sort" +"[[,...]] || del [ [...]] || apply || join || " +"sort" msgstr "" msgid "" @@ -6538,6 +6539,7 @@ msgid "" "channel: channel name\n" " key: key for the channel\n" " apply: set currently joined channels in the autojoin option\n" +" join: join the channels in the autojoin option\n" " sort: sort alphabetically channels in the autojoin option\n" "\n" "Examples:\n" @@ -6549,6 +6551,7 @@ msgid "" " /autojoin del\n" " /autojoin del #chan1\n" " /autojoin apply\n" +" /autojoin join\n" " /autojoin sort" msgstr "" diff --git a/po/it.po b/po/it.po index a2cfa046a..3525d49af 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-01-15 21:01+0100\n" +"POT-Creation-Date: 2023-01-24 20:52+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -7369,7 +7369,8 @@ msgstr "opzioni di configurazione" msgid "" "add [ [...]] || addraw [,...] " -"[[,...]] || del [ [...]] || apply || sort" +"[[,...]] || del [ [...]] || apply || join || " +"sort" msgstr "" msgid "" @@ -7383,6 +7384,7 @@ msgid "" "channel: channel name\n" " key: key for the channel\n" " apply: set currently joined channels in the autojoin option\n" +" join: join the channels in the autojoin option\n" " sort: sort alphabetically channels in the autojoin option\n" "\n" "Examples:\n" @@ -7394,6 +7396,7 @@ msgid "" " /autojoin del\n" " /autojoin del #chan1\n" " /autojoin apply\n" +" /autojoin join\n" " /autojoin sort" msgstr "" diff --git a/po/ja.po b/po/ja.po index 0c97761d8..79dc75012 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-01-15 21:01+0100\n" +"POT-Creation-Date: 2023-01-24 20:52+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese [...]] || addraw [,...] " -"[[,...]] || del [ [...]] || apply || sort" +"[[,...]] || del [ [...]] || apply || join || " +"sort" msgstr "" msgid "" @@ -8240,6 +8241,7 @@ msgid "" "channel: channel name\n" " key: key for the channel\n" " apply: set currently joined channels in the autojoin option\n" +" join: join the channels in the autojoin option\n" " sort: sort alphabetically channels in the autojoin option\n" "\n" "Examples:\n" @@ -8251,6 +8253,7 @@ msgid "" " /autojoin del\n" " /autojoin del #chan1\n" " /autojoin apply\n" +" /autojoin join\n" " /autojoin sort" msgstr "" diff --git a/po/pl.po b/po/pl.po index 6c80afaa3..d719b8a9b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-01-15 21:01+0100\n" +"POT-Creation-Date: 2023-01-24 20:52+0100\n" "PO-Revision-Date: 2022-12-30 14:10+0100\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: Polish \n" @@ -8470,13 +8470,42 @@ msgstr "" msgid "configure the \"autojoin\" server option" msgstr "konfiguruje opcje serwera \"autojoin\"" +#, fuzzy +#| msgid "" +#| "add [ [...]] || addraw [,...] " +#| "[[,...]] || del [ [...]] || apply || sort" msgid "" "add [ [...]] || addraw [,...] " -"[[,...]] || del [ [...]] || apply || sort" +"[[,...]] || del [ [...]] || apply || join || " +"sort" msgstr "" "add [ [...]] || addraw [,...] [[," "...]] || del [ [...]] || apply || sort" +#, fuzzy +#| msgid "" +#| " add: add current channel or a list of channels (with optional keys) " +#| "to the autojoin option; if you are on the channel and the key is not " +#| "provided, the key is read in the channel\n" +#| " addraw: use the IRC raw format (same as /join command): all channels " +#| "separated by commas, optional keys separated by commas\n" +#| " del: delete current channel or a list of channels from the autojoin " +#| "option\n" +#| "channel: channel name\n" +#| " key: key for the channel\n" +#| " apply: set currently joined channels in the autojoin option\n" +#| " sort: sort alphabetically channels in the autojoin option\n" +#| "\n" +#| "Examples:\n" +#| " /autojoin add\n" +#| " /autojoin add #test\n" +#| " /autojoin add #chan1 #chan2\n" +#| " /allchan /autojoin add\n" +#| " /autojoin addraw #chan1,#chan2,#chan3 key1,key2\n" +#| " /autojoin del\n" +#| " /autojoin del #chan1\n" +#| " /autojoin apply\n" +#| " /autojoin sort" msgid "" " add: add current channel or a list of channels (with optional keys) to " "the autojoin option; if you are on the channel and the key is not provided, " @@ -8488,6 +8517,7 @@ msgid "" "channel: channel name\n" " key: key for the channel\n" " apply: set currently joined channels in the autojoin option\n" +" join: join the channels in the autojoin option\n" " sort: sort alphabetically channels in the autojoin option\n" "\n" "Examples:\n" @@ -8499,6 +8529,7 @@ msgid "" " /autojoin del\n" " /autojoin del #chan1\n" " /autojoin apply\n" +" /autojoin join\n" " /autojoin sort" msgstr "" " add: dodaje obecny kanał albo listę kanałów (z opcjonalnymi hasłami) do " diff --git a/po/pt.po b/po/pt.po index 995e4c256..6c02b5957 100644 --- a/po/pt.po +++ b/po/pt.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-01-15 21:01+0100\n" +"POT-Creation-Date: 2023-01-24 20:52+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -7990,7 +7990,8 @@ msgstr "opções de configuração" msgid "" "add [ [...]] || addraw [,...] " -"[[,...]] || del [ [...]] || apply || sort" +"[[,...]] || del [ [...]] || apply || join || " +"sort" msgstr "" msgid "" @@ -8004,6 +8005,7 @@ msgid "" "channel: channel name\n" " key: key for the channel\n" " apply: set currently joined channels in the autojoin option\n" +" join: join the channels in the autojoin option\n" " sort: sort alphabetically channels in the autojoin option\n" "\n" "Examples:\n" @@ -8015,6 +8017,7 @@ msgid "" " /autojoin del\n" " /autojoin del #chan1\n" " /autojoin apply\n" +" /autojoin join\n" " /autojoin sort" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index b9aa8380d..3911ee644 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-01-15 21:01+0100\n" +"POT-Creation-Date: 2023-01-24 20:52+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Érico Nogueira \n" "Language-Team: weechat-dev \n" @@ -7208,7 +7208,8 @@ msgstr "opções de configuração" msgid "" "add [ [...]] || addraw [,...] " -"[[,...]] || del [ [...]] || apply || sort" +"[[,...]] || del [ [...]] || apply || join || " +"sort" msgstr "" msgid "" @@ -7222,6 +7223,7 @@ msgid "" "channel: channel name\n" " key: key for the channel\n" " apply: set currently joined channels in the autojoin option\n" +" join: join the channels in the autojoin option\n" " sort: sort alphabetically channels in the autojoin option\n" "\n" "Examples:\n" @@ -7233,6 +7235,7 @@ msgid "" " /autojoin del\n" " /autojoin del #chan1\n" " /autojoin apply\n" +" /autojoin join\n" " /autojoin sort" msgstr "" diff --git a/po/ru.po b/po/ru.po index 7acc5dcec..1131c2369 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-01-15 21:01+0100\n" +"POT-Creation-Date: 2023-01-24 20:52+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -6566,7 +6566,8 @@ msgstr "Не найден параметр\n" msgid "" "add [ [...]] || addraw [,...] " -"[[,...]] || del [ [...]] || apply || sort" +"[[,...]] || del [ [...]] || apply || join || " +"sort" msgstr "" msgid "" @@ -6580,6 +6581,7 @@ msgid "" "channel: channel name\n" " key: key for the channel\n" " apply: set currently joined channels in the autojoin option\n" +" join: join the channels in the autojoin option\n" " sort: sort alphabetically channels in the autojoin option\n" "\n" "Examples:\n" @@ -6591,6 +6593,7 @@ msgid "" " /autojoin del\n" " /autojoin del #chan1\n" " /autojoin apply\n" +" /autojoin join\n" " /autojoin sort" msgstr "" diff --git a/po/sr.po b/po/sr.po index ed7d686c4..d78073bdd 100644 --- a/po/sr.po +++ b/po/sr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-01-15 21:01+0100\n" +"POT-Creation-Date: 2023-01-24 20:52+0100\n" "PO-Revision-Date: 2022-12-05 09:44+0400\n" "Last-Translator: Ivan Pešić \n" "Language-Team: weechat-dev \n" @@ -8649,13 +8649,42 @@ msgstr "" msgid "configure the \"autojoin\" server option" msgstr "конфигурисање „autojoin” (аутоприступ) серверске опције" +#, fuzzy +#| msgid "" +#| "add [ [...]] || addraw [,...] " +#| "[[,...]] || del [ [...]] || apply || sort" msgid "" "add [ [...]] || addraw [,...] " -"[[,...]] || del [ [...]] || apply || sort" +"[[,...]] || del [ [...]] || apply || join || " +"sort" msgstr "" "add [<канал1> [<канал2>...]] || addraw <канал1>[,<канал2>...] [<кључ1>[," "<кључ2>...]] || del [<канал1> [<канал2>...]] || apply || sort" +#, fuzzy +#| msgid "" +#| " add: add current channel or a list of channels (with optional keys) " +#| "to the autojoin option; if you are on the channel and the key is not " +#| "provided, the key is read in the channel\n" +#| " addraw: use the IRC raw format (same as /join command): all channels " +#| "separated by commas, optional keys separated by commas\n" +#| " del: delete current channel or a list of channels from the autojoin " +#| "option\n" +#| "channel: channel name\n" +#| " key: key for the channel\n" +#| " apply: set currently joined channels in the autojoin option\n" +#| " sort: sort alphabetically channels in the autojoin option\n" +#| "\n" +#| "Examples:\n" +#| " /autojoin add\n" +#| " /autojoin add #test\n" +#| " /autojoin add #chan1 #chan2\n" +#| " /allchan /autojoin add\n" +#| " /autojoin addraw #chan1,#chan2,#chan3 key1,key2\n" +#| " /autojoin del\n" +#| " /autojoin del #chan1\n" +#| " /autojoin apply\n" +#| " /autojoin sort" msgid "" " add: add current channel or a list of channels (with optional keys) to " "the autojoin option; if you are on the channel and the key is not provided, " @@ -8667,6 +8696,7 @@ msgid "" "channel: channel name\n" " key: key for the channel\n" " apply: set currently joined channels in the autojoin option\n" +" join: join the channels in the autojoin option\n" " sort: sort alphabetically channels in the autojoin option\n" "\n" "Examples:\n" @@ -8678,6 +8708,7 @@ msgid "" " /autojoin del\n" " /autojoin del #chan1\n" " /autojoin apply\n" +" /autojoin join\n" " /autojoin sort" msgstr "" " add: додаје текући канал или листу канала (са необавезним кључевима) у " diff --git a/po/tr.po b/po/tr.po index 3317ddbb8..e0bfb2662 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-01-15 21:01+0100\n" +"POT-Creation-Date: 2023-01-24 20:52+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Emir SARI \n" "Language-Team: weechat-dev \n" @@ -8678,13 +8678,42 @@ msgstr "" msgid "configure the \"autojoin\" server option" msgstr "\"autojoin\" sunucu seçeneğini yapılandır" +#, fuzzy +#| msgid "" +#| "add [ [...]] || addraw [,...] " +#| "[[,...]] || del [ [...]] || apply || sort" msgid "" "add [ [...]] || addraw [,...] " -"[[,...]] || del [ [...]] || apply || sort" +"[[,...]] || del [ [...]] || apply || join || " +"sort" msgstr "" "add [ [...]] || addraw [,...] [[," "...]] || del [ [...]] || apply || sort" +#, fuzzy +#| msgid "" +#| " add: add current channel or a list of channels (with optional keys) " +#| "to the autojoin option; if you are on the channel and the key is not " +#| "provided, the key is read in the channel\n" +#| " addraw: use the IRC raw format (same as /join command): all channels " +#| "separated by commas, optional keys separated by commas\n" +#| " del: delete current channel or a list of channels from the autojoin " +#| "option\n" +#| "channel: channel name\n" +#| " key: key for the channel\n" +#| " apply: set currently joined channels in the autojoin option\n" +#| " sort: sort alphabetically channels in the autojoin option\n" +#| "\n" +#| "Examples:\n" +#| " /autojoin add\n" +#| " /autojoin add #test\n" +#| " /autojoin add #chan1 #chan2\n" +#| " /allchan /autojoin add\n" +#| " /autojoin addraw #chan1,#chan2,#chan3 key1,key2\n" +#| " /autojoin del\n" +#| " /autojoin del #chan1\n" +#| " /autojoin apply\n" +#| " /autojoin sort" msgid "" " add: add current channel or a list of channels (with optional keys) to " "the autojoin option; if you are on the channel and the key is not provided, " @@ -8696,6 +8725,7 @@ msgid "" "channel: channel name\n" " key: key for the channel\n" " apply: set currently joined channels in the autojoin option\n" +" join: join the channels in the autojoin option\n" " sort: sort alphabetically channels in the autojoin option\n" "\n" "Examples:\n" @@ -8707,6 +8737,7 @@ msgid "" " /autojoin del\n" " /autojoin del #chan1\n" " /autojoin apply\n" +" /autojoin join\n" " /autojoin sort" msgstr "" " add: geçerli kanalı veya bir kanal listesini (isteğe bağlı anahtarlarla) " diff --git a/po/weechat.pot b/po/weechat.pot index 59a3b8b69..3e319ea06 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2023-01-15 21:01+0100\n" +"POT-Creation-Date: 2023-01-24 20:52+0100\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -6013,7 +6013,8 @@ msgstr "" msgid "" "add [ [...]] || addraw [,...] " -"[[,...]] || del [ [...]] || apply || sort" +"[[,...]] || del [ [...]] || apply || join || " +"sort" msgstr "" msgid "" @@ -6027,6 +6028,7 @@ msgid "" "channel: channel name\n" " key: key for the channel\n" " apply: set currently joined channels in the autojoin option\n" +" join: join the channels in the autojoin option\n" " sort: sort alphabetically channels in the autojoin option\n" "\n" "Examples:\n" @@ -6038,6 +6040,7 @@ msgid "" " /autojoin del\n" " /autojoin del #chan1\n" " /autojoin apply\n" +" /autojoin join\n" " /autojoin sort" msgstr "" diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index 70686b9b3..9e10c42ac 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -909,7 +909,7 @@ IRC_COMMAND_CALLBACK(autojoin) { struct t_irc_channel *ptr_channel2; const char *ptr_autojoin; - char *old_autojoin; + char *old_autojoin, *autojoin; int i; IRC_BUFFER_GET_SERVER_CHANNEL(buffer); @@ -923,6 +923,23 @@ IRC_COMMAND_CALLBACK(autojoin) ptr_autojoin = IRC_SERVER_OPTION_STRING(ptr_server, IRC_SERVER_OPTION_AUTOJOIN); + + /* join channels in server "autojoin" option */ + if (weechat_strcasecmp (argv[1], "join") == 0) + { + if (ptr_autojoin) + { + autojoin = irc_server_eval_expression (ptr_server, ptr_autojoin); + if (autojoin && autojoin[0]) + { + irc_command_join_server (ptr_server, autojoin, 0, 0); + } + if (autojoin) + free (autojoin); + } + return WEECHAT_RC_OK; + } + old_autojoin = strdup ((ptr_autojoin) ? ptr_autojoin : ""); /* add channel(s) */ @@ -6817,6 +6834,7 @@ irc_command_init () " || addraw [,...] [[,...]]" " || del [ [...]]" " || apply" + " || join" " || sort"), N_(" add: add current channel or a list of channels (with optional " "keys) to the autojoin option; if you are on the channel and the " @@ -6828,6 +6846,7 @@ irc_command_init () "channel: channel name\n" " key: key for the channel\n" " apply: set currently joined channels in the autojoin option\n" + " join: join the channels in the autojoin option\n" " sort: sort alphabetically channels in the autojoin option\n" "\n" "Examples:\n" @@ -6839,11 +6858,13 @@ irc_command_init () " /autojoin del\n" " /autojoin del #chan1\n" " /autojoin apply\n" + " /autojoin join\n" " /autojoin sort"), "add %(irc_channels)|%*" " || addraw %(irc_channels) %-" " || del %(irc_channels_autojoin)|%*" " || apply" + " || join" " || sort", &irc_command_autojoin, NULL, NULL); weechat_hook_command_run ("/away", &irc_command_run_away, NULL, NULL);