irc: add value "353" in option irc.look.display_join_message

So now the values mean:
- 353: names on channel
- 366: names count (before this commit it meant 353 + 366)
v2.8-utf8proc
Sebastien Helleu 2014-01-28 18:31:03 +01:00
parent ff92b79712
commit f285fdafa0
22 changed files with 85 additions and 59 deletions

15
NEWS
View File

@ -67,6 +67,21 @@ The default value for status bar items becomes:
/set weechat.bar.status.items "[time],[buffer_count],[buffer_plugin],buffer_number+:+buffer_name+(buffer_modes)+{buffer_nicklist_count}+buffer_zoom+buffer_filter,[lag],[hotlist],completion,scroll"
----
=== IRC messages on channel join
The names are not displayed any more by default on channel join (they are in
nicklist anyway).
Names can be displayed with the value "353" in option
'irc.look.display_join_message' (which is not in default value). +
The value "366" shows only names count on channel.
If you want to display all messages on join (including names), you can do:
----
/set /set irc.look.display_join_message "329,332,333,353,366"
----
=== Maximum lag in IRC
Option 'irc.network.lag_max' has been added.

View File

@ -134,9 +134,9 @@
** Werte: on, off (Standardwert: `on`)
* [[option_irc.look.display_join_message]] *irc.look.display_join_message*
** Beschreibung: `durch Kommata getrennte Liste von Nachrichten die beim betreten eines Channels angezeigt werden sollen: 329 = Erstellungsdatum des Channels, 332 = Topic, 333 = Nick/Datum für Topic, 366 = genutzte Namen im Channel`
** Beschreibung: `comma-separated list of messages to display after joining a channel: 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names on channel, 366 = names count`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `"329,332,333"`)
** Werte: beliebige Zeichenkette (Standardwert: `"329,332,333,366"`)
* [[option_irc.look.display_old_topic]] *irc.look.display_old_topic*
** Beschreibung: `Zeige das alte Thema an, falls das Thema des Channels geändert wurde`

View File

@ -134,9 +134,9 @@
** values: on, off (default value: `on`)
* [[option_irc.look.display_join_message]] *irc.look.display_join_message*
** description: `comma-separated list of messages to display after joining a channel: 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 366 = names on channel`
** description: `comma-separated list of messages to display after joining a channel: 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names on channel, 366 = names count`
** type: string
** values: any string (default value: `"329,332,333"`)
** values: any string (default value: `"329,332,333,366"`)
* [[option_irc.look.display_old_topic]] *irc.look.display_old_topic*
** description: `display old topic when channel topic is changed`

View File

@ -134,9 +134,9 @@
** valeurs: on, off (valeur par défaut: `on`)
* [[option_irc.look.display_join_message]] *irc.look.display_join_message*
** description: `liste de messages (séparés par des virgules) à afficher après avoir rejoint un canal: 329 = date de création du canal, 332 = titre, 333 = pseudo/date pour le titre, 366 = noms sur le canal`
** description: `liste de messages (séparés par des virgules) à afficher après avoir rejoint un canal: 329 = date de création du canal, 332 = titre, 333 = pseudo/date pour le titre, 353 = noms sur le canal, 366 = décompte des noms`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `"329,332,333"`)
** valeurs: toute chaîne (valeur par défaut: `"329,332,333,366"`)
* [[option_irc.look.display_old_topic]] *irc.look.display_old_topic*
** description: `afficher l'ancien titre lorsque le titre du canal est changé`

View File

@ -134,9 +134,9 @@
** valori: on, off (valore predefinito: `on`)
* [[option_irc.look.display_join_message]] *irc.look.display_join_message*
** descrizione: `elenco separato da virgole di messaggi da mostrare dopo l'ingresso in un canale: 329 = data di creazione del canale, 332 = argomento, 333 = nick/data per l'argomento, 366 = nomi sul canale`
** descrizione: `comma-separated list of messages to display after joining a channel: 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names on channel, 366 = names count`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `"329,332,333"`)
** valori: qualsiasi stringa (valore predefinito: `"329,332,333,366"`)
* [[option_irc.look.display_old_topic]] *irc.look.display_old_topic*
** descrizione: `visualizza l'argomento del canale precedente quando viene cambiato`

