diff --git a/ChangeLog b/ChangeLog index 6f9fca530..bcfbc8e17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ Version 0.3.9 (under dev!) * fifo: ignore read failing with error EAGAIN (bug #37019) * guile: fix crash when unloading a script without pointer to interpreter * guile: fix path of guile include dirs in cmake build (patch #7790) +* irc: fix parsing of message 346 when no nick/time are given (bug #37266) * irc: switch to next address after a timeout when connecting to server (bug #37216) * irc: fix bug when changing server option "addresses" with less addresses diff --git a/po/cs.po b/po/cs.po index fd1bac821..c7392ce75 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-09-04 12:56+0200\n" +"POT-Creation-Date: 2012-09-04 13:19+0200\n" "PO-Revision-Date: 2012-08-20 15:20+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -6493,6 +6493,10 @@ msgstr "%s%s[%s%s%s] %s%s%s pozván uživatelem %s%s %s(%s%s%s)%s v %s" 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 pozván uživatelem %s%s %s(%s%s%s)" +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited" +msgstr "%s%s[%s%s%s] %s%s%s pozván uživatelem %s%s %s(%s%s%s)" + #. TRANSLATORS: "%s" after "on" is a date #, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" diff --git a/po/de.po b/po/de.po index 72effb444..9d6e4acb7 100644 --- a/po/de.po +++ b/po/de.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-09-04 12:56+0200\n" +"POT-Creation-Date: 2012-09-04 13:19+0200\n" "PO-Revision-Date: 2012-08-20 15:20+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -7022,6 +7022,10 @@ msgstr "%s%s[%s%s%s] %s%s%s wurde von %s%s %s(%s%s%s)%s eingeladen am %s" 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 von %s%s %s(%s%s%s) eingeladen" +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited" +msgstr "%s%s[%s%s%s] %s%s%s wurde von %s%s %s(%s%s%s) eingeladen" + #. TRANSLATORS: "%s" after "on" is a date #, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" diff --git a/po/es.po b/po/es.po index 9cd963a3d..6e89eba73 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-09-04 12:56+0200\n" +"POT-Creation-Date: 2012-09-04 13:19+0200\n" "PO-Revision-Date: 2012-08-20 15:20+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -6755,6 +6755,10 @@ msgstr "%s%s[%s%s%s] %s%s%s invitado por %s%s %s(%s%s%s)%s el %s" 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 invitado por %s%s %s(%s%s%s)" +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited" +msgstr "%s%s[%s%s%s] %s%s%s invitado por %s%s %s(%s%s%s)" + #. TRANSLATORS: "%s" after "on" is a date #, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" diff --git a/po/fr.po b/po/fr.po index 3b78b6ee9..9a6351774 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-09-04 12:56+0200\n" -"PO-Revision-Date: 2012-09-04 12:24+0200\n" +"POT-Creation-Date: 2012-09-04 13:19+0200\n" +"PO-Revision-Date: 2012-09-04 13:15+0200\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: French\n" @@ -6827,6 +6827,10 @@ msgstr "%s%s[%s%s%s] %s%s%s invité par %s%s %s(%s%s%s)%s le %s" 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%s%s invited" +msgstr "%s%s[%s%s%s] %s%s%s invité" + #. TRANSLATORS: "%s" after "on" is a date #, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" diff --git a/po/hu.po b/po/hu.po index 1a62cb0ed..123354fc1 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-09-04 12:56+0200\n" +"POT-Creation-Date: 2012-09-04 13:19+0200\n" "PO-Revision-Date: 2012-08-20 15:20+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -6056,6 +6056,10 @@ msgstr "%s[%s%s%s] %s%s%s-t kitiltotta " 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%s%s invited" +msgstr "%s[%s%s%s] %s%s%s-t kitiltotta " + #. TRANSLATORS: "%s" after "on" is a date #, fuzzy, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" diff --git a/po/it.po b/po/it.po index 441ee25e6..9c979d034 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-09-04 12:56+0200\n" +"POT-Creation-Date: 2012-09-04 13:19+0200\n" "PO-Revision-Date: 2012-08-20 15:20+0200\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" @@ -6749,6 +6749,10 @@ msgstr "%s%s[%s%s%s] %s%s%s invitato da %s%s %s(%s%s%s)%s il %s" 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 invitato da %s%s %s(%s%s%s)" +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited" +msgstr "%s%s[%s%s%s] %s%s%s invitato da %s%s %s(%s%s%s)" + #. TRANSLATORS: "%s" after "on" is a date #, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" diff --git a/po/ja.po b/po/ja.po index f5ce5902a..6bd7c4f59 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-09-04 12:56+0200\n" +"POT-Creation-Date: 2012-09-04 13:19+0200\n" "PO-Revision-Date: 2012-08-20 15:20+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" @@ -6585,6 +6585,10 @@ msgstr "%s%s[%s%s%s] %s%s%s は %s%s %s(%s%s%s)%s によって %s に招待さ 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 は %s%s %s(%s%s%s) によって招待されました" +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited" +msgstr "%s%s[%s%s%s] %s%s%s は %s%s %s(%s%s%s) によって招待されました" + #. TRANSLATORS: "%s" after "on" is a date #, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" diff --git a/po/pl.po b/po/pl.po index 98ad84b46..eb0972fe2 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-09-04 12:56+0200\n" +"POT-Creation-Date: 2012-09-04 13:19+0200\n" "PO-Revision-Date: 2012-08-20 15:20+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -6712,6 +6712,10 @@ msgstr "%s%s[%s%s%s] %s%s%s zaproszony przez %s%s %s(%s%s%s)%s na %s" 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 zaproszony przez przez %s%s %s(%s%s%s)" +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited" +msgstr "%s%s[%s%s%s] %s%s%s zaproszony przez przez %s%s %s(%s%s%s)" + #. TRANSLATORS: "%s" after "on" is a date #, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" diff --git a/po/pt_BR.po b/po/pt_BR.po index 97e221d0b..145ab258c 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-09-04 12:56+0200\n" +"POT-Creation-Date: 2012-09-04 13:19+0200\n" "PO-Revision-Date: 2012-08-20 15:20+0200\n" "Last-Translator: Sergio Durigan Junior \n" "Language-Team: weechat-dev \n" @@ -6202,6 +6202,10 @@ msgstr "%s%s[%s%s%s] %s%s%s convidado por %s%s %s(%s%s%s)%s em %s" 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 convidado por %s%s %s(%s%s%s)" +#, fuzzy, c-format +msgid "%s%s[%s%s%s] %s%s%s invited" +msgstr "%s%s[%s%s%s] %s%s%s convidado por %s%s %s(%s%s%s)" + #. TRANSLATORS: "%s" after "on" is a date #, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" diff --git a/po/ru.po b/po/ru.po index a09946702..8efddce8f 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-09-04 12:56+0200\n" +"POT-Creation-Date: 2012-09-04 13:19+0200\n" "PO-Revision-Date: 2012-08-20 15:20+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -6081,6 +6081,10 @@ msgstr "%s[%s%s%s] %s%s%s забанен пользователем " 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%s%s invited" +msgstr "%s[%s%s%s] %s%s%s забанен пользователем " + #. TRANSLATORS: "%s" after "on" is a date #, fuzzy, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" diff --git a/po/weechat.pot b/po/weechat.pot index f84009f8f..1a96e6502 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: 2012-09-04 12:56+0200\n" +"POT-Creation-Date: 2012-09-04 13:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -5271,6 +5271,10 @@ msgstr "" 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%s%s invited" +msgstr "" + #. TRANSLATORS: "%s" after "on" is a date #, c-format msgid "%s%s[%s%s%s]%s exception %s%s%s by %s%s %s(%s%s%s)%s on %s" diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index 730d5b86c..2cf5bbbbb 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -3340,42 +3340,71 @@ IRC_PROTOCOL_CALLBACK(346) /* * 346 message looks like: * :server 346 mynick #channel invitemask nick!user@host 1205590879 + * or: + * :server 346 mynick #channel invitemask */ - IRC_PROTOCOL_MIN_ARGS(6); + 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; - invite_nick = irc_message_get_nick_from_host (argv[5]); - invite_address = irc_message_get_address_from_host (argv[5]); - if (argc >= 7) + if (argc >= 6) { - datetime = (time_t)(atol (argv[6])); - weechat_printf_tags (irc_msgbuffer_get_target_buffer (server, NULL, - command, "invitelist", - ptr_buffer), - irc_protocol_tags (command, "irc_numeric", NULL), - /* TRANSLATORS: "%s" after "on" is a date */ - _("%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_RESET, - irc_nick_color_for_server_message (server, NULL, - invite_nick), - invite_nick, - IRC_COLOR_CHAT_DELIMITERS, - IRC_COLOR_CHAT_HOST, - invite_address, - IRC_COLOR_CHAT_DELIMITERS, - IRC_COLOR_RESET, - weechat_util_get_time_string (&datetime)); + invite_nick = irc_message_get_nick_from_host (argv[5]); + invite_address = irc_message_get_address_from_host (argv[5]); + if (argc >= 7) + { + datetime = (time_t)(atol (argv[6])); + weechat_printf_tags (irc_msgbuffer_get_target_buffer (server, NULL, + command, "invitelist", + ptr_buffer), + irc_protocol_tags (command, "irc_numeric", NULL), + /* TRANSLATORS: "%s" after "on" is a date */ + _("%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_RESET, + irc_nick_color_for_server_message (server, NULL, + invite_nick), + invite_nick, + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_CHAT_HOST, + invite_address, + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_RESET, + weechat_util_get_time_string (&datetime)); + } + else + { + weechat_printf_tags (irc_msgbuffer_get_target_buffer (server, NULL, + command, "invitelist", + ptr_buffer), + irc_protocol_tags (command, "irc_numeric", NULL), + _("%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_RESET, + irc_nick_color_for_server_message (server, NULL, + invite_nick), + invite_nick, + IRC_COLOR_CHAT_DELIMITERS, + IRC_COLOR_CHAT_HOST, + invite_address, + IRC_COLOR_CHAT_DELIMITERS); + } } else { @@ -3383,8 +3412,7 @@ IRC_PROTOCOL_CALLBACK(346) command, "invitelist", ptr_buffer), irc_protocol_tags (command, "irc_numeric", NULL), - _("%s%s[%s%s%s] %s%s%s invited by " - "%s%s %s(%s%s%s)"), + _("%s%s[%s%s%s] %s%s%s invited"), weechat_prefix ("network"), IRC_COLOR_CHAT_DELIMITERS, IRC_COLOR_CHAT_CHANNEL, @@ -3392,14 +3420,7 @@ IRC_PROTOCOL_CALLBACK(346) IRC_COLOR_CHAT_DELIMITERS, IRC_COLOR_CHAT_HOST, argv[4], - IRC_COLOR_RESET, - irc_nick_color_for_server_message (server, NULL, - invite_nick), - invite_nick, - IRC_COLOR_CHAT_DELIMITERS, - IRC_COLOR_CHAT_HOST, - invite_address, - IRC_COLOR_CHAT_DELIMITERS); + IRC_COLOR_RESET); } return WEECHAT_RC_OK;