1
0
mirror of https://github.com/weechat/weechat.git synced 2026-07-08 10:43:13 +02:00

Added pv count in /server output

This commit is contained in:
Sebastien Helleu
2007-07-18 16:50:56 +00:00
parent 271bd21802
commit 2da039222d
20 changed files with 166 additions and 46 deletions
+8 -3
View File
@@ -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 <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\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 ""
+8 -3
View File
@@ -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 <i18n@internet-villa.de>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\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 ""
+8 -3
View File
@@ -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 González Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\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] "máscara de canal incorrecta"
msgstr[1] "máscara 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 ""
+9 -4
View File
@@ -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 <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\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)"
+8 -3
View File
@@ -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 <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\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 ""
+8 -3
View File
@@ -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 <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\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 ""
+8 -3
View File
@@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 ""
+4 -1
View File
@@ -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),
+21
View File
@@ -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)
*/
+1
View File
@@ -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);
+8 -3
View File
@@ -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 <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\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 ""
+8 -3
View File
@@ -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 <i18n@internet-villa.de>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\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 ""
+8 -3
View File
@@ -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 González Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\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] "máscara de canal incorrecta"
msgstr[1] "máscara 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 ""
+9 -4
View File
@@ -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 <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\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)"
+8 -3
View File
@@ -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 <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\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 ""
+8 -3
View File
@@ -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 <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\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 ""
+8 -3
View File
@@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 ""
+4 -1
View File
@@ -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),
+21
View File
@@ -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)
*/
+1
View File
@@ -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);