View File

@ -134,9 +134,9 @@
** 値: on, off (デフォルト値: `on`)
* [[option_irc.look.display_join_message]] *irc.look.display_join_message*
** 説明: `チャンネルに参加した後に表示するメッセージのコンマ区切りリスト: 329 = チャンネル作成日、332 = トピック、333 = トピックを作成したニックネームおよび日付、366 = チャンネル参加者リスト`
** 説明: `comma-separated list of messages to display after joining a channel: 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names on channel, 366 = names count`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `"329,332,333"`)
** 値: 未制約文字列 (デフォルト値: `"329,332,333,366"`)
* [[option_irc.look.display_old_topic]] *irc.look.display_old_topic*
** 説明: `チャンネルトピックが変更された場合に、古いトピックを表示`

View File

@ -134,9 +134,9 @@
** wartości: on, off (domyślna wartość: `on`)
* [[option_irc.look.display_join_message]] *irc.look.display_join_message*
** opis: `oddzielona przecinkami lista wiadomości wyświetlanych po wejściu na kanał: 329 = data utworzenia, 332 = temat, 333 = autor/data tematu, 366 = osoby na kanale`
** opis: `comma-separated list of messages to display after joining a channel: 329 = channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names on channel, 366 = names count`
** typ: ciąg
** wartości: dowolny ciąg (domyślna wartość: `"329,332,333"`)
** wartości: dowolny ciąg (domyślna wartość: `"329,332,333,366"`)
* [[option_irc.look.display_old_topic]] *irc.look.display_old_topic*
** opis: `wyświetl stary temat, kiedy zmieniany jest temat kanału`

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-01-25 13:36+0100\n"
"POT-Creation-Date: 2014-01-28 18:24+0100\n"
"PO-Revision-Date: 2014-01-18 21:20+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6402,8 +6402,8 @@ msgstr "zobrazovat hosta ve zprávách o odchodu/ukončení"
msgid ""
"comma-separated list of messages to display after joining a channel: 329 = "
"channel creation date, 332 = topic, 333 = nick/date for topic, 366 = names "
"on channel"
"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names "
"on channel, 366 = names count"
msgstr ""
msgid "display old topic when channel topic is changed"

View File

@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-01-26 10:04+0100\n"
"POT-Creation-Date: 2014-01-28 18:24+0100\n"
"PO-Revision-Date: 2014-01-25 19:44+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@ -7219,10 +7219,11 @@ msgstr "Zeigt den Host in join Nachrichten des lokalen Client an"
msgid "display host in part/quit messages"
msgstr "Zeigt den Host in einer part/quit Nachricht an"
#, fuzzy
msgid ""
"comma-separated list of messages to display after joining a channel: 329 = "
"channel creation date, 332 = topic, 333 = nick/date for topic, 366 = names "
"on channel"
"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names "
"on channel, 366 = names count"
msgstr ""
"durch Kommata getrennte Liste von Nachrichten die beim betreten eines "
"Channels angezeigt werden sollen: 329 = Erstellungsdatum des Channels, 332 = "

View File

@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-01-25 13:36+0100\n"
"POT-Creation-Date: 2014-01-28 18:24+0100\n"
"PO-Revision-Date: 2014-01-18 21:21+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6643,8 +6643,8 @@ msgstr "muestra el host en mensajes de salida/abandono"
msgid ""
"comma-separated list of messages to display after joining a channel: 329 = "
"channel creation date, 332 = topic, 333 = nick/date for topic, 366 = names "
"on channel"
"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names "
"on channel, 366 = names count"
msgstr ""
msgid "display old topic when channel topic is changed"

View File

