diff --git a/po/cs.po b/po/cs.po index efba8cd0a..418f9f740 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: 2022-12-29 11:51+0100\n" +"POT-Creation-Date: 2023-01-15 21:01+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -9824,16 +9824,19 @@ msgstr[0] "částečných-opů" msgstr[1] "částečný-op" msgstr[2] "částečných-opů" -msgid "voice" -msgid_plural "voices" +#, fuzzy +#| msgid "voice" +#| msgid_plural "voices" +msgid "voiced" +msgid_plural "voiced" msgstr[0] "voiců" msgstr[1] "voice" msgstr[2] "voiců" -#. TRANSLATORS: number of "normal" nicks on a channel (ie no op/voice), for example: "56 normals" +#. TRANSLATORS: number of "regular" nicks on a channel (ie not op/halfop/voiced), for example: "56 regular" #, c-format -msgid "%s%s%d%s normal" -msgid_plural "%s%s%d%s normals" +msgid "%s%s%d%s regular" +msgid_plural "%s%s%d%s regular" msgstr[0] "" msgstr[1] "" msgstr[2] "" diff --git a/po/de.po b/po/de.po index 750a11502..08c4bc70e 100644 --- a/po/de.po +++ b/po/de.po @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-29 11:51+0100\n" +"POT-Creation-Date: 2023-01-15 21:01+0100\n" "PO-Revision-Date: 2022-12-29 12:50+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German - Germany \n" @@ -12100,15 +12100,20 @@ msgid_plural "halfops" msgstr[0] "Halb-Operator" msgstr[1] "Halb-Operatoren" -msgid "voice" -msgid_plural "voices" +#, fuzzy +#| msgid "voice" +#| msgid_plural "voices" +msgid "voiced" +msgid_plural "voiced" msgstr[0] "ge-voice-ter" msgstr[1] "ge-voice-te" -#. TRANSLATORS: number of "normal" nicks on a channel (ie no op/voice), for example: "56 normals" -#, c-format -msgid "%s%s%d%s normal" -msgid_plural "%s%s%d%s normals" +#. TRANSLATORS: number of "regular" nicks on a channel (ie not op/halfop/voiced), for example: "56 regular" +#, fuzzy, c-format +#| msgid "%s%s%d%s normal" +#| msgid_plural "%s%s%d%s normals" +msgid "%s%s%d%s regular" +msgid_plural "%s%s%d%s regular" msgstr[0] "%s%s%d%s normal" msgstr[1] "%s%s%d%s normale" diff --git a/po/es.po b/po/es.po index 3081846d6..c718c8305 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: 2022-12-29 11:51+0100\n" +"POT-Creation-Date: 2023-01-15 21:01+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Santiago Forero \n" "Language-Team: weechat-dev \n" @@ -10485,15 +10485,18 @@ msgid_plural "halfops" msgstr[0] "semi-op" msgstr[1] "semi-ops" -msgid "voice" -msgid_plural "voices" +#, fuzzy +#| msgid "voice" +#| msgid_plural "voices" +msgid "voiced" +msgid_plural "voiced" msgstr[0] "voz" msgstr[1] "voces" -#. TRANSLATORS: number of "normal" nicks on a channel (ie no op/voice), for example: "56 normals" +#. TRANSLATORS: number of "regular" nicks on a channel (ie not op/halfop/voiced), for example: "56 regular" #, c-format -msgid "%s%s%d%s normal" -msgid_plural "%s%s%d%s normals" +msgid "%s%s%d%s regular" +msgid_plural "%s%s%d%s regular" msgstr[0] "" msgstr[1] "" diff --git a/po/fr.po b/po/fr.po index 7ee2721f2..f64411a70 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: 2022-12-29 11:51+0100\n" -"PO-Revision-Date: 2023-01-14 20:55+0100\n" +"POT-Creation-Date: 2023-01-15 21:01+0100\n" +"PO-Revision-Date: 2023-01-15 21:07+0100\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -11850,17 +11850,17 @@ msgid_plural "halfops" msgstr[0] "halfop" msgstr[1] "halfops" -msgid "voice" -msgid_plural "voices" -msgstr[0] "voice" -msgstr[1] "voices" +msgid "voiced" +msgid_plural "voiced" +msgstr[0] "avec voix" +msgstr[1] "avec voix" -#. TRANSLATORS: number of "normal" nicks on a channel (ie no op/voice), for example: "56 normals" +#. TRANSLATORS: number of "regular" nicks on a channel (ie not op/halfop/voiced), for example: "56 regular" #, c-format -msgid "%s%s%d%s normal" -msgid_plural "%s%s%d%s normals" -msgstr[0] "%s%s%d%s normal" -msgstr[1] "%s%s%d%s normaux" +msgid "%s%s%d%s regular" +msgid_plural "%s%s%d%s regular" +msgstr[0] "%s%s%d%s régulier" +msgstr[1] "%s%s%d%s réguliers" #, c-format msgid "%sChannel %s%s%s: %s%d%s %s %s(%s%s)" diff --git a/po/hu.po b/po/hu.po index ace65f486..c653257cd 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: 2022-12-29 11:51+0100\n" +"POT-Creation-Date: 2023-01-15 21:01+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -9323,15 +9323,15 @@ msgstr[0] "féloperátor" msgstr[1] "féloperátor" #, fuzzy -msgid "voice" -msgid_plural "voices" +msgid "voiced" +msgid_plural "voiced" msgstr[0] "voice" msgstr[1] "voice" -#. TRANSLATORS: number of "normal" nicks on a channel (ie no op/voice), for example: "56 normals" +#. TRANSLATORS: number of "regular" nicks on a channel (ie not op/halfop/voiced), for example: "56 regular" #, c-format -msgid "%s%s%d%s normal" -msgid_plural "%s%s%d%s normals" +msgid "%s%s%d%s regular" +msgid_plural "%s%s%d%s regular" msgstr[0] "" msgstr[1] "" diff --git a/po/it.po b/po/it.po index c9da3aebe..a2cfa046a 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: 2022-12-29 11:51+0100\n" +"POT-Creation-Date: 2023-01-15 21:01+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -10274,15 +10274,18 @@ msgid_plural "halfops" msgstr[0] "halfop" msgstr[1] "halfop" -msgid "voice" -msgid_plural "voices" +#, fuzzy +#| msgid "voice" +#| msgid_plural "voices" +msgid "voiced" +msgid_plural "voiced" msgstr[0] "voice" msgstr[1] "voice" -#. TRANSLATORS: number of "normal" nicks on a channel (ie no op/voice), for example: "56 normals" +#. TRANSLATORS: number of "regular" nicks on a channel (ie not op/halfop/voiced), for example: "56 regular" #, c-format -msgid "%s%s%d%s normal" -msgid_plural "%s%s%d%s normals" +msgid "%s%s%d%s regular" +msgid_plural "%s%s%d%s regular" msgstr[0] "" msgstr[1] "" diff --git a/po/ja.po b/po/ja.po index b33770998..0c97761d8 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: 2022-12-29 11:51+0100\n" +"POT-Creation-Date: 2023-01-15 21:01+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" "Language-Team: Polish \n" @@ -11588,16 +11588,21 @@ msgstr[0] "halfop" msgstr[1] "halfop" msgstr[2] "halfop" -msgid "voice" -msgid_plural "voices" +#, fuzzy +#| msgid "voice" +#| msgid_plural "voices" +msgid "voiced" +msgid_plural "voiced" msgstr[0] "voice" msgstr[1] "voice" msgstr[2] "voice" -#. TRANSLATORS: number of "normal" nicks on a channel (ie no op/voice), for example: "56 normals" -#, c-format -msgid "%s%s%d%s normal" -msgid_plural "%s%s%d%s normals" +#. TRANSLATORS: number of "regular" nicks on a channel (ie not op/halfop/voiced), for example: "56 regular" +#, fuzzy, c-format +#| msgid "%s%s%d%s normal" +#| msgid_plural "%s%s%d%s normals" +msgid "%s%s%d%s regular" +msgid_plural "%s%s%d%s regular" msgstr[0] "%s%s%d%s normal" msgstr[1] "%s%s%d%s normals" msgstr[2] "%s%s%d%s normals" diff --git a/po/pt.po b/po/pt.po index 5a903438c..995e4c256 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: 2022-12-29 11:51+0100\n" +"POT-Creation-Date: 2023-01-15 21:01+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -11087,15 +11087,18 @@ msgid_plural "halfops" msgstr[0] "semi-op" msgstr[1] "semi-ops" -msgid "voice" -msgid_plural "voices" +#, fuzzy +#| msgid "voice" +#| msgid_plural "voices" +msgid "voiced" +msgid_plural "voiced" msgstr[0] "voz" msgstr[1] "vozes" -#. TRANSLATORS: number of "normal" nicks on a channel (ie no op/voice), for example: "56 normals" +#. TRANSLATORS: number of "regular" nicks on a channel (ie not op/halfop/voiced), for example: "56 regular" #, c-format -msgid "%s%s%d%s normal" -msgid_plural "%s%s%d%s normals" +msgid "%s%s%d%s regular" +msgid_plural "%s%s%d%s regular" msgstr[0] "" msgstr[1] "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 60bd8045e..b9aa8380d 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: 2022-12-29 11:51+0100\n" +"POT-Creation-Date: 2023-01-15 21:01+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Érico Nogueira \n" "Language-Team: weechat-dev \n" @@ -9794,15 +9794,15 @@ msgid_plural "halfops" msgstr[0] "semi-operador" msgstr[1] "semi-operadores" -msgid "voice" -msgid_plural "voices" +msgid "voiced" +msgid_plural "voiced" msgstr[0] "" msgstr[1] "" -#. TRANSLATORS: number of "normal" nicks on a channel (ie no op/voice), for example: "56 normals" +#. TRANSLATORS: number of "regular" nicks on a channel (ie not op/halfop/voiced), for example: "56 regular" #, c-format -msgid "%s%s%d%s normal" -msgid_plural "%s%s%d%s normals" +msgid "%s%s%d%s regular" +msgid_plural "%s%s%d%s regular" msgstr[0] "" msgstr[1] "" diff --git a/po/ru.po b/po/ru.po index 55e4c6405..7acc5dcec 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: 2022-12-29 11:51+0100\n" +"POT-Creation-Date: 2023-01-15 21:01+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -9363,16 +9363,16 @@ msgstr[1] "полуоп" msgstr[2] "полуоп" #, fuzzy -msgid "voice" -msgid_plural "voices" +msgid "voiced" +msgid_plural "voiced" msgstr[0] "войс" msgstr[1] "войс" msgstr[2] "войс" -#. TRANSLATORS: number of "normal" nicks on a channel (ie no op/voice), for example: "56 normals" +#. TRANSLATORS: number of "regular" nicks on a channel (ie not op/halfop/voiced), for example: "56 regular" #, c-format -msgid "%s%s%d%s normal" -msgid_plural "%s%s%d%s normals" +msgid "%s%s%d%s regular" +msgid_plural "%s%s%d%s regular" msgstr[0] "" msgstr[1] "" msgstr[2] "" diff --git a/po/sr.po b/po/sr.po index 1ae2de399..ed7d686c4 100644 --- a/po/sr.po +++ b/po/sr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-29 11:51+0100\n" +"POT-Creation-Date: 2023-01-15 21:01+0100\n" "PO-Revision-Date: 2022-12-05 09:44+0400\n" "Last-Translator: Ivan Pešić \n" "Language-Team: weechat-dev \n" @@ -11754,16 +11754,21 @@ msgstr[0] "полуоп" msgstr[1] "полуопа" msgstr[2] "полуопова" -msgid "voice" -msgid_plural "voices" +#, fuzzy +#| msgid "voice" +#| msgid_plural "voices" +msgid "voiced" +msgid_plural "voiced" msgstr[0] "глас" msgstr[1] "гласа" msgstr[2] "гласова" -#. TRANSLATORS: number of "normal" nicks on a channel (ie no op/voice), for example: "56 normals" -#, c-format -msgid "%s%s%d%s normal" -msgid_plural "%s%s%d%s normals" +#. TRANSLATORS: number of "regular" nicks on a channel (ie not op/halfop/voiced), for example: "56 regular" +#, fuzzy, c-format +#| msgid "%s%s%d%s normal" +#| msgid_plural "%s%s%d%s normals" +msgid "%s%s%d%s regular" +msgid_plural "%s%s%d%s regular" msgstr[0] "%s%s%d%s обичан" msgstr[1] "%s%s%d%s обична" msgstr[2] "%s%s%d%s обичних" diff --git a/po/tr.po b/po/tr.po index f36b07c34..3317ddbb8 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: 2022-12-29 11:51+0100\n" +"POT-Creation-Date: 2023-01-15 21:01+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Emir SARI \n" "Language-Team: weechat-dev \n" @@ -11788,15 +11788,20 @@ msgid_plural "halfops" msgstr[0] "yarım operatör" msgstr[1] "yarım operatör" -msgid "voice" -msgid_plural "voices" +#, fuzzy +#| msgid "voice" +#| msgid_plural "voices" +msgid "voiced" +msgid_plural "voiced" msgstr[0] "yardımcı" msgstr[1] "yardımcı" -#. TRANSLATORS: number of "normal" nicks on a channel (ie no op/voice), for example: "56 normals" -#, c-format -msgid "%s%s%d%s normal" -msgid_plural "%s%s%d%s normals" +#. TRANSLATORS: number of "regular" nicks on a channel (ie not op/halfop/voiced), for example: "56 regular" +#, fuzzy, c-format +#| msgid "%s%s%d%s normal" +#| msgid_plural "%s%s%d%s normals" +msgid "%s%s%d%s regular" +msgid_plural "%s%s%d%s regular" msgstr[0] "%s%s%d%s normal kullanıcı" msgstr[1] "%s%s%d%s normal kullanıcı" diff --git a/po/weechat.pot b/po/weechat.pot index 9513e9275..59a3b8b69 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: 2022-12-29 11:51+0100\n" +"POT-Creation-Date: 2023-01-15 21:01+0100\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -8378,15 +8378,15 @@ msgid_plural "halfops" msgstr[0] "" msgstr[1] "" -msgid "voice" -msgid_plural "voices" +msgid "voiced" +msgid_plural "voiced" msgstr[0] "" msgstr[1] "" -#. TRANSLATORS: number of "normal" nicks on a channel (ie no op/voice), for example: "56 normals" +#. TRANSLATORS: number of "regular" nicks on a channel (ie not op/halfop/voiced), for example: "56 regular" #, c-format -msgid "%s%s%d%s normal" -msgid_plural "%s%s%d%s normals" +msgid "%s%s%d%s regular" +msgid_plural "%s%s%d%s regular" msgstr[0] "" msgstr[1] "" diff --git a/src/plugins/irc/irc-nick.c b/src/plugins/irc/irc-nick.c index 4c15f03a3..d32198e2c 100644 --- a/src/plugins/irc/irc-nick.c +++ b/src/plugins/irc/irc-nick.c @@ -834,37 +834,41 @@ irc_nick_search (struct t_irc_server *server, struct t_irc_channel *channel, } /* - * Returns number of nicks (total, op, halfop, voice, normal) on a channel. + * Returns number of nicks (total, ops, halfops, voiced, regular) on a channel. */ void irc_nick_count (struct t_irc_server *server, struct t_irc_channel *channel, - int *total, int *count_op, int *count_halfop, int *count_voice, - int *count_normal) + int *total, int *count_ops, int *count_halfops, + int *count_voiced, int *count_regular) { struct t_irc_nick *ptr_nick; (*total) = 0; - (*count_op) = 0; - (*count_halfop) = 0; - (*count_voice) = 0; - (*count_normal) = 0; + (*count_ops) = 0; + (*count_halfops) = 0; + (*count_voiced) = 0; + (*count_regular) = 0; for (ptr_nick = channel->nicks; ptr_nick; ptr_nick = ptr_nick->next_nick) { (*total)++; if (irc_nick_is_op (server, ptr_nick)) - (*count_op)++; + { + (*count_ops)++; + } else { if (irc_nick_has_prefix_mode (server, ptr_nick, 'h')) - (*count_halfop)++; + { + (*count_halfops)++; + } else { if (irc_nick_has_prefix_mode (server, ptr_nick, 'v')) - (*count_voice)++; + (*count_voiced)++; else - (*count_normal)++; + (*count_regular)++; } } } diff --git a/src/plugins/irc/irc-nick.h b/src/plugins/irc/irc-nick.h index d296c1fed..de647386c 100644 --- a/src/plugins/irc/irc-nick.h +++ b/src/plugins/irc/irc-nick.h @@ -87,8 +87,8 @@ extern struct t_irc_nick *irc_nick_search (struct t_irc_server *server, const char *nickname); extern void irc_nick_count (struct t_irc_server *server, struct t_irc_channel *channel, int *total, - int *count_op, int *count_halfop, int *count_voice, - int *count_normal); + int *count_ops, int *count_halfops, + int *count_voiced, int *count_regular); extern void irc_nick_set_away (struct t_irc_server *server, struct t_irc_channel *channel, struct t_irc_nick *nick, int is_away); diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index 07ee01be9..54b1ac7b3 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -6086,7 +6086,7 @@ IRC_PROTOCOL_CALLBACK(366) struct t_irc_channel *ptr_channel; struct t_infolist *infolist; struct t_config_option *ptr_option; - int num_nicks, num_op, num_halfop, num_voice, num_normal; + int num_nicks, num_ops, num_halfops, num_voiced, num_regular; char *str_params, str_count[1024], **str_nicks, *color; const char *prefix, *prefix_color, *nickname; @@ -6190,12 +6190,15 @@ IRC_PROTOCOL_CALLBACK(366) } } - /* display number of nicks, ops, halfops & voices on the channel */ + /* + * display the number of total nicks, ops, halfops, voiced and + * regular on the channel + */ if (weechat_hashtable_has_key (ptr_channel->join_msg_received, "366") || weechat_hashtable_has_key (irc_config_hashtable_display_join_message, "366")) { - irc_nick_count (server, ptr_channel, &num_nicks, &num_op, &num_halfop, - &num_voice, &num_normal); + irc_nick_count (server, ptr_channel, &num_nicks, &num_ops, + &num_halfops, &num_voiced, &num_regular); str_nicks = weechat_string_dyn_alloc (1024); if (irc_server_get_prefix_mode_index (server, 'o') >= 0) { @@ -6203,9 +6206,9 @@ IRC_PROTOCOL_CALLBACK(366) "%s%s%d%s %s", (*str_nicks[0]) ? ", " : "", IRC_COLOR_CHAT_CHANNEL, - num_op, + num_ops, IRC_COLOR_RESET, - NG_("op", "ops", num_op)); + NG_("op", "ops", num_ops)); weechat_string_dyn_concat (str_nicks, str_count, -1); } if (irc_server_get_prefix_mode_index (server, 'h') >= 0) @@ -6214,9 +6217,9 @@ IRC_PROTOCOL_CALLBACK(366) "%s%s%d%s %s", (*str_nicks[0]) ? ", " : "", IRC_COLOR_CHAT_CHANNEL, - num_halfop, + num_halfops, IRC_COLOR_RESET, - NG_("halfop", "halfops", num_halfop)); + NG_("halfop", "halfops", num_halfops)); weechat_string_dyn_concat (str_nicks, str_count, -1); } if (irc_server_get_prefix_mode_index (server, 'v') >= 0) @@ -6225,18 +6228,18 @@ IRC_PROTOCOL_CALLBACK(366) "%s%s%d%s %s", (*str_nicks[0]) ? ", " : "", IRC_COLOR_CHAT_CHANNEL, - num_voice, + num_voiced, IRC_COLOR_RESET, - NG_("voice", "voices", num_voice)); + NG_("voiced", "voiced", num_voiced)); weechat_string_dyn_concat (str_nicks, str_count, -1); } snprintf ( str_count, sizeof (str_count), - /* TRANSLATORS: number of "normal" nicks on a channel (ie no op/voice), for example: "56 normals" */ - NG_("%s%s%d%s normal", "%s%s%d%s normals", num_normal), + /* TRANSLATORS: number of "regular" nicks on a channel (ie not op/halfop/voiced), for example: "56 regular" */ + NG_("%s%s%d%s regular", "%s%s%d%s regular", num_regular), (*str_nicks[0]) ? ", " : "", IRC_COLOR_CHAT_CHANNEL, - num_normal, + num_regular, IRC_COLOR_RESET); weechat_string_dyn_concat (str_nicks, str_count, -1); weechat_printf_date_tags ( diff --git a/tests/unit/plugins/irc/test-irc-protocol.cpp b/tests/unit/plugins/irc/test-irc-protocol.cpp index f248905f2..c5611e337 100644 --- a/tests/unit/plugins/irc/test-irc-protocol.cpp +++ b/tests/unit/plugins/irc/test-irc-protocol.cpp @@ -3650,33 +3650,43 @@ TEST(IrcProtocolWithServer, 366) CHECK_ERROR_PARAMS("366", 2, 3); RECV(":server 366 alice #test end"); - CHECK_CHAN("-- Channel #test: 1 nick (0 ops, 0 voices, 1 normal)"); + CHECK_CHAN("-- Channel #test: 1 nick (0 ops, 0 voiced, 1 regular)"); RECV(":server 366 alice #test :End of /NAMES list"); - CHECK_CHAN("-- Channel #test: 1 nick (0 ops, 0 voices, 1 normal)"); + CHECK_CHAN("-- Channel #test: 1 nick (0 ops, 0 voiced, 1 regular)"); RECV(":server 353 alice = #test :bob"); RECV(":server 366 alice #test :End of /NAMES list"); - CHECK_CHAN("-- Channel #test: 2 nicks (0 ops, 0 voices, 2 normals)"); + CHECK_CHAN("-- Channel #test: 2 nicks (0 ops, 0 voiced, 2 regular)"); RECV(":server 353 alice = #test :@carol"); RECV(":server 366 alice #test :End of /NAMES list"); - CHECK_CHAN("-- Channel #test: 3 nicks (1 op, 0 voices, 2 normals)"); + CHECK_CHAN("-- Channel #test: 3 nicks (1 op, 0 voiced, 2 regular)"); RECV(":server 353 alice = #test :+dan!user@host"); RECV(":server 366 alice #test :End of /NAMES list"); - CHECK_CHAN("-- Channel #test: 4 nicks (1 op, 1 voice, 2 normals)"); + CHECK_CHAN("-- Channel #test: 4 nicks (1 op, 1 voiced, 2 regular)"); RECV(":server 353 alice = #test :@evans"); RECV(":server 366 alice #test :End of /NAMES list"); - CHECK_CHAN("-- Channel #test: 5 nicks (2 ops, 1 voice, 2 normals)"); + CHECK_CHAN("-- Channel #test: 5 nicks (2 ops, 1 voiced, 2 regular)"); RECV(":server 353 alice = #test :+fred"); RECV(":server 366 alice #test :End of /NAMES list"); - CHECK_CHAN("-- Channel #test: 6 nicks (2 ops, 2 voices, 2 normals)"); + CHECK_CHAN("-- Channel #test: 6 nicks (2 ops, 2 voiced, 2 regular)"); RECV(":server 353 alice = #test :greg"); RECV(":server 366 alice #test :End of /NAMES list"); - CHECK_CHAN("-- Channel #test: 7 nicks (2 ops, 2 voices, 3 normals)"); + CHECK_CHAN("-- Channel #test: 7 nicks (2 ops, 2 voiced, 3 regular)"); + + RECV(":server 005 alice " IRC_MSG_005 " :are supported"); + + RECV(":server 353 alice = #test :%harry"); + RECV(":server 366 alice #test :End of /NAMES list"); + CHECK_CHAN("-- Channel #test: 8 nicks (2 ops, 1 halfop, 2 voiced, 3 regular)"); + + RECV(":server 353 alice = #test :%ian"); + RECV(":server 366 alice #test :End of /NAMES list"); + CHECK_CHAN("-- Channel #test: 9 nicks (2 ops, 2 halfops, 2 voiced, 3 regular)"); /* channel not found */ RECV(":server 366 alice #xyz end");