diff --git a/ChangeLog b/ChangeLog index 489f5b82b..82c331e90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,6 +55,9 @@ Version 0.3.9 (under dev!) * fifo: ignore read failing with error EAGAIN (bug #37019) * guile: fix crash when unloading a script without pointer to interpreter * guile: fix path of guile include dirs in cmake build (patch #7790) +* irc: move options from core to irc plugin: weechat.look.nickmode to + irc.look.nick_mode (new type: integer with values: none/prefix/action/both) + and weechat.look.nickmode_empty to irc.look.nick_mode_empty * irc: fix bug with prefix chars which are in chanmodes with a type different from "B" (bug #36996) * irc: fix format of message "USER" (according to RFC 2812) (bug #36825) diff --git a/NEWS b/NEWS index b793f7547..706cee4b8 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ WeeChat Release Notes ===================== Sébastien Helleu -v0.3.9-dev, 2012-07-07 +v0.3.9-dev, 2012-08-20 Version 0.3.9 (under dev!) @@ -9,6 +9,10 @@ Version 0.3.9 (under dev!) Important release notes: +** options moved from core (weechat.conf) to irc plugin (irc.conf): +*** 'weechat.look.nickmode' moved to 'irc.look.nick_mode' (new type: integer + with values: none/prefix/action/both) +*** 'weechat.look.nickmode_empty' moved to 'irc.look.nick_mode_empty' * new bar item has been added: 'buffer_modes' and irc option 'irc.look.item_channel_modes' has been removed; to display irc channel modes in status bar (after channel name), you have to manually add the new item diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt index 0a2d9e988..6e5604b1e 100644 --- a/doc/de/autogen/user/irc_options.txt +++ b/doc/de/autogen/user/irc_options.txt @@ -238,6 +238,16 @@ ** Typ: integer ** Werte: off, speakers, speakers_highlights (Standardwert: `speakers`) +* [[option_irc.look.nick_mode]] *irc.look.nick_mode* +** Beschreibung: `display nick mode (op, voice, ...) before nick (none = never, prefix = in prefix only (default), action = in action messages only, both = prefix + action messages)` +** Typ: integer +** Werte: none, prefix, action, both (Standardwert: `prefix`) + +* [[option_irc.look.nick_mode_empty]] *irc.look.nick_mode_empty* +** Beschreibung: `display a space if nick mode is enabled but nick has no mode (not op, voice, ...)` +** Typ: boolesch +** Werte: on, off (Standardwert: `off`) + * [[option_irc.look.nick_prefix]] *irc.look.nick_prefix* ** Beschreibung: `Text, der im Chatfenster vor dem Nickname erscheinen soll` ** Typ: Zeichenkette diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt index 5548184ea..ee47e991c 100644 --- a/doc/de/autogen/user/weechat_options.txt +++ b/doc/de/autogen/user/weechat_options.txt @@ -593,16 +593,6 @@ ** Typ: integer ** Werte: 1 .. 10000 (Standardwert: `100`) -* [[option_weechat.look.nickmode]] *weechat.look.nickmode* -** Beschreibung: `vor dem Nicknamen wird der entsprechende Nickmode ((half)op/voice [@%+]) angezeigt` -** Typ: boolesch -** Werte: on, off (Standardwert: `on`) - -* [[option_weechat.look.nickmode_empty]] *weechat.look.nickmode_empty* -** Beschreibung: `Leerzeichen statt des Nickmode nutzen, wenn kein Nickmode ((half)op/voice [@%+]) vorhanden ist` -** Typ: boolesch -** Werte: on, off (Standardwert: `off`) - * [[option_weechat.look.paste_bracketed]] *weechat.look.paste_bracketed* ** Beschreibung: `aktiviert den "bracketed paste mode" des Terminals (wird nicht durch alle Terminals/Multiplexer unterstützt): Dieser Modus erlaubt das Einfügen von Steuersequenzen die in Klammern gesetzt sind. WeeChat kann dadurch ermitteln ob ein Text eingefügt oder geschrieben wurde ("ESC[200~", followed by the pasted text, followed by "ESC[201~")` ** Typ: boolesch diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt index f59bb6c72..76a5b20ba 100644 --- a/doc/en/autogen/user/irc_options.txt +++ b/doc/en/autogen/user/irc_options.txt @@ -238,6 +238,16 @@ ** type: integer ** values: off, speakers, speakers_highlights (default value: `speakers`) +* [[option_irc.look.nick_mode]] *irc.look.nick_mode* +** description: `display nick mode (op, voice, ...) before nick (none = never, prefix = in prefix only (default), action = in action messages only, both = prefix + action messages)` +** type: integer +** values: none, prefix, action, both (default value: `prefix`) + +* [[option_irc.look.nick_mode_empty]] *irc.look.nick_mode_empty* +** description: `display a space if nick mode is enabled but nick has no mode (not op, voice, ...)` +** type: boolean +** values: on, off (default value: `off`) + * [[option_irc.look.nick_prefix]] *irc.look.nick_prefix* ** description: `text to display before nick in chat window` ** type: string diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt index e39431950..f1372feb5 100644 --- a/doc/en/autogen/user/weechat_options.txt +++ b/doc/en/autogen/user/weechat_options.txt @@ -593,16 +593,6 @@ ** type: integer ** values: 1 .. 10000 (default value: `100`) -* [[option_weechat.look.nickmode]] *weechat.look.nickmode* -** description: `display nick mode ((half)op/voice) before each nick` -** type: boolean -** values: on, off (default value: `on`) - -* [[option_weechat.look.nickmode_empty]] *weechat.look.nickmode_empty* -** description: `display space if nick mode is not (half)op/voice` -** type: boolean -** values: on, off (default value: `off`) - * [[option_weechat.look.paste_bracketed]] *weechat.look.paste_bracketed* ** description: `enable terminal "bracketed paste mode" (not supported in all terminals/multiplexers): in this mode, pasted text is bracketed with control sequences so that WeeChat can differentiate pasted text from typed-in text ("ESC[200~", followed by the pasted text, followed by "ESC[201~")` ** type: boolean diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt index 760a4fc2c..119d60dfa 100644 --- a/doc/fr/autogen/user/irc_options.txt +++ b/doc/fr/autogen/user/irc_options.txt @@ -238,6 +238,16 @@ ** type: entier ** valeurs: off, speakers, speakers_highlights (valeur par défaut: `speakers`) +* [[option_irc.look.nick_mode]] *irc.look.nick_mode* +** description: `afficher le mode du pseudo (op, voice, ...) avant le pseudo (none = jamais, prefix = dans le préfixe seulement, action = dans les messages d'action seulement, both = préfixe + messages d'actions)` +** type: entier +** valeurs: none, prefix, action, both (valeur par défaut: `prefix`) + +* [[option_irc.look.nick_mode_empty]] *irc.look.nick_mode_empty* +** description: `afficher un espace si le mode du pseudo est activé mais que le pseudo n'a pas de mode (pas op, voice, ...)` +** type: booléen +** valeurs: on, off (valeur par défaut: `off`) + * [[option_irc.look.nick_prefix]] *irc.look.nick_prefix* ** description: `texte à afficher avant le pseudo dans la fenêtre de discussion` ** type: chaîne diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt index 248d08387..3efe8eeeb 100644 --- a/doc/fr/autogen/user/weechat_options.txt +++ b/doc/fr/autogen/user/weechat_options.txt @@ -593,16 +593,6 @@ ** type: entier ** valeurs: 1 .. 10000 (valeur par défaut: `100`) -* [[option_weechat.look.nickmode]] *weechat.look.nickmode* -** description: `afficher le mode du pseudo ((half)op/voice) devant chaque utilisateur` -** type: booléen -** valeurs: on, off (valeur par défaut: `on`) - -* [[option_weechat.look.nickmode_empty]] *weechat.look.nickmode_empty* -** description: `afficher un espace si le mode du pseudo n'est pas (half)op/voice` -** type: booléen -** valeurs: on, off (valeur par défaut: `off`) - * [[option_weechat.look.paste_bracketed]] *weechat.look.paste_bracketed* ** description: `activer le mode du terminal "bracketed paste" (pas supporté par tous les terminaux/multiplexeurs): dans ce mode, le texte collé est entouré avec des séquences de contrôle de sorte que WeeChat puisse différencier le texte collé du texté tapé ("ESC[200~", suivi par le texte collé, suivi par "ESC[201~")` ** type: booléen diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt index 6287ed3ca..79769c55e 100644 --- a/doc/it/autogen/user/irc_options.txt +++ b/doc/it/autogen/user/irc_options.txt @@ -238,6 +238,16 @@ ** tipo: intero ** valori: off, speakers, speakers_highlights (valore predefinito: `speakers`) +* [[option_irc.look.nick_mode]] *irc.look.nick_mode* +** descrizione: `display nick mode (op, voice, ...) before nick (none = never, prefix = in prefix only (default), action = in action messages only, both = prefix + action messages)` +** tipo: intero +** valori: none, prefix, action, both (valore predefinito: `prefix`) + +* [[option_irc.look.nick_mode_empty]] *irc.look.nick_mode_empty* +** descrizione: `display a space if nick mode is enabled but nick has no mode (not op, voice, ...)` +** tipo: bool +** valori: on, off (valore predefinito: `off`) + * [[option_irc.look.nick_prefix]] *irc.look.nick_prefix* ** descrizione: `testo da visualizzare prima del nick nella finestra di chat` ** tipo: stringa diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt index fc6dd9093..2235f3034 100644 --- a/doc/it/autogen/user/weechat_options.txt +++ b/doc/it/autogen/user/weechat_options.txt @@ -593,16 +593,6 @@ ** tipo: intero ** valori: 1 .. 10000 (valore predefinito: `100`) -* [[option_weechat.look.nickmode]] *weechat.look.nickmode* -** descrizione: `mostra modalità nick ((half)op/voice) prima di ogni nick` -** tipo: bool -** valori: on, off (valore predefinito: `on`) - -* [[option_weechat.look.nickmode_empty]] *weechat.look.nickmode_empty* -** descrizione: `mostra spazio se il nick non è in modalità (half)op/voice` -** tipo: bool -** valori: on, off (valore predefinito: `off`) - * [[option_weechat.look.paste_bracketed]] *weechat.look.paste_bracketed* ** descrizione: `abilita la modalità "bracketed paste" per il terminale (non supportata da tutti i terminali/multiplexer): in questa modalità, il testo incollato viene racchiuso da sequenze di controllo in modo che WeeChat possa differenziare il testo incollato dal testo digitato ("ESC[200~", seguito dal testo incollato, seguito da "ESC[201~")` ** tipo: bool diff --git a/doc/ja/autogen/user/irc_options.txt b/doc/ja/autogen/user/irc_options.txt index 5d11eb267..3918d07fe 100644 --- a/doc/ja/autogen/user/irc_options.txt +++ b/doc/ja/autogen/user/irc_options.txt @@ -238,6 +238,16 @@ ** タイプ: 整数 ** 値: off, speakers, speakers_highlights (デフォルト値: `speakers`) +* [[option_irc.look.nick_mode]] *irc.look.nick_mode* +** 説明: `display nick mode (op, voice, ...) before nick (none = never, prefix = in prefix only (default), action = in action messages only, both = prefix + action messages)` +** タイプ: 整数 +** 値: none, prefix, action, both (デフォルト値: `prefix`) + +* [[option_irc.look.nick_mode_empty]] *irc.look.nick_mode_empty* +** 説明: `display a space if nick mode is enabled but nick has no mode (not op, voice, ...)` +** タイプ: ブール +** 値: on, off (デフォルト値: `off`) + * [[option_irc.look.nick_prefix]] *irc.look.nick_prefix* ** 説明: `チャットウィンドウ内でニックネーム前に表示するテキスト` ** タイプ: 文字列 diff --git a/doc/ja/autogen/user/weechat_options.txt b/doc/ja/autogen/user/weechat_options.txt index a0041cab4..bacb156ec 100644 --- a/doc/ja/autogen/user/weechat_options.txt +++ b/doc/ja/autogen/user/weechat_options.txt @@ -593,16 +593,6 @@ ** タイプ: 整数 ** 値: 1 .. 10000 (デフォルト値: `100`) -* [[option_weechat.look.nickmode]] *weechat.look.nickmode* -** 説明: `それぞれのニックネームの前にニックモード ((half)op/voice) を表示` -** タイプ: ブール -** 値: on, off (デフォルト値: `on`) - -* [[option_weechat.look.nickmode_empty]] *weechat.look.nickmode_empty* -** 説明: `ニックモードが (half)op/voice でなければ空白を表示` -** タイプ: ブール -** 値: on, off (デフォルト値: `off`) - * [[option_weechat.look.paste_bracketed]] *weechat.look.paste_bracketed* ** 説明: `端末の「括弧付きペーストモード」を有効化 (一部の端末/マルチプレクサで利用可能): このモードでは、ペーストされたテキストはコントロールシーケンスで括られる。これにより WeeChat はペーストされたテキストとタイプされたテキストを区別する ("ESC[200~" 、ペーストされたテキスト、"ESC[201~")。` ** タイプ: ブール diff --git a/po/cs.po b/po/cs.po index 3bb93a703..72e66cd94 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-08-20 13:33+0200\n" -"PO-Revision-Date: 2012-08-16 12:01+0200\n" +"POT-Creation-Date: 2012-08-20 18:22+0200\n" +"PO-Revision-Date: 2012-08-20 15:20+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" "Language: Czech\n" @@ -2536,12 +2536,6 @@ msgid "" "before processing event" msgstr "" -msgid "display nick mode ((half)op/voice) before each nick" -msgstr "zobrazit mód přezdívky ((částečný)op/voice) před každou přezdívkou" - -msgid "display space if nick mode is not (half)op/voice" -msgstr "zobrazit mezeru pokud mód přezdívkz není (částečný)op/voice" - msgid "" "enable terminal \"bracketed paste mode\" (not supported in all terminals/" "multiplexers): in this mode, pasted text is bracketed with control sequences " @@ -5696,6 +5690,18 @@ msgstr "text pro zobrazení před přezdívkou v okně rozhovoru" msgid "text to display after nick in chat window" msgstr "text pro zobrazení za přezdívkou v okně rozhovoru" +msgid "" +"display nick mode (op, voice, ...) before nick (none = never, prefix = in " +"prefix only (default), action = in action messages only, both = prefix + " +"action messages)" +msgstr "" + +#, fuzzy +msgid "" +"display a space if nick mode is enabled but nick has no mode (not op, " +"voice, ...)" +msgstr "zobrazit mezeru pokud mód přezdívkz není (částečný)op/voice" + #, fuzzy msgid "" "force color for some nicks: hash computed with nickname to find color will " @@ -8994,7 +9000,3 @@ msgstr "" msgid "Constants" msgstr "" - -#, fuzzy -#~ msgid "%s: script \"%s\" held" -#~ msgstr "%s: skript \"%s\" odebrán" diff --git a/po/de.po b/po/de.po index f3cf7d69c..b9ee85211 100644 --- a/po/de.po +++ b/po/de.po @@ -23,8 +23,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-08-20 13:33+0200\n" -"PO-Revision-Date: 2012-08-16 12:01+0200\n" +"POT-Creation-Date: 2012-08-20 18:22+0200\n" +"PO-Revision-Date: 2012-08-20 15:20+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" "Language: \n" @@ -2799,16 +2799,6 @@ msgstr "" "Verzögerung (in Millisekunden) um eine Mauseingabe zu fangen: WeeChat wartet " "zuerst diese Verzögerung ab bevor das Kommando verarbeitet wird" -msgid "display nick mode ((half)op/voice) before each nick" -msgstr "" -"vor dem Nicknamen wird der entsprechende Nickmode ((half)op/voice [@%+]) " -"angezeigt" - -msgid "display space if nick mode is not (half)op/voice" -msgstr "" -"Leerzeichen statt des Nickmode nutzen, wenn kein Nickmode ((half)op/voice [@%" -"+]) vorhanden ist" - msgid "" "enable terminal \"bracketed paste mode\" (not supported in all terminals/" "multiplexers): in this mode, pasted text is bracketed with control sequences " @@ -6147,6 +6137,20 @@ msgstr "Text, der im Chatfenster vor dem Nickname erscheinen soll" msgid "text to display after nick in chat window" msgstr "Text, der im Chatfenster nach dem Nickname erscheinen soll" +msgid "" +"display nick mode (op, voice, ...) before nick (none = never, prefix = in " +"prefix only (default), action = in action messages only, both = prefix + " +"action messages)" +msgstr "" + +#, fuzzy +msgid "" +"display a space if nick mode is enabled but nick has no mode (not op, " +"voice, ...)" +msgstr "" +"Leerzeichen statt des Nickmode nutzen, wenn kein Nickmode ((half)op/voice [@%" +"+]) vorhanden ist" + msgid "" "force color for some nicks: hash computed with nickname to find color will " "not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " @@ -9577,7 +9581,3 @@ msgstr "Type" msgid "Constants" msgstr "Konstanten" - -#, fuzzy -#~ msgid "%s: script \"%s\" held" -#~ msgstr "%s: Das Skript \"%s\" wurde deinstalliert" diff --git a/po/es.po b/po/es.po index d540c5e36..4c3972ff9 100644 --- a/po/es.po +++ b/po/es.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-08-20 13:33+0200\n" -"PO-Revision-Date: 2012-08-16 12:01+0200\n" +"POT-Creation-Date: 2012-08-20 18:22+0200\n" +"PO-Revision-Date: 2012-08-20 15:20+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" "Language: Spanish\n" @@ -2682,12 +2682,6 @@ msgstr "" "retraso (en milisegundos) para tomar un evento del ratón: WeeChat esperará " "este retraso antes de procesar un evento" -msgid "display nick mode ((half)op/voice) before each nick" -msgstr "mostrar modo del usuario ((semi-)op/voz) antes de cada usuario" - -msgid "display space if nick mode is not (half)op/voice" -msgstr "mostrar un espacio si el modo de usuario no es (semi-)op/voz" - msgid "" "enable terminal \"bracketed paste mode\" (not supported in all terminals/" "multiplexers): in this mode, pasted text is bracketed with control sequences " @@ -5922,6 +5916,18 @@ msgstr "texto a mostrar antes del apodo en la ventana de charla" msgid "text to display after nick in chat window" msgstr "texto a mostrar tras el apodo en la ventana de charla" +msgid "" +"display nick mode (op, voice, ...) before nick (none = never, prefix = in " +"prefix only (default), action = in action messages only, both = prefix + " +"action messages)" +msgstr "" + +#, fuzzy +msgid "" +"display a space if nick mode is enabled but nick has no mode (not op, " +"voice, ...)" +msgstr "mostrar un espacio si el modo de usuario no es (semi-)op/voz" + msgid "" "force color for some nicks: hash computed with nickname to find color will " "not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " @@ -9277,7 +9283,3 @@ msgstr "Tipo" msgid "Constants" msgstr "Constantes" - -#, fuzzy -#~ msgid "%s: script \"%s\" held" -#~ msgstr "%s: script \"%s\" descargado" diff --git a/po/fr.po b/po/fr.po index f5689f166..699dbeae8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-08-20 13:33+0200\n" -"PO-Revision-Date: 2012-08-20 13:33+0200\n" +"POT-Creation-Date: 2012-08-20 18:22+0200\n" +"PO-Revision-Date: 2012-08-20 15:25+0200\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: French\n" @@ -2707,12 +2707,6 @@ msgstr "" "délai (en millisecondes) pour capturer un évènement de la souris: WeeChat " "attendra ce délai avant de traiter l'évènement" -msgid "display nick mode ((half)op/voice) before each nick" -msgstr "afficher le mode du pseudo ((half)op/voice) devant chaque utilisateur" - -msgid "display space if nick mode is not (half)op/voice" -msgstr "afficher un espace si le mode du pseudo n'est pas (half)op/voice" - msgid "" "enable terminal \"bracketed paste mode\" (not supported in all terminals/" "multiplexers): in this mode, pasted text is bracketed with control sequences " @@ -5979,6 +5973,22 @@ msgstr "texte à afficher avant le pseudo dans la fenêtre de discussion" msgid "text to display after nick in chat window" msgstr "texte à afficher après le pseudo dans la fenêtre de discussion" +msgid "" +"display nick mode (op, voice, ...) before nick (none = never, prefix = in " +"prefix only (default), action = in action messages only, both = prefix + " +"action messages)" +msgstr "" +"afficher le mode du pseudo (op, voice, ...) avant le pseudo (none = jamais, " +"prefix = dans le préfixe seulement, action = dans les messages d'action " +"seulement, both = préfixe + messages d'actions)" + +msgid "" +"display a space if nick mode is enabled but nick has no mode (not op, " +"voice, ...)" +msgstr "" +"afficher un espace si le mode du pseudo est activé mais que le pseudo n'a " +"pas de mode (pas op, voice, ...)" + msgid "" "force color for some nicks: hash computed with nickname to find color will " "not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " @@ -9421,12 +9431,3 @@ msgstr "Type" msgid "Constants" msgstr "Constantes" - -#~ msgid "Alt-keys/input" -#~ msgstr "Alt+touche/entrée" - -#~ msgid "Input" -#~ msgstr "Entrée" - -#~ msgid "%s: script \"%s\" held" -#~ msgstr "%s: script \"%s\" figé" diff --git a/po/hu.po b/po/hu.po index a664d8c8c..34dd82fd8 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-08-20 13:33+0200\n" -"PO-Revision-Date: 2012-08-16 12:01+0200\n" +"POT-Creation-Date: 2012-08-20 18:22+0200\n" +"PO-Revision-Date: 2012-08-20 15:20+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" "Language: Hungarian\n" @@ -2173,12 +2173,6 @@ msgid "" "before processing event" msgstr "" -msgid "display nick mode ((half)op/voice) before each nick" -msgstr "a felhasználó módjának ((fél)operátor/voice) mutatása a név előtt" - -msgid "display space if nick mode is not (half)op/voice" -msgstr "szóköz megjelenítése, ha a mód nem (fél)operátor/voice" - msgid "" "enable terminal \"bracketed paste mode\" (not supported in all terminals/" "multiplexers): in this mode, pasted text is bracketed with control sequences " @@ -5279,6 +5273,18 @@ msgstr "a név előtt megjelenítendő szöveg a beszédablakban" msgid "text to display after nick in chat window" msgstr "a név után megjelenítendő szöveg a beszédablakban" +msgid "" +"display nick mode (op, voice, ...) before nick (none = never, prefix = in " +"prefix only (default), action = in action messages only, both = prefix + " +"action messages)" +msgstr "" + +#, fuzzy +msgid "" +"display a space if nick mode is enabled but nick has no mode (not op, " +"voice, ...)" +msgstr "szóköz megjelenítése, ha a mód nem (fél)operátor/voice" + msgid "" "force color for some nicks: hash computed with nickname to find color will " "not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " @@ -8491,7 +8497,3 @@ msgstr "" msgid "Constants" msgstr "" - -#, fuzzy -#~ msgid "%s: script \"%s\" held" -#~ msgstr "A \"%s\" modul eltávolítva.\n" diff --git a/po/it.po b/po/it.po index adf94702a..44978c8ef 100644 --- a/po/it.po +++ b/po/it.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-08-20 13:33+0200\n" -"PO-Revision-Date: 2012-08-16 12:01+0200\n" +"POT-Creation-Date: 2012-08-20 18:22+0200\n" +"PO-Revision-Date: 2012-08-20 15:20+0200\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" "Language: Italian\n" @@ -2674,12 +2674,6 @@ msgstr "" "ritardo (in millisecondi) per catturare un evento del mouse: WeeChat attende " "questo ritardo prima di analizzare l'evento" -msgid "display nick mode ((half)op/voice) before each nick" -msgstr "mostra modalità nick ((half)op/voice) prima di ogni nick" - -msgid "display space if nick mode is not (half)op/voice" -msgstr "mostra spazio se il nick non è in modalità (half)op/voice" - msgid "" "enable terminal \"bracketed paste mode\" (not supported in all terminals/" "multiplexers): in this mode, pasted text is bracketed with control sequences " @@ -5901,6 +5895,18 @@ msgstr "testo da visualizzare prima del nick nella finestra di chat" msgid "text to display after nick in chat window" msgstr "testo da visualizzare dopo il nick nella finestra di chat" +msgid "" +"display nick mode (op, voice, ...) before nick (none = never, prefix = in " +"prefix only (default), action = in action messages only, both = prefix + " +"action messages)" +msgstr "" + +#, fuzzy +msgid "" +"display a space if nick mode is enabled but nick has no mode (not op, " +"voice, ...)" +msgstr "mostra spazio se il nick non è in modalità (half)op/voice" + msgid "" "force color for some nicks: hash computed with nickname to find color will " "not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " @@ -9254,7 +9260,3 @@ msgstr "Tipo" msgid "Constants" msgstr "Costanti" - -#, fuzzy -#~ msgid "%s: script \"%s\" held" -#~ msgstr "%s: script \"%s\" scaricato" diff --git a/po/ja.po b/po/ja.po index 23137ccc6..e7169dee4 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-08-20 13:33+0200\n" -"PO-Revision-Date: 2012-08-16 12:01+0200\n" +"POT-Creation-Date: 2012-08-20 18:22+0200\n" +"PO-Revision-Date: 2012-08-20 15:20+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -2630,12 +2630,6 @@ msgstr "" "マウスイベントを横取りするための遅延 (ミリ秒): WeeChat はイベント処理前にこの" "遅延時間だけ待つ" -msgid "display nick mode ((half)op/voice) before each nick" -msgstr "それぞれのニックネームの前にニックモード ((half)op/voice) を表示" - -msgid "display space if nick mode is not (half)op/voice" -msgstr "ニックモードが (half)op/voice でなければ空白を表示" - msgid "" "enable terminal \"bracketed paste mode\" (not supported in all terminals/" "multiplexers): in this mode, pasted text is bracketed with control sequences " @@ -5775,6 +5769,18 @@ msgstr "チャットウィンドウ内でニックネーム前に表示するテ msgid "text to display after nick in chat window" msgstr "チャットウィンドウ内でニックネーム後に表示するテキスト" +msgid "" +"display nick mode (op, voice, ...) before nick (none = never, prefix = in " +"prefix only (default), action = in action messages only, both = prefix + " +"action messages)" +msgstr "" + +#, fuzzy +msgid "" +"display a space if nick mode is enabled but nick has no mode (not op, " +"voice, ...)" +msgstr "ニックモードが (half)op/voice でなければ空白を表示" + msgid "" "force color for some nicks: hash computed with nickname to find color will " "not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " @@ -9047,7 +9053,3 @@ msgstr "タイプ" msgid "Constants" msgstr "定数" - -#, fuzzy -#~ msgid "%s: script \"%s\" held" -#~ msgstr "%s: スクリプト \"%s\" がアンロードされました" diff --git a/po/pl.po b/po/pl.po index 941b7baa7..04ba714fd 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-08-20 13:33+0200\n" -"PO-Revision-Date: 2012-08-16 12:01+0200\n" +"POT-Creation-Date: 2012-08-20 18:22+0200\n" +"PO-Revision-Date: 2012-08-20 15:20+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" "Language: Polish\n" @@ -2680,12 +2680,6 @@ msgstr "" "odstęp (w milisekundach) przechwytywania zdarzeń myszy: WeeChat zawsze " "poczeka ten czas przed obsługą zdarzenia" -msgid "display nick mode ((half)op/voice) before each nick" -msgstr "wyświetl atrybut nicku ((half)op/voice) przed każdym nickiem" - -msgid "display space if nick mode is not (half)op/voice" -msgstr "wyświetl spację jeśli atrybut nick nie ma atrybutu" - msgid "" "enable terminal \"bracketed paste mode\" (not supported in all terminals/" "multiplexers): in this mode, pasted text is bracketed with control sequences " @@ -5885,6 +5879,18 @@ msgstr "teks wyświetlany przed nickiem w oknie rozmowy" msgid "text to display after nick in chat window" msgstr "teks wyświetlany za nickiem w oknie rozmowy" +msgid "" +"display nick mode (op, voice, ...) before nick (none = never, prefix = in " +"prefix only (default), action = in action messages only, both = prefix + " +"action messages)" +msgstr "" + +#, fuzzy +msgid "" +"display a space if nick mode is enabled but nick has no mode (not op, " +"voice, ...)" +msgstr "wyświetl spację jeśli atrybut nick nie ma atrybutu" + msgid "" "force color for some nicks: hash computed with nickname to find color will " "not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " @@ -9186,7 +9192,3 @@ msgstr "Typ" msgid "Constants" msgstr "Stałe" - -#, fuzzy -#~ msgid "%s: script \"%s\" held" -#~ msgstr "%s: skrypt \"%s\" wyładowano" diff --git a/po/pt_BR.po b/po/pt_BR.po index e3a109ee6..fad131393 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-08-20 13:33+0200\n" -"PO-Revision-Date: 2012-08-16 12:02+0200\n" +"POT-Creation-Date: 2012-08-20 18:22+0200\n" +"PO-Revision-Date: 2012-08-20 15:20+0200\n" "Last-Translator: Sergio Durigan Junior \n" "Language-Team: weechat-dev \n" "Language: Portuguese\n" @@ -2613,12 +2613,6 @@ msgid "" "before processing event" msgstr "" -msgid "display nick mode ((half)op/voice) before each nick" -msgstr "mostra o modo do apelido ((half)op/voice) antes de cada nick" - -msgid "display space if nick mode is not (half)op/voice" -msgstr "mostra espaço se o modo do apelido não é (half)op/voice" - msgid "" "enable terminal \"bracketed paste mode\" (not supported in all terminals/" "multiplexers): in this mode, pasted text is bracketed with control sequences " @@ -5442,6 +5436,18 @@ msgstr "texto a ser exibido antes do apelido na janela de chat" msgid "text to display after nick in chat window" msgstr "texto a ser exibido depois do apelido na janela de chat" +msgid "" +"display nick mode (op, voice, ...) before nick (none = never, prefix = in " +"prefix only (default), action = in action messages only, both = prefix + " +"action messages)" +msgstr "" + +#, fuzzy +msgid "" +"display a space if nick mode is enabled but nick has no mode (not op, " +"voice, ...)" +msgstr "mostra espaço se o modo do apelido não é (half)op/voice" + #, fuzzy msgid "" "force color for some nicks: hash computed with nickname to find color will " @@ -8632,7 +8638,3 @@ msgstr "" msgid "Constants" msgstr "" - -#, fuzzy -#~ msgid "%s: script \"%s\" held" -#~ msgstr "%s: script \"%s\" descarregado" diff --git a/po/ru.po b/po/ru.po index 7afc27c5c..738f6ad4b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-08-20 13:33+0200\n" -"PO-Revision-Date: 2012-08-16 12:02+0200\n" +"POT-Creation-Date: 2012-08-20 18:22+0200\n" +"PO-Revision-Date: 2012-08-20 15:20+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" "Language: Russian\n" @@ -2200,12 +2200,6 @@ msgid "" "before processing event" msgstr "" -msgid "display nick mode ((half)op/voice) before each nick" -msgstr "отображать режим ника (op/voice) перед каждым ником" - -msgid "display space if nick mode is not (half)op/voice" -msgstr "оставлять пробел, если ник не op/voice" - msgid "" "enable terminal \"bracketed paste mode\" (not supported in all terminals/" "multiplexers): in this mode, pasted text is bracketed with control sequences " @@ -5296,6 +5290,18 @@ msgstr "текст, который отображать до ника в окн msgid "text to display after nick in chat window" msgstr "текст, который отображать после ника в окне чата" +msgid "" +"display nick mode (op, voice, ...) before nick (none = never, prefix = in " +"prefix only (default), action = in action messages only, both = prefix + " +"action messages)" +msgstr "" + +#, fuzzy +msgid "" +"display a space if nick mode is enabled but nick has no mode (not op, " +"voice, ...)" +msgstr "оставлять пробел, если ник не op/voice" + msgid "" "force color for some nicks: hash computed with nickname to find color will " "not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " @@ -8510,7 +8516,3 @@ msgstr "" msgid "Constants" msgstr "" - -#, fuzzy -#~ msgid "%s: script \"%s\" held" -#~ msgstr "Plugin \"%s\" выгружен.\n" diff --git a/po/weechat.pot b/po/weechat.pot index bc3dd3186..33dfecd56 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-08-20 13:33+0200\n" +"POT-Creation-Date: 2012-08-20 18:22+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1920,12 +1920,6 @@ msgid "" "before processing event" msgstr "" -msgid "display nick mode ((half)op/voice) before each nick" -msgstr "" - -msgid "display space if nick mode is not (half)op/voice" -msgstr "" - msgid "" "enable terminal \"bracketed paste mode\" (not supported in all terminals/" "multiplexers): in this mode, pasted text is bracketed with control sequences " @@ -4548,6 +4542,17 @@ msgstr "" msgid "text to display after nick in chat window" msgstr "" +msgid "" +"display nick mode (op, voice, ...) before nick (none = never, prefix = in " +"prefix only (default), action = in action messages only, both = prefix + " +"action messages)" +msgstr "" + +msgid "" +"display a space if nick mode is enabled but nick has no mode (not op, " +"voice, ...)" +msgstr "" + msgid "" "force color for some nicks: hash computed with nickname to find color will " "not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " diff --git a/src/core/wee-config.c b/src/core/wee-config.c index fedbc0f66..7070fe75f 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -127,8 +127,6 @@ struct t_config_option *config_look_jump_previous_buffer_when_closing; struct t_config_option *config_look_jump_smart_back_to_buffer; struct t_config_option *config_look_mouse; struct t_config_option *config_look_mouse_timer_delay; -struct t_config_option *config_look_nickmode; -struct t_config_option *config_look_nickmode_empty; struct t_config_option *config_look_paste_bracketed; struct t_config_option *config_look_paste_bracketed_timer_delay; struct t_config_option *config_look_paste_max_lines; @@ -2074,16 +2072,6 @@ config_weechat_init_options () N_("delay (in milliseconds) to grab a mouse event: WeeChat will " "wait this delay before processing event"), NULL, 1, 10000, "100", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); - config_look_nickmode = config_file_new_option ( - weechat_config_file, ptr_section, - "nickmode", "boolean", - N_("display nick mode ((half)op/voice) before each nick"), - NULL, 0, 0, "on", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL); - config_look_nickmode_empty = config_file_new_option ( - weechat_config_file, ptr_section, - "nickmode_empty", "boolean", - N_("display space if nick mode is not (half)op/voice"), - NULL, 0, 0, "off", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL); config_look_paste_bracketed = config_file_new_option ( weechat_config_file, ptr_section, "paste_bracketed", "boolean", diff --git a/src/core/wee-config.h b/src/core/wee-config.h index b45283cc1..1834b04e5 100644 --- a/src/core/wee-config.h +++ b/src/core/wee-config.h @@ -150,8 +150,6 @@ extern struct t_config_option *config_look_jump_previous_buffer_when_closing; extern struct t_config_option *config_look_jump_smart_back_to_buffer; extern struct t_config_option *config_look_mouse; extern struct t_config_option *config_look_mouse_timer_delay; -extern struct t_config_option *config_look_nickmode; -extern struct t_config_option *config_look_nickmode_empty; extern struct t_config_option *config_look_paste_bracketed; extern struct t_config_option *config_look_paste_bracketed_timer_delay; extern struct t_config_option *config_look_paste_max_lines; diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index f15ffdd2e..a8463732a 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -344,19 +344,23 @@ irc_command_me_channel_display (struct t_irc_server *server, const char *arguments) { char *string; + struct t_irc_nick *ptr_nick; string = (arguments && arguments[0]) ? irc_color_decode (arguments, weechat_config_boolean (irc_config_network_colors_receive)) : NULL; + ptr_nick = irc_nick_search (server, channel, server->nick); weechat_printf_tags (channel->buffer, irc_protocol_tags ("privmsg", "irc_action,notify_none,no_highlight", server->nick), - "%s%s%s%s %s", + "%s%s%s%s%s%s%s", weechat_prefix ("action"), + irc_nick_mode_for_display (server, ptr_nick, 0), IRC_COLOR_CHAT_NICK_SELF, server->nick, - IRC_COLOR_RESET, + (string) ? IRC_COLOR_RESET : "", + (string) ? " " : "", (string) ? string : ""); if (string) free (string); diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index a9b85b316..ff4773a53 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -62,6 +62,8 @@ struct t_config_option *irc_config_look_new_channel_position; struct t_config_option *irc_config_look_new_pv_position; struct t_config_option *irc_config_look_nick_prefix; struct t_config_option *irc_config_look_nick_suffix; +struct t_config_option *irc_config_look_nick_mode; +struct t_config_option *irc_config_look_nick_mode_empty; struct t_config_option *irc_config_look_nick_color_force; struct t_config_option *irc_config_look_nick_color_stop_chars; struct t_config_option *irc_config_look_nick_completion_smart; @@ -2074,6 +2076,21 @@ irc_config_init () "nick_suffix", "string", N_("text to display after nick in chat window"), NULL, 0, 0, "", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_look_nick_mode = weechat_config_new_option ( + irc_config_file, ptr_section, + "nick_mode", "integer", + N_("display nick mode (op, voice, ...) before nick (none = never, " + "prefix = in prefix only (default), action = in action messages " + "only, both = prefix + action messages)"), + "none|prefix|action|both", 0, 0, "prefix", + NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_look_nick_mode_empty = weechat_config_new_option ( + irc_config_file, ptr_section, + "nick_mode_empty", "boolean", + N_("display a space if nick mode is enabled but nick has no mode (not " + "op, voice, ...)"), + NULL, 0, 0, "off", NULL, 0, NULL, NULL, + NULL, NULL, NULL, NULL); irc_config_look_nick_color_force = weechat_config_new_option ( irc_config_file, ptr_section, "nick_color_force", "string", diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h index 1d03a8b37..cdc95c21d 100644 --- a/src/plugins/irc/irc-config.h +++ b/src/plugins/irc/irc-config.h @@ -55,6 +55,14 @@ enum t_irc_config_look_notice_as_pv IRC_CONFIG_LOOK_NOTICE_AS_PV_ALWAYS, }; +enum t_irc_config_look_nick_mode +{ + IRC_CONFIG_LOOK_NICK_MODE_NONE = 0, + IRC_CONFIG_LOOK_NICK_MODE_PREFIX, + IRC_CONFIG_LOOK_NICK_MODE_ACTION, + IRC_CONFIG_LOOK_NICK_MODE_BOTH, +}; + enum t_irc_config_nick_completion { IRC_CONFIG_NICK_COMPLETION_SMART_OFF = 0, @@ -87,6 +95,8 @@ extern struct t_config_option *irc_config_look_new_channel_position; extern struct t_config_option *irc_config_look_new_pv_position; extern struct t_config_option *irc_config_look_nick_prefix; extern struct t_config_option *irc_config_look_nick_suffix; +extern struct t_config_option *irc_config_look_nick_mode; +extern struct t_config_option *irc_config_look_nick_mode_empty; extern struct t_config_option *irc_config_look_nick_color_force; extern struct t_config_option *irc_config_look_nick_color_stop_chars; extern struct t_config_option *irc_config_look_nick_completion_smart; diff --git a/src/plugins/irc/irc-ctcp.c b/src/plugins/irc/irc-ctcp.c index 518765997..860177eed 100644 --- a/src/plugins/irc/irc-ctcp.c +++ b/src/plugins/irc/irc-ctcp.c @@ -946,8 +946,9 @@ irc_ctcp_recv (struct t_irc_server *server, const char *command, "irc_action,notify_none,no_highlight" : "irc_action,notify_message", nick), - "%s%s%s%s%s%s", + "%s%s%s%s%s%s%s", weechat_prefix ("action"), + irc_nick_mode_for_display (server, ptr_nick, 0), (ptr_nick) ? ptr_nick->color : ((nick) ? irc_nick_find_color (nick) : IRC_COLOR_CHAT_NICK), nick, (pos_args) ? IRC_COLOR_RESET : "", diff --git a/src/plugins/irc/irc-nick.c b/src/plugins/irc/irc-nick.c index ab33b6f1d..00b7bb24e 100644 --- a/src/plugins/irc/irc-nick.c +++ b/src/plugins/irc/irc-nick.c @@ -879,51 +879,75 @@ irc_nick_set_away (struct t_irc_server *server, struct t_irc_channel *channel, } /* - * irc_nick_as_prefix: return string with nick to display as prefix on buffer - * (string will end by a tab) + * irc_nick_mode_for_display: get nick mode for display (color + mode) + * if prefix == 1, return string for display in + * prefix, otherwise return string for display in + * action message (/me) */ -char * -irc_nick_as_prefix (struct t_irc_server *server, struct t_irc_nick *nick, - const char *nickname, const char *force_color) +const char * +irc_nick_mode_for_display (struct t_irc_server *server, struct t_irc_nick *nick, + int prefix) { - static char result[256]; - char prefix[2]; + static char result[32]; + char str_prefix[2]; + int nick_mode; const char *str_prefix_color; - prefix[0] = (nick) ? nick->prefix[0] : '\0'; - prefix[1] = '\0'; - if (weechat_config_boolean (weechat_config_get ("weechat.look.nickmode"))) + str_prefix[0] = (nick) ? nick->prefix[0] : '\0'; + str_prefix[1] = '\0'; + + nick_mode = weechat_config_integer (irc_config_look_nick_mode); + if ((nick_mode == IRC_CONFIG_LOOK_NICK_MODE_BOTH) + || (prefix && (nick_mode == IRC_CONFIG_LOOK_NICK_MODE_PREFIX)) + || (!prefix && (nick_mode == IRC_CONFIG_LOOK_NICK_MODE_ACTION))) { if (nick) { - if ((prefix[0] == ' ') - && !weechat_config_boolean (weechat_config_get ("weechat.look.nickmode_empty"))) - prefix[0] = '\0'; + if ((str_prefix[0] == ' ') + && (!prefix || !weechat_config_boolean (irc_config_look_nick_mode_empty))) + { + str_prefix[0] = '\0'; + } str_prefix_color = weechat_color (irc_nick_get_prefix_color_name (server, nick)); } else { - prefix[0] = (weechat_config_boolean (weechat_config_get ("weechat.look.nickmode_empty"))) ? + str_prefix[0] = (prefix && weechat_config_boolean (irc_config_look_nick_mode_empty)) ? ' ' : '\0'; str_prefix_color = IRC_COLOR_RESET; } } else { - prefix[0] = '\0'; + str_prefix[0] = '\0'; str_prefix_color = IRC_COLOR_RESET; } - snprintf (result, sizeof (result), "%s%s%s%s%s%s%s%s\t", + snprintf (result, sizeof (result), "%s%s", str_prefix_color, str_prefix); + + return result; +} + +/* + * irc_nick_as_prefix: return string with nick to display as prefix on buffer + * (string will end by a tab) + */ + +const char * +irc_nick_as_prefix (struct t_irc_server *server, struct t_irc_nick *nick, + const char *nickname, const char *force_color) +{ + static char result[256]; + + snprintf (result, sizeof (result), "%s%s%s%s%s%s%s\t", (weechat_config_string (irc_config_look_nick_prefix) && weechat_config_string (irc_config_look_nick_prefix)[0]) ? IRC_COLOR_NICK_PREFIX : "", (weechat_config_string (irc_config_look_nick_prefix) && weechat_config_string (irc_config_look_nick_prefix)[0]) ? weechat_config_string (irc_config_look_nick_prefix) : "", - str_prefix_color, - prefix, + irc_nick_mode_for_display (server, nick, 1), (force_color) ? force_color : ((nick) ? nick->color : ((nickname) ? irc_nick_find_color (nickname) : IRC_COLOR_CHAT_NICK)), (nick) ? nick->name : nickname, (weechat_config_string (irc_config_look_nick_suffix) diff --git a/src/plugins/irc/irc-nick.h b/src/plugins/irc/irc-nick.h index 6efc948aa..497759c87 100644 --- a/src/plugins/irc/irc-nick.h +++ b/src/plugins/irc/irc-nick.h @@ -85,10 +85,13 @@ extern void irc_nick_count (struct t_irc_server *server, extern void irc_nick_set_away (struct t_irc_server *server, struct t_irc_channel *channel, struct t_irc_nick *nick, int is_away); -extern char *irc_nick_as_prefix (struct t_irc_server *server, - struct t_irc_nick *nick, - const char *nickname, - const char *force_color); +extern const char *irc_nick_mode_for_display (struct t_irc_server *server, + struct t_irc_nick *nick, + int prefix); +extern const char *irc_nick_as_prefix (struct t_irc_server *server, + struct t_irc_nick *nick, + const char *nickname, + const char *force_color); extern const char *irc_nick_color_for_message (struct t_irc_server *server, struct t_irc_nick *nick, const char *nickname);