From 2da039222d2cfbab2141755e9a578137846d0ef9 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Wed, 18 Jul 2007 16:50:56 +0000 Subject: [PATCH] Added pv count in /server output --- po/cs.po | 11 ++++++++--- po/de.po | 11 ++++++++--- po/es.po | 11 ++++++++--- po/fr.po | 13 +++++++++---- po/hu.po | 11 ++++++++--- po/ru.po | 11 ++++++++--- po/weechat.pot | 11 ++++++++--- src/irc/irc-display.c | 5 ++++- src/irc/irc-server.c | 21 +++++++++++++++++++++ src/irc/irc.h | 1 + weechat/po/cs.po | 11 ++++++++--- weechat/po/de.po | 11 ++++++++--- weechat/po/es.po | 11 ++++++++--- weechat/po/fr.po | 13 +++++++++---- weechat/po/hu.po | 11 ++++++++--- weechat/po/ru.po | 11 ++++++++--- weechat/po/weechat.pot | 11 ++++++++--- weechat/src/irc/irc-display.c | 5 ++++- weechat/src/irc/irc-server.c | 21 +++++++++++++++++++++ weechat/src/irc/irc.h | 1 + 20 files changed, 166 insertions(+), 46 deletions(-) diff --git a/po/cs.po b/po/cs.po index 0c5dc9b0c..f9143436e 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-07-18 18:21+0200\n" +"POT-Creation-Date: 2007-07-18 18:49+0200\n" "PO-Revision-Date: 2007-07-18 17:44+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -1379,14 +1379,19 @@ msgstr "sekund" msgid "(hidden)" msgstr "(skrytý)" -#: src/irc/irc-display.c:472 +#: src/irc/irc-display.c:473 #, fuzzy, c-format msgid "%d channel" msgid_plural "%d channels" msgstr[0] "špatná maska kanálu" msgstr[1] "špatná maska kanálu" -#: src/irc/irc-display.c:478 +#: src/irc/irc-display.c:476 +#, c-format +msgid "%d pv" +msgstr "" + +#: src/irc/irc-display.c:481 msgid " (temporary)" msgstr "" diff --git a/po/de.po b/po/de.po index 52a53a7fa..3ac0abf42 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-07-18 18:21+0200\n" +"POT-Creation-Date: 2007-07-18 18:49+0200\n" "PO-Revision-Date: 2007-07-18 17:44+0200\n" "Last-Translator: Thomas Schuetz \n" "Language-Team: weechat-dev \n" @@ -1381,14 +1381,19 @@ msgstr "Sekunden" msgid "(hidden)" msgstr "(versteckt)" -#: src/irc/irc-display.c:472 +#: src/irc/irc-display.c:473 #, fuzzy, c-format msgid "%d channel" msgid_plural "%d channels" msgstr[0] "ungültige Channelmaske" msgstr[1] "ungültige Channelmaske" -#: src/irc/irc-display.c:478 +#: src/irc/irc-display.c:476 +#, c-format +msgid "%d pv" +msgstr "" + +#: src/irc/irc-display.c:481 msgid " (temporary)" msgstr "" diff --git a/po/es.po b/po/es.po index e614c7e91..1a8b98ec5 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-07-18 18:21+0200\n" +"POT-Creation-Date: 2007-07-18 18:49+0200\n" "PO-Revision-Date: 2007-07-18 17:44+0200\n" "Last-Translator: Roberto Gonzlez Cardenete \n" "Language-Team: weechat-dev \n" @@ -1399,14 +1399,19 @@ msgstr "segundos" msgid "(hidden)" msgstr "(oculto)" -#: src/irc/irc-display.c:472 +#: src/irc/irc-display.c:473 #, fuzzy, c-format msgid "%d channel" msgid_plural "%d channels" msgstr[0] "mscara de canal incorrecta" msgstr[1] "mscara de canal incorrecta" -#: src/irc/irc-display.c:478 +#: src/irc/irc-display.c:476 +#, c-format +msgid "%d pv" +msgstr "" + +#: src/irc/irc-display.c:481 msgid " (temporary)" msgstr "" diff --git a/po/fr.po b/po/fr.po index 5a22294a2..0e808b294 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-07-18 18:21+0200\n" -"PO-Revision-Date: 2007-07-18 18:22+0200\n" +"POT-Creation-Date: 2007-07-18 18:49+0200\n" +"PO-Revision-Date: 2007-07-18 18:49+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -1384,14 +1384,19 @@ msgstr "secondes" msgid "(hidden)" msgstr "(caché)" -#: src/irc/irc-display.c:472 +#: src/irc/irc-display.c:473 #, c-format msgid "%d channel" msgid_plural "%d channels" msgstr[0] "%d canal" msgstr[1] "%d canaux" -#: src/irc/irc-display.c:478 +#: src/irc/irc-display.c:476 +#, c-format +msgid "%d pv" +msgstr "%d pv" + +#: src/irc/irc-display.c:481 msgid " (temporary)" msgstr " (temporaire)" diff --git a/po/hu.po b/po/hu.po index 632b0bfd4..9a29829f4 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-07-18 18:21+0200\n" +"POT-Creation-Date: 2007-07-18 18:49+0200\n" "PO-Revision-Date: 2007-06-07 18:02+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -1392,14 +1392,19 @@ msgstr "másodperc" msgid "(hidden)" msgstr "(rejtett)" -#: src/irc/irc-display.c:472 +#: src/irc/irc-display.c:473 #, fuzzy, c-format msgid "%d channel" msgid_plural "%d channels" msgstr[0] "rossz szoba maszk" msgstr[1] "rossz szoba maszk" -#: src/irc/irc-display.c:478 +#: src/irc/irc-display.c:476 +#, c-format +msgid "%d pv" +msgstr "" + +#: src/irc/irc-display.c:481 msgid " (temporary)" msgstr "" diff --git a/po/ru.po b/po/ru.po index 2ba46fb0a..559180959 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-07-18 18:21+0200\n" +"POT-Creation-Date: 2007-07-18 18:49+0200\n" "PO-Revision-Date: 2007-07-18 17:44+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -1378,14 +1378,19 @@ msgstr "секунды" msgid "(hidden)" msgstr "(скрытый)" -#: src/irc/irc-display.c:472 +#: src/irc/irc-display.c:473 #, fuzzy, c-format msgid "%d channel" msgid_plural "%d channels" msgstr[0] "неправильная маска" msgstr[1] "неправильная маска" -#: src/irc/irc-display.c:478 +#: src/irc/irc-display.c:476 +#, c-format +msgid "%d pv" +msgstr "" + +#: src/irc/irc-display.c:481 msgid " (temporary)" msgstr "" diff --git a/po/weechat.pot b/po/weechat.pot index d4c65488e..0e4c229a8 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: 2007-07-18 18:21+0200\n" +"POT-Creation-Date: 2007-07-18 18:49+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1275,14 +1275,19 @@ msgstr "" msgid "(hidden)" msgstr "" -#: src/irc/irc-display.c:472 +#: src/irc/irc-display.c:473 #, c-format msgid "%d channel" msgid_plural "%d channels" msgstr[0] "" msgstr[1] "" -#: src/irc/irc-display.c:478 +#: src/irc/irc-display.c:476 +#, c-format +msgid "%d pv" +msgstr "" + +#: src/irc/irc-display.c:481 msgid " (temporary)" msgstr "" diff --git a/src/irc/irc-display.c b/src/irc/irc-display.c index 7d853820c..31d12d310 100644 --- a/src/irc/irc-display.c +++ b/src/irc/irc-display.c @@ -379,7 +379,7 @@ void irc_display_server (t_irc_server *server, int with_detail) { char *string; - int num_channels; + int num_channels, num_pv; if (with_detail) { @@ -468,9 +468,12 @@ irc_display_server (t_irc_server *server, int with_detail) if (server->is_connected) { num_channels = irc_server_get_channel_count (server); + num_pv = irc_server_get_pv_count (server); gui_printf (NULL, ", "); gui_printf (NULL, NG_("%d channel", "%d channels", num_channels), num_channels); + gui_printf (NULL, ", "); + gui_printf (NULL, _("%d pv"), num_pv); } gui_printf (NULL, "%s]%s%s\n", GUI_COLOR(COLOR_WIN_CHAT_DARK), diff --git a/src/irc/irc-server.c b/src/irc/irc-server.c index 272ceb26f..caaab7d74 100644 --- a/src/irc/irc-server.c +++ b/src/irc/irc-server.c @@ -2106,11 +2106,32 @@ irc_server_get_channel_count (t_irc_server *server) for (ptr_channel = server->channels; ptr_channel; ptr_channel = ptr_channel->next_channel) { + if (ptr_channel->type == CHANNEL_TYPE_CHANNEL) count++; } return count; } +/* + * irc_server_get_pv_count: return number of pv for server + */ + +int +irc_server_get_pv_count (t_irc_server *server) +{ + int count; + t_irc_channel *ptr_channel; + + count = 0; + for (ptr_channel = server->channels; ptr_channel; + ptr_channel = ptr_channel->next_channel) + { + if (ptr_channel->type != CHANNEL_TYPE_CHANNEL) + count++; + } + return count; +} + /* * irc_server_remove_away: remove away for all chans/nicks (for all servers) */ diff --git a/src/irc/irc.h b/src/irc/irc.h index 742d45ed9..3b1b00c31 100644 --- a/src/irc/irc.h +++ b/src/irc/irc.h @@ -399,6 +399,7 @@ extern int irc_server_get_number_connected (); extern void irc_server_get_number_buffer (t_irc_server *, int *, int *); extern int irc_server_name_already_exists (char *); extern int irc_server_get_channel_count (t_irc_server *); +extern int irc_server_get_pv_count (t_irc_server *); extern void irc_server_remove_away (); extern void irc_server_check_away (); extern void irc_server_set_away (t_irc_server *, char *, int); diff --git a/weechat/po/cs.po b/weechat/po/cs.po index 0c5dc9b0c..f9143436e 100644 --- a/weechat/po/cs.po +++ b/weechat/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-07-18 18:21+0200\n" +"POT-Creation-Date: 2007-07-18 18:49+0200\n" "PO-Revision-Date: 2007-07-18 17:44+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -1379,14 +1379,19 @@ msgstr "sekund" msgid "(hidden)" msgstr "(skrytý)" -#: src/irc/irc-display.c:472 +#: src/irc/irc-display.c:473 #, fuzzy, c-format msgid "%d channel" msgid_plural "%d channels" msgstr[0] "špatná maska kanálu" msgstr[1] "špatná maska kanálu" -#: src/irc/irc-display.c:478 +#: src/irc/irc-display.c:476 +#, c-format +msgid "%d pv" +msgstr "" + +#: src/irc/irc-display.c:481 msgid " (temporary)" msgstr "" diff --git a/weechat/po/de.po b/weechat/po/de.po index 52a53a7fa..3ac0abf42 100644 --- a/weechat/po/de.po +++ b/weechat/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-07-18 18:21+0200\n" +"POT-Creation-Date: 2007-07-18 18:49+0200\n" "PO-Revision-Date: 2007-07-18 17:44+0200\n" "Last-Translator: Thomas Schuetz \n" "Language-Team: weechat-dev \n" @@ -1381,14 +1381,19 @@ msgstr "Sekunden" msgid "(hidden)" msgstr "(versteckt)" -#: src/irc/irc-display.c:472 +#: src/irc/irc-display.c:473 #, fuzzy, c-format msgid "%d channel" msgid_plural "%d channels" msgstr[0] "ungültige Channelmaske" msgstr[1] "ungültige Channelmaske" -#: src/irc/irc-display.c:478 +#: src/irc/irc-display.c:476 +#, c-format +msgid "%d pv" +msgstr "" + +#: src/irc/irc-display.c:481 msgid " (temporary)" msgstr "" diff --git a/weechat/po/es.po b/weechat/po/es.po index e614c7e91..1a8b98ec5 100644 --- a/weechat/po/es.po +++ b/weechat/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-07-18 18:21+0200\n" +"POT-Creation-Date: 2007-07-18 18:49+0200\n" "PO-Revision-Date: 2007-07-18 17:44+0200\n" "Last-Translator: Roberto Gonzlez Cardenete \n" "Language-Team: weechat-dev \n" @@ -1399,14 +1399,19 @@ msgstr "segundos" msgid "(hidden)" msgstr "(oculto)" -#: src/irc/irc-display.c:472 +#: src/irc/irc-display.c:473 #, fuzzy, c-format msgid "%d channel" msgid_plural "%d channels" msgstr[0] "mscara de canal incorrecta" msgstr[1] "mscara de canal incorrecta" -#: src/irc/irc-display.c:478 +#: src/irc/irc-display.c:476 +#, c-format +msgid "%d pv" +msgstr "" + +#: src/irc/irc-display.c:481 msgid " (temporary)" msgstr "" diff --git a/weechat/po/fr.po b/weechat/po/fr.po index 5a22294a2..0e808b294 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-07-18 18:21+0200\n" -"PO-Revision-Date: 2007-07-18 18:22+0200\n" +"POT-Creation-Date: 2007-07-18 18:49+0200\n" +"PO-Revision-Date: 2007-07-18 18:49+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -1384,14 +1384,19 @@ msgstr "secondes" msgid "(hidden)" msgstr "(caché)" -#: src/irc/irc-display.c:472 +#: src/irc/irc-display.c:473 #, c-format msgid "%d channel" msgid_plural "%d channels" msgstr[0] "%d canal" msgstr[1] "%d canaux" -#: src/irc/irc-display.c:478 +#: src/irc/irc-display.c:476 +#, c-format +msgid "%d pv" +msgstr "%d pv" + +#: src/irc/irc-display.c:481 msgid " (temporary)" msgstr " (temporaire)" diff --git a/weechat/po/hu.po b/weechat/po/hu.po index 632b0bfd4..9a29829f4 100644 --- a/weechat/po/hu.po +++ b/weechat/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-07-18 18:21+0200\n" +"POT-Creation-Date: 2007-07-18 18:49+0200\n" "PO-Revision-Date: 2007-06-07 18:02+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -1392,14 +1392,19 @@ msgstr "másodperc" msgid "(hidden)" msgstr "(rejtett)" -#: src/irc/irc-display.c:472 +#: src/irc/irc-display.c:473 #, fuzzy, c-format msgid "%d channel" msgid_plural "%d channels" msgstr[0] "rossz szoba maszk" msgstr[1] "rossz szoba maszk" -#: src/irc/irc-display.c:478 +#: src/irc/irc-display.c:476 +#, c-format +msgid "%d pv" +msgstr "" + +#: src/irc/irc-display.c:481 msgid " (temporary)" msgstr "" diff --git a/weechat/po/ru.po b/weechat/po/ru.po index 2ba46fb0a..559180959 100644 --- a/weechat/po/ru.po +++ b/weechat/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.6-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-07-18 18:21+0200\n" +"POT-Creation-Date: 2007-07-18 18:49+0200\n" "PO-Revision-Date: 2007-07-18 17:44+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -1378,14 +1378,19 @@ msgstr "секунды" msgid "(hidden)" msgstr "(скрытый)" -#: src/irc/irc-display.c:472 +#: src/irc/irc-display.c:473 #, fuzzy, c-format msgid "%d channel" msgid_plural "%d channels" msgstr[0] "неправильная маска" msgstr[1] "неправильная маска" -#: src/irc/irc-display.c:478 +#: src/irc/irc-display.c:476 +#, c-format +msgid "%d pv" +msgstr "" + +#: src/irc/irc-display.c:481 msgid " (temporary)" msgstr "" diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index d4c65488e..0e4c229a8 100644 --- a/weechat/po/weechat.pot +++ b/weechat/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: 2007-07-18 18:21+0200\n" +"POT-Creation-Date: 2007-07-18 18:49+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1275,14 +1275,19 @@ msgstr "" msgid "(hidden)" msgstr "" -#: src/irc/irc-display.c:472 +#: src/irc/irc-display.c:473 #, c-format msgid "%d channel" msgid_plural "%d channels" msgstr[0] "" msgstr[1] "" -#: src/irc/irc-display.c:478 +#: src/irc/irc-display.c:476 +#, c-format +msgid "%d pv" +msgstr "" + +#: src/irc/irc-display.c:481 msgid " (temporary)" msgstr "" diff --git a/weechat/src/irc/irc-display.c b/weechat/src/irc/irc-display.c index 7d853820c..31d12d310 100644 --- a/weechat/src/irc/irc-display.c +++ b/weechat/src/irc/irc-display.c @@ -379,7 +379,7 @@ void irc_display_server (t_irc_server *server, int with_detail) { char *string; - int num_channels; + int num_channels, num_pv; if (with_detail) { @@ -468,9 +468,12 @@ irc_display_server (t_irc_server *server, int with_detail) if (server->is_connected) { num_channels = irc_server_get_channel_count (server); + num_pv = irc_server_get_pv_count (server); gui_printf (NULL, ", "); gui_printf (NULL, NG_("%d channel", "%d channels", num_channels), num_channels); + gui_printf (NULL, ", "); + gui_printf (NULL, _("%d pv"), num_pv); } gui_printf (NULL, "%s]%s%s\n", GUI_COLOR(COLOR_WIN_CHAT_DARK), diff --git a/weechat/src/irc/irc-server.c b/weechat/src/irc/irc-server.c index 272ceb26f..caaab7d74 100644 --- a/weechat/src/irc/irc-server.c +++ b/weechat/src/irc/irc-server.c @@ -2106,11 +2106,32 @@ irc_server_get_channel_count (t_irc_server *server) for (ptr_channel = server->channels; ptr_channel; ptr_channel = ptr_channel->next_channel) { + if (ptr_channel->type == CHANNEL_TYPE_CHANNEL) count++; } return count; } +/* + * irc_server_get_pv_count: return number of pv for server + */ + +int +irc_server_get_pv_count (t_irc_server *server) +{ + int count; + t_irc_channel *ptr_channel; + + count = 0; + for (ptr_channel = server->channels; ptr_channel; + ptr_channel = ptr_channel->next_channel) + { + if (ptr_channel->type != CHANNEL_TYPE_CHANNEL) + count++; + } + return count; +} + /* * irc_server_remove_away: remove away for all chans/nicks (for all servers) */ diff --git a/weechat/src/irc/irc.h b/weechat/src/irc/irc.h index 742d45ed9..3b1b00c31 100644 --- a/weechat/src/irc/irc.h +++ b/weechat/src/irc/irc.h @@ -399,6 +399,7 @@ extern int irc_server_get_number_connected (); extern void irc_server_get_number_buffer (t_irc_server *, int *, int *); extern int irc_server_name_already_exists (char *); extern int irc_server_get_channel_count (t_irc_server *); +extern int irc_server_get_pv_count (t_irc_server *); extern void irc_server_remove_away (); extern void irc_server_check_away (); extern void irc_server_set_away (t_irc_server *, char *, int);