From 60254ff48d05e4678c51b89ba6b601fe48d9e285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sat, 19 May 2018 09:07:08 +0200 Subject: [PATCH] irc: display current nick on connected servers in output of /server list|listfull (closes #1193) --- ChangeLog.adoc | 1 + po/cs.po | 10 +++++++--- po/de.po | 10 +++++++--- po/es.po | 10 +++++++--- po/fr.po | 11 +++++++---- po/hu.po | 8 ++++++-- po/it.po | 10 +++++++--- po/ja.po | 10 +++++++--- po/pl.po | 10 +++++++--- po/pt.po | 10 +++++++--- po/pt_BR.po | 10 +++++++--- po/ru.po | 8 ++++++-- po/tr.po | 10 +++++++--- po/weechat.pot | 7 +++++-- src/plugins/irc/irc-command.c | 20 +++++++++++++++----- 15 files changed, 103 insertions(+), 42 deletions(-) diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 83fec4d80..f0c15a7a2 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -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) diff --git a/po/cs.po b/po/cs.po index 5466cbe30..d09815038 100644 --- a/po/cs.po +++ b/po/cs.po @@ -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 \n" "Language-Team: weechat-dev \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" diff --git a/po/de.po b/po/de.po index bb4d20f41..fdb35be0d 100644 --- a/po/de.po +++ b/po/de.po @@ -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 \n" "Language-Team: German \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" diff --git a/po/es.po b/po/es.po index d64d9bfdb..68c8e805d 100644 --- a/po/es.po +++ b/po/es.po @@ -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 \n" "Language-Team: weechat-dev \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" diff --git a/po/fr.po b/po/fr.po index a7c6cb2d4..c50f8f0ef 100644 --- a/po/fr.po +++ b/po/fr.po @@ -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 \n" "Language-Team: weechat-dev \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é" diff --git a/po/hu.po b/po/hu.po index ebc4aa136..12102ed2a 100644 --- a/po/hu.po +++ b/po/hu.po @@ -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 \n" "Language-Team: weechat-dev \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" diff --git a/po/it.po b/po/it.po index 48271e722..37c010c99 100644 --- a/po/it.po +++ b/po/it.po @@ -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 \n" "Language-Team: weechat-dev \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" diff --git a/po/ja.po b/po/ja.po index 792fbcd39..c99ef4e45 100644 --- a/po/ja.po +++ b/po/ja.po @@ -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 \n" "Language-Team: Japanese \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" diff --git a/po/pt.po b/po/pt.po index bdd9f2600..705118bce 100644 --- a/po/pt.po +++ b/po/pt.po @@ -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 \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" diff --git a/po/pt_BR.po b/po/pt_BR.po index 0e7458bfd..6fc056823 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -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 \n" "Language-Team: weechat-dev \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" diff --git a/po/ru.po b/po/ru.po index 268819daa..bb157ee34 100644 --- a/po/ru.po +++ b/po/ru.po @@ -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 \n" "Language-Team: weechat-dev \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" diff --git a/po/tr.po b/po/tr.po index dfb1f30f4..f881f7eff 100644 --- a/po/tr.po +++ b/po/tr.po @@ -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 \n" "Language-Team: weechat-dev \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" diff --git a/po/weechat.pot b/po/weechat.pot index 5e388607d..8ac251b88 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -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 \n" "Language-Team: weechat-dev \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" diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index fb533f01b..f4703866a 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -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),