@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-01-25 13:36+0100\n"
"PO-Revision-Date: 2014-01-25 13:36+0100\n"
"POT-Creation-Date: 2014-01-28 18:24+0100\n"
"PO-Revision-Date: 2014-01-28 18:25+0100\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@ -7040,12 +7040,12 @@ msgstr "afficher le nom d'hôte dans les messages part/quit"
msgid ""
"comma-separated list of messages to display after joining a channel: 329 = "
"channel creation date, 332 = topic, 333 = nick/date for topic, 366 = names "
"on channel"
"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names "
"on channel, 366 = names count"
msgstr ""
"liste de messages (séparés par des virgules) à afficher après avoir rejoint "
"un canal: 329 = date de création du canal, 332 = titre, 333 = pseudo/date "
"pour le titre, 366 = noms sur le canal"
"pour le titre, 353 = noms sur le canal, 366 = décompte des noms"
msgid "display old topic when channel topic is changed"
msgstr "afficher l'ancien titre lorsque le titre du canal est changé"

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-01-25 13:36+0100\n"
"POT-Creation-Date: 2014-01-28 18:24+0100\n"
"PO-Revision-Date: 2014-01-06 10:16+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5935,8 +5935,8 @@ msgstr "alapértelmezett kilépő üzenet"
msgid ""
"comma-separated list of messages to display after joining a channel: 329 = "
"channel creation date, 332 = topic, 333 = nick/date for topic, 366 = names "
"on channel"
"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names "
"on channel, 366 = names count"
msgstr ""
msgid "display old topic when channel topic is changed"

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-01-25 13:36+0100\n"
"POT-Creation-Date: 2014-01-28 18:24+0100\n"
"PO-Revision-Date: 2014-01-18 21:22+0100\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6775,10 +6775,11 @@ msgstr "visualizza l'host nei messaggi di entrata dal client locale"
msgid "display host in part/quit messages"
msgstr "visualizza host nei messaggi di uscita/abbandono"
#, fuzzy
msgid ""
"comma-separated list of messages to display after joining a channel: 329 = "
"channel creation date, 332 = topic, 333 = nick/date for topic, 366 = names "
"on channel"
"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names "
"on channel, 366 = names count"
msgstr ""
"elenco separato da virgole di messaggi da mostrare dopo l'ingresso in un "
"canale: 329 = data di creazione del canale, 332 = argomento, 333 = nick/data "

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-01-25 13:36+0100\n"
"POT-Creation-Date: 2014-01-28 18:24+0100\n"
"PO-Revision-Date: 2014-01-18 21:22+0100\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@ -6745,10 +6745,11 @@ msgstr "ローカルクライアントからの参加メッセージにホスト
msgid "display host in part/quit messages"
msgstr "退出/終了 メッセージにホスト名を表示"
#, fuzzy
msgid ""
"comma-separated list of messages to display after joining a channel: 329 = "
"channel creation date, 332 = topic, 333 = nick/date for topic, 366 = names "
"on channel"
"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names "
"on channel, 366 = names count"
msgstr ""
"チャンネルに参加した後に表示するメッセージのコンマ区切りリスト: 329 = チャン"
"ネル作成日、332 = トピック、333 = トピックを作成したニックネームおよび日付、"

View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-01-25 13:36+0100\n"
"POT-Creation-Date: 2014-01-28 18:24+0100\n"
"PO-Revision-Date: 2014-01-18 21:23+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6887,10 +6887,11 @@ msgstr "wyświetlaj host podczas wchodzenia na kanał"
msgid "display host in part/quit messages"
msgstr "pokazuj host w wiadomościach o opuszczeniu kanału/wyjściu z IRC"
#, fuzzy
msgid ""
"comma-separated list of messages to display after joining a channel: 329 = "
"channel creation date, 332 = topic, 333 = nick/date for topic, 366 = names "
"on channel"
"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names "
"on channel, 366 = names count"
msgstr ""
"oddzielona przecinkami lista wiadomości wyświetlanych po wejściu na kanał: "
"329 = data utworzenia, 332 = temat, 333 = autor/data tematu, 366 = osoby na "

View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-01-25 13:36+0100\n"
"POT-Creation-Date: 2014-01-28 18:24+0100\n"
"PO-Revision-Date: 2014-01-18 21:23+0100\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6157,8 +6157,8 @@ msgstr ""
msgid ""
"comma-separated list of messages to display after joining a channel: 329 = "
"channel creation date, 332 = topic, 333 = nick/date for topic, 366 = names "
"on channel"
"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names "
"on channel, 366 = names count"
msgstr ""
msgid "display old topic when channel topic is changed"

