diff --git a/ChangeLog b/ChangeLog index 99d3eea12..714b39a89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ Version 0.4.3 (under dev!) * core: add options to customize default text search in buffers: weechat.look.buffer_search_{case_sensitive|force_default|regex|where} +* irc: add option irc.look.notice_welcome_tags * irc: add server option "default_msg_kick" to customize default kick/kickban message (task #12777) diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt index bb1704be0..f4a96619f 100644 --- a/doc/de/autogen/user/irc_options.txt +++ b/doc/de/autogen/user/irc_options.txt @@ -258,6 +258,11 @@ ** Typ: boolesch ** Werte: on, off (Standardwert: `on`) +* [[option_irc.look.notice_welcome_tags]] *irc.look.notice_welcome_tags* +** Beschreibung: `comma separated list of tags used in a welcome notices redirected to a channel, for example: "notify_private"` +** Typ: Zeichenkette +** Werte: beliebige Zeichenkette (Standardwert: `""`) + * [[option_irc.look.notify_tags_ison]] *irc.look.notify_tags_ison* ** Beschreibung: `durch Kommata getrennte Liste von Schlagwörtern die in notify-Nachrichten genutzt werden sollen, falls ein Nick einen Server betritt oder verlässt (Rückgabe durch Befehl ison), zum Beispiel: "notify_message", "notify_private" oder "notify_highlight"` ** Typ: Zeichenkette diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt index 8897470d5..a64003c55 100644 --- a/doc/en/autogen/user/irc_options.txt +++ b/doc/en/autogen/user/irc_options.txt @@ -258,6 +258,11 @@ ** type: boolean ** values: on, off (default value: `on`) +* [[option_irc.look.notice_welcome_tags]] *irc.look.notice_welcome_tags* +** description: `comma separated list of tags used in a welcome notices redirected to a channel, for example: "notify_private"` +** type: string +** values: any string (default value: `""`) + * [[option_irc.look.notify_tags_ison]] *irc.look.notify_tags_ison* ** description: `comma separated list of tags used in messages displayed by notify when a nick joins or quits server (result of command ison), for example: "notify_message", "notify_private" or "notify_highlight"` ** type: string diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt index 69dba4e7f..5f3e5c0e6 100644 --- a/doc/fr/autogen/user/irc_options.txt +++ b/doc/fr/autogen/user/irc_options.txt @@ -258,6 +258,11 @@ ** type: booléen ** valeurs: on, off (valeur par défaut: `on`) +* [[option_irc.look.notice_welcome_tags]] *irc.look.notice_welcome_tags* +** description: `liste des tags (séparés par des virgules) utilisés dans la notice de bienvenue redirigée vers un canal, par exemple: "notify_private"` +** type: chaîne +** valeurs: toute chaîne (valeur par défaut: `""`) + * [[option_irc.look.notify_tags_ison]] *irc.look.notify_tags_ison* ** description: `liste des tags (séparés par des virgules) utilisés dans les messages affichés par notify lorsqu'un pseudo a rejoint ou quitté le serveur (résultat de la commande ison), par exemple: "notify_message", "notify_private" ou "notify_highlight"` ** type: chaîne diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt index c5d4e86e6..483afa400 100644 --- a/doc/it/autogen/user/irc_options.txt +++ b/doc/it/autogen/user/irc_options.txt @@ -258,6 +258,11 @@ ** tipo: bool ** valori: on, off (valore predefinito: `on`) +* [[option_irc.look.notice_welcome_tags]] *irc.look.notice_welcome_tags* +** descrizione: `comma separated list of tags used in a welcome notices redirected to a channel, for example: "notify_private"` +** tipo: stringa +** valori: qualsiasi stringa (valore predefinito: `""`) + * [[option_irc.look.notify_tags_ison]] *irc.look.notify_tags_ison* ** descrizione: `elenco separato da virgole di tag usati nei messaggi mostrati dalle notifiche quando un nick entra o esce da un server (risultato del comando ison), ad esempio: "notify_message", "notify_private" o "notify_highlight"` ** tipo: stringa diff --git a/doc/ja/autogen/user/irc_options.txt b/doc/ja/autogen/user/irc_options.txt index 1ccc2012e..d559b3a4b 100644 --- a/doc/ja/autogen/user/irc_options.txt +++ b/doc/ja/autogen/user/irc_options.txt @@ -258,6 +258,11 @@ ** タイプ: ブール ** 値: on, off (デフォルト値: `on`) +* [[option_irc.look.notice_welcome_tags]] *irc.look.notice_welcome_tags* +** 説明: `comma separated list of tags used in a welcome notices redirected to a channel, for example: "notify_private"` +** タイプ: 文字列 +** 値: 未制約文字列 (デフォルト値: `""`) + * [[option_irc.look.notify_tags_ison]] *irc.look.notify_tags_ison* ** 説明: `あるニックネームが参加またはサーバから切断したときの (ison コマンドの結果)、notify によって表示されたメッセージに使われたタグのコンマ区切りリスト、例えば: "notify_message"、"notify_highlight"、"notify_private"` ** タイプ: 文字列 diff --git a/po/cs.po b/po/cs.po index 4b700932a..aeffd4480 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-10-08 13:31+0200\n" +"POT-Creation-Date: 2013-10-08 21:59+0200\n" "PO-Revision-Date: 2013-10-08 11:24+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -6425,6 +6425,15 @@ msgid "" "\"[#channel] Welcome to this channel...\"" msgstr "" +#, fuzzy +msgid "" +"comma separated list of tags used in a welcome notices redirected to a " +"channel, for example: \"notify_private\"" +msgstr "" +"čárkou oddělený seznam značek použitých ve zprávách vypsaných notifikacemi, " +"když se přezdívka připojí/odpojí k/ze serveru (výsledek příkazu ison), " +"například: \"notify_highlight\", \"notify_message\" or \"notify_private\"" + #, fuzzy msgid "" "comma separated list of tags used in messages displayed by notify when a " diff --git a/po/de.po b/po/de.po index 0648e9fb6..fafa0d726 100644 --- a/po/de.po +++ b/po/de.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-10-08 13:31+0200\n" +"POT-Creation-Date: 2013-10-08 21:59+0200\n" "PO-Revision-Date: 2013-10-08 11:24+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -7197,6 +7197,15 @@ msgstr "" "sieht auf dem freenode Server wie folgt aus: \"[#channel] Herzlich " "Willkommen zum ...\"" +#, fuzzy +msgid "" +"comma separated list of tags used in a welcome notices redirected to a " +"channel, for example: \"notify_private\"" +msgstr "" +"durch Kommata getrennte Liste von Schlagwörtern die für private Nachrichten " +"genutzt werden sollen. Zum Beispiel: \"notify_message\", \"notify_private\" " +"oder \"notify_highlight\"" + msgid "" "comma separated list of tags used in messages displayed by notify when a " "nick joins or quits server (result of command ison), for example: " diff --git a/po/es.po b/po/es.po index 503e48fcb..d2ad17ef7 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: 2013-10-08 13:31+0200\n" +"POT-Creation-Date: 2013-10-08 21:59+0200\n" "PO-Revision-Date: 2013-10-08 11:24+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -6681,6 +6681,15 @@ msgid "" "\"[#channel] Welcome to this channel...\"" msgstr "" +#, fuzzy +msgid "" +"comma separated list of tags used in a welcome notices redirected to a " +"channel, for example: \"notify_private\"" +msgstr "" +"lista separada por comas de etiquetas usadas en los mensajes de notificación " +"cuando un apodo se une o abandona el servidor (resultado del comando ison), " +"por ejemplo: \"notify_highlight\", \"notify_message\" o \"notify_private\"" + #, fuzzy msgid "" "comma separated list of tags used in messages displayed by notify when a " diff --git a/po/fr.po b/po/fr.po index 8bda9f993..553fc7931 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: 2013-10-08 13:31+0200\n" -"PO-Revision-Date: 2013-10-08 13:32+0200\n" +"POT-Creation-Date: 2013-10-08 21:59+0200\n" +"PO-Revision-Date: 2013-10-08 21:59+0200\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -7025,6 +7025,13 @@ msgstr "" "canal au début du message de notice, par exemple les notices envoyées par le " "serveur freenode qui ressemblent à: \"[#canal] Bienvenue sur ce canal...\"" +msgid "" +"comma separated list of tags used in a welcome notices redirected to a " +"channel, for example: \"notify_private\"" +msgstr "" +"liste des tags (séparés par des virgules) utilisés dans la notice de " +"bienvenue redirigée vers un canal, par exemple: \"notify_private\"" + msgid "" "comma separated list of tags used in messages displayed by notify when a " "nick joins or quits server (result of command ison), for example: " diff --git a/po/hu.po b/po/hu.po index b679252ec..1a78893aa 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: 2013-10-08 13:31+0200\n" +"POT-Creation-Date: 2013-10-08 21:59+0200\n" "PO-Revision-Date: 2013-10-08 11:24+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -5938,6 +5938,11 @@ msgid "" "\"[#channel] Welcome to this channel...\"" msgstr "" +msgid "" +"comma separated list of tags used in a welcome notices redirected to a " +"channel, for example: \"notify_private\"" +msgstr "" + msgid "" "comma separated list of tags used in messages displayed by notify when a " "nick joins or quits server (result of command ison), for example: " diff --git a/po/it.po b/po/it.po index b71badc1c..434341383 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: 2013-10-08 13:31+0200\n" +"POT-Creation-Date: 2013-10-08 21:59+0200\n" "PO-Revision-Date: 2013-10-08 11:24+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -6812,6 +6812,14 @@ msgid "" "\"[#channel] Welcome to this channel...\"" msgstr "" +#, fuzzy +msgid "" +"comma separated list of tags used in a welcome notices redirected to a " +"channel, for example: \"notify_private\"" +msgstr "" +"elenco separato da virgole di tag usati nei messaggi privati, ad esempio: " +"\"notify_message\", \"notify_private\" o \"notify_highlight\"" + msgid "" "comma separated list of tags used in messages displayed by notify when a " "nick joins or quits server (result of command ison), for example: " diff --git a/po/ja.po b/po/ja.po index 65c110346..113112d34 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: 2013-10-08 13:31+0200\n" +"POT-Creation-Date: 2013-10-08 21:59+0200\n" "PO-Revision-Date: 2013-10-08 11:25+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" @@ -6741,6 +6741,14 @@ msgid "" "\"[#channel] Welcome to this channel...\"" msgstr "" +#, fuzzy +msgid "" +"comma separated list of tags used in a welcome notices redirected to a " +"channel, for example: \"notify_private\"" +msgstr "" +"プライベートメッセージに使われたタグのコンマ区切りリスト、例えば: " +"\"notify_message\"、\"notify_private\"、\"notify_highlight\"" + msgid "" "comma separated list of tags used in messages displayed by notify when a " "nick joins or quits server (result of command ison), for example: " diff --git a/po/pl.po b/po/pl.po index 506a1698c..8bb8d8c87 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-10-08 13:31+0200\n" +"POT-Creation-Date: 2013-10-08 21:59+0200\n" "PO-Revision-Date: 2013-10-08 11:25+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -6883,6 +6883,14 @@ msgstr "" "przykład powiadomienia wysyłane przez serwer freenode wyglądają następująco: " "\"[#kanał] Witaj na tym kanale...\"" +#, fuzzy +msgid "" +"comma separated list of tags used in a welcome notices redirected to a " +"channel, for example: \"notify_private\"" +msgstr "" +"oddzielona przecinkami lista tagów użytych w prywatnych wiadomościach na " +"przykład: \"notify_message\", \"notify_private\" or \"notify_highlight\"" + msgid "" "comma separated list of tags used in messages displayed by notify when a " "nick joins or quits server (result of command ison), for example: " diff --git a/po/pt_BR.po b/po/pt_BR.po index 4cfd3ffb2..66ef5642e 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: 2013-10-08 13:31+0200\n" +"POT-Creation-Date: 2013-10-08 21:59+0200\n" "PO-Revision-Date: 2013-10-06 12:40+0200\n" "Last-Translator: Sergio Durigan Junior \n" "Language-Team: weechat-dev \n" @@ -6158,6 +6158,11 @@ msgid "" "\"[#channel] Welcome to this channel...\"" msgstr "" +msgid "" +"comma separated list of tags used in a welcome notices redirected to a " +"channel, for example: \"notify_private\"" +msgstr "" + msgid "" "comma separated list of tags used in messages displayed by notify when a " "nick joins or quits server (result of command ison), for example: " diff --git a/po/ru.po b/po/ru.po index 6d922a69b..543bb045e 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: 2013-10-08 13:31+0200\n" +"POT-Creation-Date: 2013-10-08 21:59+0200\n" "PO-Revision-Date: 2013-10-08 11:25+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -5961,6 +5961,11 @@ msgid "" "\"[#channel] Welcome to this channel...\"" msgstr "" +msgid "" +"comma separated list of tags used in a welcome notices redirected to a " +"channel, for example: \"notify_private\"" +msgstr "" + msgid "" "comma separated list of tags used in messages displayed by notify when a " "nick joins or quits server (result of command ison), for example: " diff --git a/po/tr.po b/po/tr.po index 77194a771..2488b67ec 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: 2013-10-08 13:31+0200\n" +"POT-Creation-Date: 2013-10-08 21:59+0200\n" "PO-Revision-Date: 2013-10-06 12:40+0200\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -5256,6 +5256,11 @@ msgid "" "\"[#channel] Welcome to this channel...\"" msgstr "" +msgid "" +"comma separated list of tags used in a welcome notices redirected to a " +"channel, for example: \"notify_private\"" +msgstr "" + msgid "" "comma separated list of tags used in messages displayed by notify when a " "nick joins or quits server (result of command ison), for example: " diff --git a/po/weechat.pot b/po/weechat.pot index 981cdceaf..d5132d940 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-10-08 13:31+0200\n" +"POT-Creation-Date: 2013-10-08 21:59+0200\n" "PO-Revision-Date: 2013-02-14 18:20+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: weechat-dev \n" @@ -5214,6 +5214,11 @@ msgid "" "\"[#channel] Welcome to this channel...\"" msgstr "" +msgid "" +"comma separated list of tags used in a welcome notices redirected to a " +"channel, for example: \"notify_private\"" +msgstr "" + msgid "" "comma separated list of tags used in messages displayed by notify when a " "nick joins or quits server (result of command ison), for example: " diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index 66a877e76..f47e85bc2 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -87,6 +87,7 @@ struct t_config_option *irc_config_look_nick_mode; struct t_config_option *irc_config_look_nick_mode_empty; struct t_config_option *irc_config_look_notice_as_pv; struct t_config_option *irc_config_look_notice_welcome_redirect; +struct t_config_option *irc_config_look_notice_welcome_tags; struct t_config_option *irc_config_look_notify_tags_ison; struct t_config_option *irc_config_look_notify_tags_whois; struct t_config_option *irc_config_look_part_closes_buffer; @@ -2472,6 +2473,13 @@ irc_config_init () "beginning of notice message, for example notices sent by freenode " "server which look like: \"[#channel] Welcome to this channel...\""), NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_look_notice_welcome_tags = weechat_config_new_option ( + irc_config_file, ptr_section, + "notice_welcome_tags", "string", + N_("comma separated list of tags used in a welcome notices redirected " + "to a channel, for example: \"notify_private\""), + NULL, 0, 0, "", NULL, 0, NULL, NULL, + NULL, NULL, NULL, NULL); irc_config_look_notify_tags_ison = weechat_config_new_option ( irc_config_file, ptr_section, "notify_tags_ison", "string", diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h index 025c85829..2cee3a8a4 100644 --- a/src/plugins/irc/irc-config.h +++ b/src/plugins/irc/irc-config.h @@ -135,6 +135,7 @@ extern struct t_config_option *irc_config_look_nick_mode; extern struct t_config_option *irc_config_look_nick_mode_empty; extern struct t_config_option *irc_config_look_notice_as_pv; extern struct t_config_option *irc_config_look_notice_welcome_redirect; +extern struct t_config_option *irc_config_look_notice_welcome_tags; extern struct t_config_option *irc_config_look_notify_tags_ison; extern struct t_config_option *irc_config_look_notify_tags_whois; extern struct t_config_option *irc_config_look_part_closes_buffer; diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index 3985ba287..3aa8844ad 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -1169,7 +1169,9 @@ IRC_PROTOCOL_CALLBACK(notice) weechat_printf_date_tags ((ptr_channel) ? ptr_channel->buffer : server->buffer, date, irc_protocol_tags (command, - (is_channel_orig) ? "notify_message" : "notify_private", + (is_channel_orig) ? + "notify_message" : + weechat_config_string (irc_config_look_notice_welcome_tags), nick), "%s%s%s%s%s(%s%s%s)%s%s%s%s%s: %s", weechat_prefix ("network"),