diff options
author | Sébastien Helleu <flashcode@flashtux.org> | 2015-12-24 20:36:05 +0100 |
---|---|---|
committer | Sébastien Helleu <flashcode@flashtux.org> | 2015-12-24 20:36:05 +0100 |
commit | ed32302011cc627b31df446380e6787bb7e29aa6 (patch) | |
tree | 430007333b209dade8b2c568aed25e9cdc431c30 /src/plugins/irc/irc-command.c | |
parent | c4e3d66ba5bb6f91a0b5a36bab1123e25623b5e9 (diff) | |
download | weechat-ed32302011cc627b31df446380e6787bb7e29aa6.zip |
irc: move option irc.network.alternate_nick into servers (closes #633)
Diffstat (limited to 'src/plugins/irc/irc-command.c')
-rw-r--r-- | src/plugins/irc/irc-command.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index cc976e585..9609f98b3 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -4532,7 +4532,7 @@ irc_command_display_server (struct t_irc_server *server, int with_detail) else weechat_printf (NULL, " ipv6 . . . . . . . . : %s%s", IRC_COLOR_CHAT_VALUE, - weechat_config_boolean (server->options[IRC_SERVER_OPTION_IPV6]) ? + (weechat_config_boolean (server->options[IRC_SERVER_OPTION_IPV6])) ? _("on") : _("off")); /* ssl */ if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SSL])) @@ -4542,7 +4542,7 @@ irc_command_display_server (struct t_irc_server *server, int with_detail) else weechat_printf (NULL, " ssl. . . . . . . . . : %s%s", IRC_COLOR_CHAT_VALUE, - weechat_config_boolean (server->options[IRC_SERVER_OPTION_SSL]) ? + (weechat_config_boolean (server->options[IRC_SERVER_OPTION_SSL])) ? _("on") : _("off")); /* ssl_cert */ if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SSL_CERT])) @@ -4584,7 +4584,7 @@ irc_command_display_server (struct t_irc_server *server, int with_detail) else weechat_printf (NULL, " ssl_verify . . . . . : %s%s", IRC_COLOR_CHAT_VALUE, - weechat_config_boolean (server->options[IRC_SERVER_OPTION_SSL_VERIFY]) ? + (weechat_config_boolean (server->options[IRC_SERVER_OPTION_SSL_VERIFY])) ? _("on") : _("off")); /* password */ if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_PASSWORD])) @@ -4660,7 +4660,7 @@ irc_command_display_server (struct t_irc_server *server, int with_detail) else weechat_printf (NULL, " autoconnect. . . . . : %s%s", IRC_COLOR_CHAT_VALUE, - weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTOCONNECT]) ? + (weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTOCONNECT])) ? _("on") : _("off")); /* autoreconnect */ if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTORECONNECT])) @@ -4670,7 +4670,7 @@ irc_command_display_server (struct t_irc_server *server, int with_detail) else weechat_printf (NULL, " autoreconnect. . . . : %s%s", IRC_COLOR_CHAT_VALUE, - weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTORECONNECT]) ? + (weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTORECONNECT])) ? _("on") : _("off")); /* autoreconnect_delay */ if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTORECONNECT_DELAY])) @@ -4690,6 +4690,16 @@ irc_command_display_server (struct t_irc_server *server, int with_detail) weechat_printf (NULL, " nicks. . . . . . . . : %s'%s'", IRC_COLOR_CHAT_VALUE, weechat_config_string (server->options[IRC_SERVER_OPTION_NICKS])); + /* nicks_alternate */ + if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_NICKS_ALTERNATE])) + weechat_printf (NULL, " nicks_alternate. . . : (%s)", + (IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_NICKS_ALTERNATE)) ? + _("on") : _("off")); + else + weechat_printf (NULL, " nicksalternate . . . : %s%s", + IRC_COLOR_CHAT_VALUE, + (weechat_config_boolean (server->options[IRC_SERVER_OPTION_NICKS_ALTERNATE])) ? + _("on") : _("off")); /* username */ if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_USERNAME])) weechat_printf (NULL, " username . . . . . . : ('%s')", @@ -4762,7 +4772,7 @@ irc_command_display_server (struct t_irc_server *server, int with_detail) else weechat_printf (NULL, " autorejoin . . . . . : %s%s", IRC_COLOR_CHAT_VALUE, - weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTOREJOIN]) ? + (weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTOREJOIN])) ? _("on") : _("off")); /* autorejoin_delay */ if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTOREJOIN_DELAY])) |