blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

irc: display current nick on connected servers in output of /server list|listfull (closes #1193)

Browse Source
This commit is contained in:
Sébastien Helleu 2018-05-19 09:07:08 +02:00
parent 762e1e6b1e
commit 60254ff48d
15 changed files with 103 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.adoc
View File

@ -22,6 +22,7 @@ New features::
* core: allow merge of buffers by name in command /buffer (issue #1108, issue #1159)
* api: add function string_format_size in scripting API
* irc: display current nick on connected servers in output of /server list|listfull (issue #1193)
* irc: add option "-server" in command /list (issue #1165)
* irc: add indexed ban list, add completion for /unban and /unquiet (issue #597, task #11374, task #10876)
* xfer: add option xfer.network.send_ack (issue #1171)

10
po/cs.po
View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-04-16 21:24+0200\n"
"POT-Creation-Date: 2018-05-19 09:04+0200\n"
"PO-Revision-Date: 2018-03-31 15:36+0200\n"
"Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6420,8 +6420,12 @@ msgstr ""
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr "%s%s: nemohu vytvořít nový soukromý buffer\"%s\""
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
#, fuzzy
msgid "nick:"
msgstr "přezdívka"
#, fuzzy, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s%s"
msgstr "Server: %s%s %s[%s%s%s]%s%s"
msgid "connected"

10
po/de.po
View File

@ -24,7 +24,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-04-16 21:24+0200\n"
"POT-Creation-Date: 2018-05-19 09:04+0200\n"
"PO-Revision-Date: 2018-04-20 16:10+0200\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n"
@ -7848,8 +7848,12 @@ msgstr ""
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr "%s%s: ein neuer privater Buffer \"%s\" kann nicht erstellt werden"
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
#, fuzzy
msgid "nick:"
msgstr "Nick"
#, fuzzy, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s%s"
msgstr "Server: %s%s %s[%s%s%s]%s%s"
msgid "connected"

10
po/es.po
View File

@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-04-16 21:24+0200\n"
"POT-Creation-Date: 2018-05-19 09:04+0200\n"
"PO-Revision-Date: 2018-03-31 15:36+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6649,8 +6649,12 @@ msgstr "%s%s: el comando \"%s\" solo puede ser ejecutado en un canal"
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr "%s%s: no es posible crear la conversación privada \"%s\""
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
#, fuzzy
msgid "nick:"
msgstr "apodo"
#, fuzzy, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s%s"
msgstr "Servidor: %s%s %s[%s%s%s]%s%s"
msgid "connected"

11
po/fr.po
View File

@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-04-16 21:24+0200\n"
"PO-Revision-Date: 2018-04-16 21:24+0200\n"
"POT-Creation-Date: 2018-05-19 09:04+0200\n"
"PO-Revision-Date: 2018-05-19 09:04+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@ -7682,9 +7682,12 @@ msgstr ""
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr "%s%s : impossible de créer le tampon privé \"%s\""
msgid "nick:"
msgstr "pseudo :"
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgstr "Serveur : %s%s %s[%s%s%s]%s%s"
msgid "Server: %s%s %s[%s%s%s]%s%s%s"
msgstr "Serveur : %s%s %s[%s%s%s]%s%s%s"
msgid "connected"
msgstr "connecté"

8
po/hu.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-04-16 21:24+0200\n"
"POT-Creation-Date: 2018-05-19 09:04+0200\n"
"PO-Revision-Date: 2018-03-31 15:36+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5934,8 +5934,12 @@ msgstr "%s \"%s\" parancs csak a szobaablakban futtatható\n"
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr "%s nem sikerült új privát ablakot nyitni \"%s\"\n"
#, fuzzy
msgid "nick:"
msgstr "név"
#, fuzzy, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgid "Server: %s%s %s[%s%s%s]%s%s%s"
msgstr "%s Szerver: %s%s %s[%s%s%s]\n"
msgid "connected"

10
po/it.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-04-16 21:24+0200\n"
"POT-Creation-Date: 2018-05-19 09:04+0200\n"
"PO-Revision-Date: 2018-03-31 15:36+0200\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6826,8 +6826,12 @@ msgstr ""
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr "%s%s: impossibile creare il nuovo buffer privato \"%s\""
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
#, fuzzy
msgid "nick:"
msgstr "nick"
#, fuzzy, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s%s"
msgstr "Server: %s%s %s[%s%s%s]%s%s"
msgid "connected"

10
po/ja.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-04-16 21:24+0200\n"
"POT-Creation-Date: 2018-05-19 09:04+0200\n"
"PO-Revision-Date: 2018-04-21 09:00+0900\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@ -7351,8 +7351,12 @@ msgstr ""
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr "%s%s: 新しいプライベートバッファ \"%s\" の作成に失敗"
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
#, fuzzy
msgid "nick:"
msgstr "ニックネーム"
#, fuzzy, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s%s"
msgstr "サーバ: %s%s %s[%s%s%s]%s%s"
msgid "connected"

10
po/pl.po
View File

@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-04-16 21:24+0200\n"
"POT-Creation-Date: 2018-05-19 09:04+0200\n"
"PO-Revision-Date: 2018-03-31 15:36+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
"Language-Team: Polish <>\n"
@ -7489,8 +7489,12 @@ msgstr "%s%s: komenda \"%s\" może być tylko wykonana z nazwą kanału (\"%s\")
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr "%s%s: nie można utworzyć nowego bufora prywatnego \"%s\""
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
#, fuzzy
msgid "nick:"
msgstr "nick"
#, fuzzy, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s%s"
msgstr "Serwer: %s%s %s[%s%s%s]%s%s"
msgid "connected"

10
po/pt.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-04-16 21:24+0200\n"
"POT-Creation-Date: 2018-05-19 09:04+0200\n"
"PO-Revision-Date: 2018-03-31 15:36+0200\n"
"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
"Language-Team: Portuguese <>\n"
@ -7186,8 +7186,12 @@ msgstr ""
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr "%s%s: não é possível criar o novo buffer privado \"%s\""
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
#, fuzzy
msgid "nick:"
msgstr "nick"
#, fuzzy, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s%s"
msgstr "Servidor: %s%s %s[%s%s%s]%s%s"
msgid "connected"

10
po/pt_BR.po
View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-04-16 21:24+0200\n"
"POT-Creation-Date: 2018-05-19 09:04+0200\n"
"PO-Revision-Date: 2018-03-31 15:37+0200\n"
"Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6594,8 +6594,12 @@ msgstr "%s%s: não foi possível criar novo canal \"%s\""
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr ""
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
#, fuzzy
msgid "nick:"
msgstr "apelido"
#, fuzzy, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s%s"
msgstr "Servidor: %s%s %s[%s%s%s]%s%s"
msgid "connected"

8
po/ru.po
View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-04-16 21:24+0200\n"
"POT-Creation-Date: 2018-05-19 09:04+0200\n"
"PO-Revision-Date: 2018-03-31 15:37+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5973,8 +5973,12 @@ msgstr "%s \"%s\" команда может быть выполнена толь
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr "%s невозможно создать новый буфер привата \"%s\"\n"
#, fuzzy
msgid "nick:"
msgstr "ник"
#, fuzzy, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgid "Server: %s%s %s[%s%s%s]%s%s%s"
msgstr "%sСервер: %s%s %s[%s%s%s]\n"
msgid "connected"

10
po/tr.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-04-16 21:24+0200\n"
"POT-Creation-Date: 2018-05-19 09:04+0200\n"
"PO-Revision-Date: 2017-06-26 23:33+0200\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5493,8 +5493,12 @@ msgstr ""
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr ""
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
#, fuzzy
msgid "nick:"
msgstr "rumuz"
#, fuzzy, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s%s"
msgstr "Sunucu: %s%s %s[%s%s%s]%s%s"
msgid "connected"

7
po/weechat.pot
View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-04-16 21:24+0200\n"
"POT-Creation-Date: 2018-05-19 09:04+0200\n"
"PO-Revision-Date: 2014-08-16 10:27+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5435,8 +5435,11 @@ msgstr ""
msgid "%s%s: cannot create new private buffer \"%s\""
msgstr ""
msgid "nick:"
msgstr ""
#, c-format
msgid "Server: %s%s %s[%s%s%s]%s%s"
msgid "Server: %s%s %s[%s%s%s]%s%s%s"
msgstr ""
msgid "connected"

20
src/plugins/irc/irc-command.c
View File

@ -4608,13 +4608,22 @@ IRC_COMMAND_CALLBACK(saquit)
void
irc_command_display_server (struct t_irc_server *server, int with_detail)
{
char *cmd_pwd_hidden;
char *cmd_pwd_hidden, str_nick[1024];
int num_channels, num_pv;
str_nick[0] = '\0';
if (server->nick)
{
snprintf (str_nick, sizeof (str_nick),
", %s %s",
_("nick:"),
server->nick);
}
if (with_detail)
{
weechat_printf (NULL, "");
weechat_printf (NULL, _("Server: %s%s %s[%s%s%s]%s%s"),
weechat_printf (NULL, _("Server: %s%s %s[%s%s%s]%s%s%s"),
IRC_COLOR_CHAT_SERVER,
server->name,
IRC_COLOR_CHAT_DELIMITERS,
@ -4623,6 +4632,7 @@ irc_command_display_server (struct t_irc_server *server, int with_detail)
_("connected") : _("not connected"),
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
str_nick,
(server->temp_server) ? _(" (temporary)") : "");
/* addresses */
if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_ADDRESSES]))
@ -5006,16 +5016,16 @@ irc_command_display_server (struct t_irc_server *server, int with_detail)
num_pv = irc_server_get_pv_count (server);
weechat_printf (
NULL,
" %s %s%s %s[%s%s%s]%s%s, %d %s, %d pv",
" %s %s%s %s[%s%s%s]%s%s%s, %d %s, %d pv",
(server->is_connected) ? "*" : " ",
IRC_COLOR_CHAT_SERVER,
server->name,
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
(server->is_connected) ?
_("connected") : _("not connected"),
(server->is_connected) ? _("connected") : _("not connected"),
IRC_COLOR_CHAT_DELIMITERS,
IRC_COLOR_RESET,
str_nick,
(server->temp_server) ? _(" (temporary)") : "",
num_channels,
NG_("channel", "channels", num_channels),