diff --git a/ChangeLog b/ChangeLog index 6cac176f9..b00e3232f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ WeeChat ChangeLog ================= FlashCode -v0.3.3-dev, 2010-06-08 +v0.3.3-dev, 2010-06-10 Version 0.3.3 (under dev!) @@ -30,7 +30,7 @@ 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 missing commands 346, 347 (channel invite list) -* irc: fix display of message 330 on some servers +* irc: fix display of messages 330 and 333 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 40b3f0e39..e19c9f91c 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-06-08 14:51+0200\n" +"POT-Creation-Date: 2010-06-10 11:36+0200\n" "PO-Revision-Date: 2010-06-08 14:17+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -4971,10 +4971,18 @@ msgstr "%sTéma pro %s%s%s v \"%s%s\"" msgid "%sTopic set by %s%s%s%s%s%s%s%s%s on %s" msgstr "%sTéma nastevil %s%s%s%s%s%s%s%s%s v %s" +#, fuzzy, c-format +msgid "%sTopic set on %s" +msgstr "%sNení nastaveno téma pro kanál %s%s" + #, c-format msgid "%sTopic for %s%s%s set by %s%s%s%s%s%s%s%s%s on %s" msgstr "%sTéma pro %s%s%s nastevil %s%s%s%s%s%s%s%s%s v %s" +#, fuzzy, c-format +msgid "%sTopic for %s%s%s set on %s" +msgstr "%sTéma pro %s%s%s v \"%s%s\"" + #, c-format msgid "%s%s%s%s has invited %s%s%s to %s%s%s" msgstr "%s%s%s%s pozval %s%s%s na %s%s%s" diff --git a/po/de.po b/po/de.po index 16874f58b..c08e747f0 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-06-08 14:51+0200\n" +"POT-Creation-Date: 2010-06-10 11:36+0200\n" "PO-Revision-Date: 2010-06-10 09:46+0200\n" "Last-Translator: Nils G.\n" "Language-Team: weechat-dev \n" @@ -5169,10 +5169,18 @@ msgstr "%sDas Topic von %s%s%s lautet: \"%s%s\"" msgid "%sTopic set by %s%s%s%s%s%s%s%s%s on %s" msgstr "%sTopic festgelegt von %s%s%s%s%s%s%s%s%s am %s" +#, fuzzy, c-format +msgid "%sTopic set on %s" +msgstr "%sKein Topic für %s%s gesetzt" + #, c-format msgid "%sTopic for %s%s%s set by %s%s%s%s%s%s%s%s%s on %s" msgstr "%sTopic für %s%s%s festgelegt von %s%s%s%s%s%s%s%s%s am %s" +#, fuzzy, c-format +msgid "%sTopic for %s%s%s set on %s" +msgstr "%sDas Topic von %s%s%s lautet: \"%s%s\"" + #, c-format msgid "%s%s%s%s has invited %s%s%s to %s%s%s" msgstr "%s%s%s%s hat %s%s%s in den Channel %s%s%s eingeladen" diff --git a/po/es.po b/po/es.po index 39c77ef98..9559d4383 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-06-08 14:51+0200\n" +"POT-Creation-Date: 2010-06-10 11:36+0200\n" "PO-Revision-Date: 2010-06-08 14:19+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -5040,10 +5040,18 @@ msgstr "%sEl tema para %s%s%s es \"%s%s\"" msgid "%sTopic set by %s%s%s%s%s%s%s%s%s on %s" msgstr "%sTema establecido por %s%s%s%s%s%s%s%s%s el %s" +#, fuzzy, c-format +msgid "%sTopic set on %s" +msgstr "%sNo hay tema establecido para el canal %s%s" + #, c-format msgid "%sTopic for %s%s%s set by %s%s%s%s%s%s%s%s%s on %s" msgstr "%sTema para %s%s%s establecido por %s%s%s%s%s%s%s%s%s el %s" +#, fuzzy, c-format +msgid "%sTopic for %s%s%s set on %s" +msgstr "%sEl tema para %s%s%s es \"%s%s\"" + #, c-format msgid "%s%s%s%s has invited %s%s%s to %s%s%s" msgstr "%s%s%s%s ha invitado a %s%s%s a %s%s%s" diff --git a/po/fr.po b/po/fr.po index 5ae8a4bc4..fbce07437 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-06-08 14:51+0200\n" -"PO-Revision-Date: 2010-06-08 14:51+0200\n" +"POT-Creation-Date: 2010-06-10 11:36+0200\n" +"PO-Revision-Date: 2010-06-10 11:34+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "Language: French\n" @@ -5082,10 +5082,18 @@ msgstr "%sLe titre pour %s%s%s est \"%s%s\"" msgid "%sTopic set by %s%s%s%s%s%s%s%s%s on %s" msgstr "%sTitre défini par %s%s%s%s%s%s%s%s%s le %s" +#, c-format +msgid "%sTopic set on %s" +msgstr "%sTitre défini le %s" + #, c-format msgid "%sTopic for %s%s%s set by %s%s%s%s%s%s%s%s%s on %s" msgstr "%sTitre pour %s%s%s défini par %s%s%s%s%s%s%s%s%s le %s" +#, c-format +msgid "%sTopic for %s%s%s set on %s" +msgstr "%sTitre pour %s%s%s défini le %s" + #, c-format msgid "%s%s%s%s has invited %s%s%s to %s%s%s" msgstr "%s%s%s%s a invité %s%s%s sur %s%s%s" diff --git a/po/hu.po b/po/hu.po index f8a5a4958..4fafa481d 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-06-08 14:51+0200\n" +"POT-Creation-Date: 2010-06-10 11:36+0200\n" "PO-Revision-Date: 2010-05-20 12:20+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -4783,10 +4783,18 @@ msgstr "A %s%s%s szoba témája: " msgid "%sTopic set by %s%s%s%s%s%s%s%s%s on %s" msgstr "A témát beállította: %s%s%s, %s" +#, fuzzy, c-format +msgid "%sTopic set on %s" +msgstr "Nincs téma beállítva a %s%s szobában\n" + #, fuzzy, c-format msgid "%sTopic for %s%s%s set by %s%s%s%s%s%s%s%s%s on %s" msgstr "A témát beállította: %s%s%s, %s" +#, fuzzy, c-format +msgid "%sTopic for %s%s%s set on %s" +msgstr "A %s%s%s szoba témája: " + #, fuzzy, c-format msgid "%s%s%s%s has invited %s%s%s to %s%s%s" msgstr "%s%s%s meghívta %s%s%s-t %s%s-kor\n" diff --git a/po/it.po b/po/it.po index e5533c71b..d3fd74507 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-06-08 14:51+0200\n" +"POT-Creation-Date: 2010-06-10 11:36+0200\n" "PO-Revision-Date: 2010-06-08 14:15+0200\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" @@ -5053,10 +5053,18 @@ msgstr "%sL'argomento per %s%s%s è \"%s%s\"" msgid "%sTopic set by %s%s%s%s%s%s%s%s%s on %s" msgstr "%sArgomento impostato da %s%s%s%s%s%s%s%s%s il %s" +#, fuzzy, c-format +msgid "%sTopic set on %s" +msgstr "%sNessun argomento impostato per il canale %s%s" + #, c-format msgid "%sTopic for %s%s%s set by %s%s%s%s%s%s%s%s%s on %s" msgstr "%sArgomento per %s%s%s impostato da %s%s%s%s%s%s%s%s%s il %s" +#, fuzzy, c-format +msgid "%sTopic for %s%s%s set on %s" +msgstr "%sL'argomento per %s%s%s è \"%s%s\"" + #, c-format msgid "%s%s%s%s has invited %s%s%s to %s%s%s" msgstr "%s%s%s%s ha invitato %s%s%s in %s%s%s" diff --git a/po/pl.po b/po/pl.po index b2a53ac6c..2da42038b 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-06-08 14:51+0200\n" +"POT-Creation-Date: 2010-06-10 11:36+0200\n" "PO-Revision-Date: 2010-06-08 14:20+0200\n" "Last-Translator: Krzysztof Koroscik \n" "Language-Team: weechat-dev \n" @@ -5020,10 +5020,18 @@ msgstr "%sTemat kanału %s%s%s to \"%s%s\"" msgid "%sTopic set by %s%s%s%s%s%s%s%s%s on %s" msgstr "%sTemat ustawiony przez %s%s%s%s%s%s%s%s%s dnia %s" +#, fuzzy, c-format +msgid "%sTopic set on %s" +msgstr "%sBrak tematu dla kanału %s%s" + #, c-format msgid "%sTopic for %s%s%s set by %s%s%s%s%s%s%s%s%s on %s" msgstr "%sTemat kanału %s%s%s ustawiony przez %s%s%s%s%s%s%s%s%s dnia %s" +#, fuzzy, c-format +msgid "%sTopic for %s%s%s set on %s" +msgstr "%sTemat kanału %s%s%s to \"%s%s\"" + #, c-format msgid "%s%s%s%s has invited %s%s%s to %s%s%s" msgstr "%s%s%s%s zaprosił %s%s%s na %s%s%s" diff --git a/po/ru.po b/po/ru.po index 55c26af28..35102938b 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-06-08 14:51+0200\n" +"POT-Creation-Date: 2010-06-10 11:36+0200\n" "PO-Revision-Date: 2010-05-20 12:22+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -4786,10 +4786,18 @@ msgstr "Тема канала %s%s%s: " msgid "%sTopic set by %s%s%s%s%s%s%s%s%s on %s" msgstr "Тема установлена пользователем %s%s%s, %s" +#, fuzzy, c-format +msgid "%sTopic set on %s" +msgstr "Не установлена тема канала для %s%s\n" + #, fuzzy, c-format msgid "%sTopic for %s%s%s set by %s%s%s%s%s%s%s%s%s on %s" msgstr "Тема установлена пользователем %s%s%s, %s" +#, fuzzy, c-format +msgid "%sTopic for %s%s%s set on %s" +msgstr "Тема канала %s%s%s: " + #, fuzzy, c-format msgid "%s%s%s%s has invited %s%s%s to %s%s%s" msgstr "%s%s%s пригласил %s%s%s на канал %s%s\n" diff --git a/po/weechat.pot b/po/weechat.pot index 0deef9336..b8478927f 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-06-08 14:51+0200\n" +"POT-Creation-Date: 2010-06-10 11:36+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -4121,10 +4121,18 @@ msgstr "" msgid "%sTopic set by %s%s%s%s%s%s%s%s%s on %s" msgstr "" +#, c-format +msgid "%sTopic set on %s" +msgstr "" + #, c-format msgid "%sTopic for %s%s%s set by %s%s%s%s%s%s%s%s%s on %s" msgstr "" +#, c-format +msgid "%sTopic for %s%s%s set on %s" +msgstr "" + #, c-format msgid "%s%s%s%s has invited %s%s%s to %s%s%s" msgstr "" diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index 79e10d8de..960c1a238 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -2855,59 +2855,92 @@ IRC_PROTOCOL_CALLBACK(333) struct t_irc_nick *ptr_nick; time_t datetime; const char *topic_nick, *topic_address; + int arg_date; /* * 333 message looks like: * :server 333 mynick #channel nick!user@host 1205428096 + * or: + * :server 333 mynick #channel 1205428096 */ - IRC_PROTOCOL_MIN_ARGS(6); + IRC_PROTOCOL_MIN_ARGS(5); - topic_nick = irc_protocol_get_nick_from_host (argv[4]); - topic_address = irc_protocol_get_address_from_host (argv[4]); + topic_nick = (argc > 5) ? irc_protocol_get_nick_from_host (argv[4]) : NULL; + topic_address = (argc > 5) ? irc_protocol_get_address_from_host (argv[4]) : NULL; if (topic_nick && topic_address && strcmp (topic_nick, topic_address) == 0) topic_address = NULL; ptr_channel = irc_channel_search (server, argv[3]); ptr_nick = (ptr_channel) ? irc_nick_search (ptr_channel, topic_nick) : NULL; - datetime = (time_t)(atol ((argv_eol[5][0] == ':') ? - argv_eol[5] + 1 : argv_eol[5])); + arg_date = (argc > 5) ? 5 : 4; + datetime = (time_t)(atol ((argv_eol[arg_date][0] == ':') ? + argv_eol[arg_date] + 1 : argv_eol[arg_date])); + + if (!topic_nick && (datetime == 0)) + return WEECHAT_RC_OK; + if (ptr_channel && ptr_channel->nicks) { - weechat_printf_tags (ptr_channel->buffer, - irc_protocol_tags (command, "irc_numeric"), - _("%sTopic set by %s%s%s%s%s%s%s%s%s on %s"), - weechat_prefix ("network"), - IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick), - topic_nick, - IRC_COLOR_CHAT_DELIMITERS, - (topic_address && topic_address[0]) ? " (" : "", - IRC_COLOR_CHAT_HOST, - (topic_address) ? topic_address : "", - IRC_COLOR_CHAT_DELIMITERS, - (topic_address && topic_address[0]) ? ")" : "", - IRC_COLOR_CHAT, - weechat_util_get_time_string (&datetime)); + if (topic_nick) + { + weechat_printf_tags (ptr_channel->buffer, + irc_protocol_tags (command, "irc_numeric"), + _("%sTopic set by %s%s%s%s%s%s%s%s%s on %s"), + weechat_prefix ("network"), + IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick), + topic_nick, + IRC_COLOR_CHAT_DELIMITERS, + (topic_address && topic_address[0]) ? " (" : "", + IRC_COLOR_CHAT_HOST, + (topic_address) ? topic_address : "", + IRC_COLOR_CHAT_DELIMITERS, + (topic_address && topic_address[0]) ? ")" : "", + IRC_COLOR_CHAT, + weechat_util_get_time_string (&datetime)); + } + else + { + weechat_printf_tags (ptr_channel->buffer, + irc_protocol_tags (command, "irc_numeric"), + _("%sTopic set on %s"), + weechat_prefix ("network"), + weechat_util_get_time_string (&datetime)); + } } else { - weechat_printf_tags (server->buffer, - irc_protocol_tags (command, "irc_numeric"), - _("%sTopic for %s%s%s set by %s%s%s%s%s%s%s%s%s on %s"), - weechat_prefix ("network"), - IRC_COLOR_CHAT_CHANNEL, - argv[3], - IRC_COLOR_CHAT, - IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick), - topic_nick, - IRC_COLOR_CHAT_DELIMITERS, - (topic_address && topic_address[0]) ? " (" : "", - IRC_COLOR_CHAT_HOST, - (topic_address) ? topic_address : "", - IRC_COLOR_CHAT_DELIMITERS, - (topic_address && topic_address[0]) ? ")" : "", - IRC_COLOR_CHAT, - weechat_util_get_time_string (&datetime)); + if (topic_nick) + { + weechat_printf_tags (server->buffer, + irc_protocol_tags (command, "irc_numeric"), + _("%sTopic for %s%s%s set by %s%s%s%s%s%s%s%s%s on %s"), + weechat_prefix ("network"), + IRC_COLOR_CHAT_CHANNEL, + argv[3], + IRC_COLOR_CHAT, + IRC_COLOR_NICK_IN_SERVER_MESSAGE(ptr_nick), + topic_nick, + IRC_COLOR_CHAT_DELIMITERS, + (topic_address && topic_address[0]) ? " (" : "", + IRC_COLOR_CHAT_HOST, + (topic_address) ? topic_address : "", + IRC_COLOR_CHAT_DELIMITERS, + (topic_address && topic_address[0]) ? ")" : "", + IRC_COLOR_CHAT, + weechat_util_get_time_string (&datetime)); + } + else + { + weechat_printf_tags (server->buffer, + irc_protocol_tags (command, "irc_numeric"), + _("%sTopic for %s%s%s set on %s"), + weechat_prefix ("network"), + IRC_COLOR_CHAT_CHANNEL, + argv[3], + IRC_COLOR_CHAT, + weechat_util_get_time_string (&datetime)); + } } return WEECHAT_RC_OK;