diff --git a/ChangeLog b/ChangeLog index f4bc14f40..3e0cc2613 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ WeeChat ChangeLog ================= FlashCode -v0.3.3-dev, 2010-05-29 +v0.3.3-dev, 2010-06-01 Version 0.3.3 (under dev!) @@ -22,6 +22,8 @@ Version 0.3.3 (under dev!) * irc: add new options irc.network.autoreconnect_delay_growing and irc.network.autoreconnect_delay_max (task #10338) * irc: add new option weechat.color.status_name_ssl (task #10339) +* irc: add missing commands 346, 347 (channel invite list) +* irc: fix display of message 330 on some servers * irc: fix bug with nick prefix '*' (chan founder) on some IRC servers (bug #29890) * irc: fix bug with option irc.network.lag_check when value is 0 (zero) diff --git a/po/cs.po b/po/cs.po index 1c78baf2b..2b91f2c9c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-05-26 13:16+0200\n" +"POT-Creation-Date: 2010-06-01 15:22+0200\n" "PO-Revision-Date: 2010-05-20 12:20+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -4970,6 +4970,14 @@ msgstr "%s%s%s%s pozval %s%s%s na %s%s%s" msgid "%sChannel reop %s%s%s: %s%s" msgstr "%sReop kanálu %s%s%s: %s%s" +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)%s on %s" +msgstr "%s%s[%s%s%s] %s%s%s zakázán uživatelem %s%s %s(%s%s%s)%s v %s" + +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)" +msgstr "%s%s[%s%s%s] %s%s%s zakázán uživatelem %s%s %s(%s%s%s)" + #, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" msgstr "%s%s[%s%s%s]%s vyjímka %s%s%s od %s%s %s(%s%s%s)%s v %s" diff --git a/po/de.po b/po/de.po index 67bbd0139..0c06fd35b 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-05-26 13:16+0200\n" +"POT-Creation-Date: 2010-06-01 15:22+0200\n" "PO-Revision-Date: 2010-05-24 10:01+0200\n" "Last-Translator: Nils G \n" "Language-Team: weechat-dev \n" @@ -5167,6 +5167,14 @@ msgstr "%s%s%s%s hat %s%s%s in den Channel %s%s%s eingeladen" msgid "%sChannel reop %s%s%s: %s%s" msgstr "%sChannel-Reop %s%s%s: %s%s" +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)%s on %s" +msgstr "%s%s[%s%s%s] %s%s%s wurde gebannt von %s%s %s(%s%s%s)%s auf %s" + +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)" +msgstr "%s%s[%s%s%s] %s%s%s wurde gebannt von %s%s %s(%s%s%s)" + #, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" msgstr "%s%s[%s%s%s]%s Exception %s%s%s von %s%s %s(%s%s%s)%s auf %s" diff --git a/po/es.po b/po/es.po index bd130d050..eb2316ef3 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-05-26 13:16+0200\n" +"POT-Creation-Date: 2010-06-01 15:22+0200\n" "PO-Revision-Date: 2010-05-20 12:31+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -5040,6 +5040,14 @@ msgstr "%s%s%s%s ha invitado a %s%s%s a %s%s%s" msgid "%sChannel reop %s%s%s: %s%s" msgstr "%sCanal reop %s%s%s: %s%s" +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)%s on %s" +msgstr "%s%s[%s%s%s] %s%s%s vetado por %s%s %s(%s%s%s)%s el %s" + +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)" +msgstr "%s%s[%s%s%s] %s%s%s vetado por %s%s %s(%s%s%s)" + #, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" msgstr "%s%s[%s%s%s]%s excepción %s%s%s por %s%s %s(%s%s%s)%s el %s" diff --git a/po/fr.po b/po/fr.po index bc331a15f..2241c4657 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-05-26 13:16+0200\n" -"PO-Revision-Date: 2010-05-26 13:16+0200\n" +"POT-Creation-Date: 2010-06-01 15:22+0200\n" +"PO-Revision-Date: 2010-06-01 15:23+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "Language: French\n" @@ -5084,6 +5084,14 @@ msgstr "%s%s%s%s a invité %s%s%s sur %s%s%s" msgid "%sChannel reop %s%s%s: %s%s" msgstr "%sReop canal %s%s%s: %s%s" +#, c-format +msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)%s on %s" +msgstr "%s%s[%s%s%s] %s%s%s invité par %s%s %s(%s%s%s)%s le %s" + +#, c-format +msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)" +msgstr "%s%s[%s%s%s] %s%s%s invité par %s%s %s(%s%s%s)" + #, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" msgstr "%s%s[%s%s%s]%s exception %s%s%s par %s%s %s(%s%s%s)%s le %s" diff --git a/po/hu.po b/po/hu.po index 2d1f716f1..ca60daee8 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-05-26 13:16+0200\n" +"POT-Creation-Date: 2010-06-01 15:22+0200\n" "PO-Revision-Date: 2010-05-20 12:20+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -4787,6 +4787,14 @@ msgstr "%s%s%s meghívta %s%s%s-t %s%s-kor\n" msgid "%sChannel reop %s%s%s: %s%s" msgstr "%s szoba: %s> %s" +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)%s on %s" +msgstr "%s[%s%s%s] %s%s%s-t kitiltotta " + +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)" +msgstr "%s[%s%s%s] %s%s%s-t kitiltotta " + #, fuzzy, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" msgstr "%s[%s%s%s] %s%s%s kitiltva\n" diff --git a/po/it.po b/po/it.po index e310758a8..cf90bfdf4 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Weechat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-05-26 13:16+0200\n" +"POT-Creation-Date: 2010-06-01 15:22+0200\n" "PO-Revision-Date: 2010-05-24 10:01+0200\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" @@ -5052,6 +5052,14 @@ msgstr "%s%s%s%s ha invitato %s%s%s in %s%s%s" msgid "%sChannel reop %s%s%s: %s%s" msgstr "%sReop sul canale %s%s%s: %s%s" +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)%s on %s" +msgstr "%s%s[%s%s%s] %s%s%s bannato da %s%s %s(%s%s%s)%s su %s" + +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)" +msgstr "%s%s[%s%s%s] %s%s%s bannato da %s%s %s(%s%s%s)" + #, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" msgstr "%s%s[%s%s%s]%s eccezione %s%s%s da %s%s %s(%s%s%s)%s su %s" diff --git a/po/pl.po b/po/pl.po index 85d9d0653..725f8cefe 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-05-26 13:16+0200\n" +"POT-Creation-Date: 2010-06-01 15:22+0200\n" "PO-Revision-Date: 2010-05-20 12:22+0200\n" "Last-Translator: Krzysztof Koroscik \n" "Language-Team: weechat-dev \n" @@ -5019,6 +5019,14 @@ msgstr "%s%s%s%s zaprosił %s%s%s na %s%s%s" msgid "%sChannel reop %s%s%s: %s%s" msgstr "%sReop kanału %s%s%s: %s%s" +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)%s on %s" +msgstr "%s%s[%s%s%s] %s%s%s zbanowany przez %s%s %s(%s%s%s)%s na %s" + +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)" +msgstr "%s%s[%s%s%s] %s%s%s zbanowany przez %s%s %s(%s%s%s)" + #, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" msgstr "%s%s[%s%s%s]%s wyjątek %s%s%s ustawiony przez %s%s %s(%s%s%s)%s na %s" diff --git a/po/ru.po b/po/ru.po index e8b092258..24a25cbc6 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-05-26 13:16+0200\n" +"POT-Creation-Date: 2010-06-01 15:22+0200\n" "PO-Revision-Date: 2010-05-20 12:22+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -4790,6 +4790,14 @@ msgstr "%s%s%s пригласил %s%s%s на канал %s%s\n" msgid "%sChannel reop %s%s%s: %s%s" msgstr "Реоп канала %s%s%s: %s%s\n" +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)%s on %s" +msgstr "%s[%s%s%s] %s%s%s забанен пользователем " + +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)" +msgstr "%s[%s%s%s] %s%s%s забанен пользователем " + #, fuzzy, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" msgstr "%s[%s%s%s] %s%s%s забанен\n" diff --git a/po/weechat.pot b/po/weechat.pot index 42b3002f5..925fcc858 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-05-26 13:16+0200\n" +"POT-Creation-Date: 2010-06-01 15:22+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4124,6 +4124,14 @@ msgstr "" msgid "%sChannel reop %s%s%s: %s%s" msgstr "" +#, c-format +msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)%s on %s" +msgstr "" + +#, c-format +msgid "%s%s[%s%s%s] %s%s%s invited by %s%s %s(%s%s%s)" +msgstr "" + #, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" msgstr "" diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index 231d89515..45d0893f2 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -3015,6 +3015,113 @@ IRC_PROTOCOL_CALLBACK(345) return WEECHAT_RC_OK; } +/* + * irc_protocol_cb_346: '346' command received (channel invite list) + */ + +IRC_PROTOCOL_CALLBACK(346) +{ + struct t_irc_channel *ptr_channel; + struct t_gui_buffer *ptr_buffer; + time_t datetime; + + /* + * 346 message looks like: + * :server 346 mynick #channel invitemask nick!user@host 1205590879 + */ + + IRC_PROTOCOL_MIN_ARGS(5); + + ptr_channel = irc_channel_search (server, argv[3]); + ptr_buffer = (ptr_channel && ptr_channel->nicks) ? + ptr_channel->buffer : server->buffer; + if (argc >= 7) + { + datetime = (time_t)(atol (argv[6])); + weechat_printf_tags (ptr_buffer, + irc_protocol_tags (command, "irc_numeric"), + _("%s%s[%s%s%s] %s%s%s invited by " + "%s%s %s(%s%s%s)%s on %s"), + weechat_prefix ("network"), + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_CHAT_CHANNEL, + argv[3], + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_CHAT_HOST, + argv[4], + IRC_COLOR_CHAT, + IRC_COLOR_CHAT_NICK, + irc_protocol_get_nick_from_host (argv[5]), + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_CHAT_HOST, + irc_protocol_get_address_from_host (argv[5]), + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_CHAT, + weechat_util_get_time_string (&datetime)); + } + else + { + weechat_printf_tags (ptr_buffer, + irc_protocol_tags (command, "irc_numeric"), + _("%s%s[%s%s%s] %s%s%s invited by " + "%s%s %s(%s%s%s)"), + weechat_prefix ("network"), + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_CHAT_CHANNEL, + argv[3], + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_CHAT_HOST, + argv[4], + IRC_COLOR_CHAT, + IRC_COLOR_CHAT_NICK, + irc_protocol_get_nick_from_host (argv[5]), + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_CHAT_HOST, + irc_protocol_get_address_from_host (argv[5]), + IRC_COLOR_CHAT_DELIMITERS); + } + + return WEECHAT_RC_OK; +} + +/* + * irc_protocol_cb_347: '347' command received (end of channel invite list) + */ + +IRC_PROTOCOL_CALLBACK(347) +{ + char *pos_args; + struct t_irc_channel *ptr_channel; + struct t_gui_buffer *ptr_buffer; + + /* + * 347 message looks like: + * :server 347 mynick #channel :End of Channel Invite List + */ + + IRC_PROTOCOL_MIN_ARGS(4); + + pos_args = (argc > 4) ? + ((argv_eol[4][0] == ':') ? argv_eol[4] + 1 : argv_eol[4]) : NULL; + + ptr_channel = irc_channel_search (server, argv[3]); + ptr_buffer = (ptr_channel && ptr_channel->nicks) ? + ptr_channel->buffer : server->buffer; + weechat_printf_tags (ptr_buffer, + irc_protocol_tags (command, "irc_numeric"), + "%s%s[%s%s%s]%s%s%s", + weechat_prefix ("network"), + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_CHAT_CHANNEL, + argv[3], + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_CHAT, + (pos_args) ? " " : "", + (pos_args) ? pos_args : ""); + + return WEECHAT_RC_OK; +} + /* * irc_protocol_cb_348: '348' command received (channel exception list) */ @@ -4008,6 +4115,8 @@ irc_protocol_recv_command (struct t_irc_server *server, { "343", /* is opered as */ 1, &irc_protocol_cb_330_343 }, { "344", /* channel reop */ 1, &irc_protocol_cb_344 }, { "345", /* end of channel reop list */ 1, &irc_protocol_cb_345 }, + { "346", /* invite list */ 1, &irc_protocol_cb_346 }, + { "347", /* end of invite list */ 1, &irc_protocol_cb_347 }, { "348", /* channel exception list */ 1, &irc_protocol_cb_348 }, { "349", /* end of channel exception list */ 1, &irc_protocol_cb_349 }, { "351", /* server version */ 1, &irc_protocol_cb_351 },