View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-01-25 13:36+0100\n"
"POT-Creation-Date: 2014-01-28 18:24+0100\n"
"PO-Revision-Date: 2014-01-06 10:17+0100\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5959,8 +5959,8 @@ msgstr "сообщение о выходе по-умолчанию"
msgid ""
"comma-separated list of messages to display after joining a channel: 329 = "
"channel creation date, 332 = topic, 333 = nick/date for topic, 366 = names "
"on channel"
"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names "
"on channel, 366 = names count"
msgstr ""
msgid "display old topic when channel topic is changed"

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-01-25 13:36+0100\n"
"POT-Creation-Date: 2014-01-28 18:24+0100\n"
"PO-Revision-Date: 2014-01-06 10:17+0100\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5254,8 +5254,8 @@ msgstr ""
msgid ""
"comma-separated list of messages to display after joining a channel: 329 = "
"channel creation date, 332 = topic, 333 = nick/date for topic, 366 = names "
"on channel"
"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names "
"on channel, 366 = names count"
msgstr ""
msgid "display old topic when channel topic is changed"

View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.4.1-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-01-25 13:36+0100\n"
"POT-Creation-Date: 2014-01-28 18:24+0100\n"
"PO-Revision-Date: 2013-02-14 18:20+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5210,8 +5210,8 @@ msgstr ""
msgid ""
"comma-separated list of messages to display after joining a channel: 329 = "
"channel creation date, 332 = topic, 333 = nick/date for topic, 366 = names "
"on channel"
"channel creation date, 332 = topic, 333 = nick/date for topic, 353 = names "
"on channel, 366 = names count"
msgstr ""
msgid "display old topic when channel topic is changed"

View File

@ -48,8 +48,8 @@ struct t_irc_channel
int limit; /* user limit (0 is limit not set) */
char *key; /* channel key (NULL if no key set) */
struct t_hashtable *join_msg_received; /* messages received after join: */
/* 366=names, 332/333=topic, */
/* 329=creation date */
/* 353=names, 366=names count, */
/* 332/333=topic, 329=creation date */
int checking_away; /* = 1 if checking away with WHO cmd */
char *away_message; /* to display away only once in pv */
int has_quit_server; /* =1 if nick has quit (pv only), to */

View File

@ -2314,8 +2314,8 @@ irc_config_init ()
"display_join_message", "string",
N_("comma-separated list of messages to display after joining a channel: "
"329 = channel creation date, 332 = topic, 333 = nick/date for topic, "
"366 = names on channel"),
NULL, 0, 0, "329,332,333", NULL, 0, NULL, NULL,
"353 = names on channel, 366 = names count"),
NULL, 0, 0, "329,332,333,366", NULL, 0, NULL, NULL,
&irc_config_change_look_display_join_message, NULL, NULL, NULL);
irc_config_look_display_old_topic = weechat_config_new_option (
irc_config_file, ptr_section,

View File

@ -4074,10 +4074,10 @@ IRC_PROTOCOL_CALLBACK(366)
ptr_channel = irc_channel_search (server, argv[3]);
if (ptr_channel && ptr_channel->nicks)
{
if (weechat_hashtable_has_key (ptr_channel->join_msg_received, command)
|| weechat_hashtable_has_key (irc_config_hashtable_display_join_message, command))
/* display users on channel */
if (weechat_hashtable_has_key (ptr_channel->join_msg_received, "353")
|| weechat_hashtable_has_key (irc_config_hashtable_display_join_message, "353"))
{
/* display users on channel */
infolist = weechat_infolist_get ("nicklist", ptr_channel->buffer, NULL);
if (infolist)
{
@ -4165,8 +4165,12 @@ IRC_PROTOCOL_CALLBACK(366)
}
weechat_infolist_free (infolist);
}
}
/* display number of nicks, ops, halfops & voices on the channel */
/* display number of nicks, ops, halfops & voices 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);
str_nicks_count[0] = '\0';
@ -4257,7 +4261,10 @@ IRC_PROTOCOL_CALLBACK(366)
}
if (ptr_channel)
weechat_hashtable_set (ptr_channel->join_msg_received, command, "1");
{
weechat_hashtable_set (ptr_channel->join_msg_received, "353", "1");
weechat_hashtable_set (ptr_channel->join_msg_received, "366", "1");
}
weechat_bar_item_update ("input_prompt");