From 64c227b5138f12533a658dc744066d6ea1907e77 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Thu, 23 Oct 2008 18:40:19 +0200 Subject: [PATCH] Add option to toggle display of IRC channel modes after buffer name in status bar (irc.look.display_channel_modes) --- po/cs.po | 32 +++++++++++++++++--------------- po/de.po | 32 +++++++++++++++++--------------- po/es.po | 26 +++++++++++--------------- po/fr.po | 34 ++++++++++++++++++---------------- po/hu.po | 32 +++++++++++++++++--------------- po/ru.po | 32 +++++++++++++++++--------------- po/weechat.pot | 17 ++++------------- src/plugins/irc/irc-bar-item.c | 1 + src/plugins/irc/irc-config.c | 17 +++++++++++++++++ src/plugins/irc/irc-config.h | 1 + 10 files changed, 120 insertions(+), 104 deletions(-) diff --git a/po/cs.po b/po/cs.po index 99929585e..8f4a45d46 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2008-10-18 16:15+0200\n" +"POT-Creation-Date: 2008-10-23 18:35+0200\n" "PO-Revision-Date: 2008-09-17 16:19+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -1185,14 +1185,6 @@ msgstr "" "[skupina_číslo_vzestupně], group_number_desc [skupina_číslo_sestupně], " "number_asc [číslo_vzestupně], number_desc [číslo_sestupně] ) " -#, c-format -msgid "" -"format for input prompt ('%c' is replaced by channel or server, '%n' by nick " -"and '%m' by nick modes)" -msgstr "" -"formát vstupního řádku ('%c' se přepíše na jeméno kanálu nebo serveru, '%n' " -"se přepíše na přezdívku a '%m' na módy přezdívky" - #, fuzzy msgid "time format for \"time\" bar item" msgstr "časová značka pro čas v infobaru" @@ -1984,12 +1976,6 @@ msgstr "Nedostatek paměti pro nový řádek\n" msgid "Error: not enough memory to add a buffer to hotlist" msgstr "%s nemohu přidat buffer do hotlistu\n" -msgid "Text search (exact): " -msgstr "Vyhledávání textu (rozlišování velikosti znaků): " - -msgid "Text search: " -msgstr "Vyhledávání textu: " - #, fuzzy, c-format msgid "Error: unable to bind key \"%s\"" msgstr "%s nemohu napojit kalávesu \"%s\"\n" @@ -3463,6 +3449,9 @@ msgstr "chytré doplňování přezdívek (doplňovat posledně mluvící jako p msgid "display message when (un)marking as away" msgstr "zobrazit zprávu, když označen/odznačen jako nepřítomen" +msgid "display channel modes in \"buffer_name\" bar item" +msgstr "" + msgid "" "comma separated list of tags for messages that may produce highlight " "(usually any message from another user, not server messages,..)" @@ -4893,6 +4882,19 @@ msgstr "%s DCC: nemohu nastavit 'neblokovaci' volbu na soket\n" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s chybí argument pro volbu \"%s\"\n" +#~ msgid "" +#~ "format for input prompt ('%c' is replaced by channel or server, '%n' by " +#~ "nick and '%m' by nick modes)" +#~ msgstr "" +#~ "formát vstupního řádku ('%c' se přepíše na jeméno kanálu nebo serveru, '%" +#~ "n' se přepíše na přezdívku a '%m' na módy přezdívky" + +#~ msgid "Text search (exact): " +#~ msgstr "Vyhledávání textu (rozlišování velikosti znaků): " + +#~ msgid "Text search: " +#~ msgstr "Vyhledávání textu: " + #, fuzzy #~ msgid "%s: creating new speller for lang \"%s\"" #~ msgstr "%s nedostatek paměti pro infobar zprávu\n" diff --git a/po/de.po b/po/de.po index 91eb82036..624be0cef 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2008-10-18 16:15+0200\n" +"POT-Creation-Date: 2008-10-23 18:35+0200\n" "PO-Revision-Date: 2007-09-06 12:44+0200\n" "Last-Translator: Thomas Schuetz \n" "Language-Team: weechat-dev \n" @@ -1144,14 +1144,6 @@ msgid "" "group_number_asc, group_number_desc, number_asc, number_desc)" msgstr "" -#, c-format -msgid "" -"format for input prompt ('%c' is replaced by channel or server, '%n' by nick " -"and '%m' by nick modes)" -msgstr "" -"Format der Eingabezeile ('%c' wird durch den Channel- oder Servernamen " -"ersetzt, '%n' durch den Nicknamen und '%m' durch die Nick-Modi)" - #, fuzzy msgid "time format for \"time\" bar item" msgstr "Timestamp in der Infobar" @@ -1932,12 +1924,6 @@ msgstr "Nicht genügend Speicher für neue Zeile\n" msgid "Error: not enough memory to add a buffer to hotlist" msgstr "%s Puffer kann nicht zur Hotlist hinzugefügt werden\n" -msgid "Text search (exact): " -msgstr "Textsuche (genau)" - -msgid "Text search: " -msgstr "Textsuche" - #, fuzzy, c-format msgid "Error: unable to bind key \"%s\"" msgstr "%s kann die Taste \"%s\" nicht zuordnen\n" @@ -3380,6 +3366,9 @@ msgstr "" msgid "display message when (un)marking as away" msgstr "bei Abwesenheit und Rückkehr eine Nachricht anzeigen" +msgid "display channel modes in \"buffer_name\" bar item" +msgstr "" + msgid "" "comma separated list of tags for messages that may produce highlight " "(usually any message from another user, not server messages,..)" @@ -4793,6 +4782,19 @@ msgstr "%s DCC: kann die 'nonblock'-Option für den Socket nicht festlegen\n" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s fehlende Argumente für die \"--dir\"-Option\n" +#~ msgid "" +#~ "format for input prompt ('%c' is replaced by channel or server, '%n' by " +#~ "nick and '%m' by nick modes)" +#~ msgstr "" +#~ "Format der Eingabezeile ('%c' wird durch den Channel- oder Servernamen " +#~ "ersetzt, '%n' durch den Nicknamen und '%m' durch die Nick-Modi)" + +#~ msgid "Text search (exact): " +#~ msgstr "Textsuche (genau)" + +#~ msgid "Text search: " +#~ msgstr "Textsuche" + #, fuzzy #~ msgid "%s: creating new speller for lang \"%s\"" #~ msgstr "%s nicht genügend Speicher für Infobar-Nachricht\n" diff --git a/po/es.po b/po/es.po index 14d118c5f..a001ff3ae 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2008-10-18 16:15+0200\n" +"POT-Creation-Date: 2008-10-23 18:35+0200\n" "PO-Revision-Date: 2007-09-19 12:09+0200\n" "Last-Translator: Roberto González Cardenete \n" "Language-Team: weechat-dev \n" @@ -1121,14 +1121,6 @@ msgid "" "group_number_asc, group_number_desc, number_asc, number_desc)" msgstr "" -#, c-format -msgid "" -"format for input prompt ('%c' is replaced by channel or server, '%n' by nick " -"and '%m' by nick modes)" -msgstr "" -"formato para el prompt de entrada ('%c' es reemplazado por un canal o " -"servidor, '%n' por un nick y '%m' por modos de nick)" - #, fuzzy msgid "time format for \"time\" bar item" msgstr "fecha y hora para las conversaciones guardadas" @@ -1912,12 +1904,6 @@ msgstr "No hay suficiente memoria para una nueva línea\n" msgid "Error: not enough memory to add a buffer to hotlist" msgstr "%s no es posible añadir un búfer a la lista caliente (hotlist)\n" -msgid "Text search (exact): " -msgstr "" - -msgid "Text search: " -msgstr "" - #, fuzzy, c-format msgid "Error: unable to bind key \"%s\"" msgstr "%s No ha sido posible atar la clave \"%s\"\n" @@ -3371,6 +3357,9 @@ msgstr "" msgid "display message when (un)marking as away" msgstr "mostrar mensaje cuando se marque/desmarque como ausente" +msgid "display channel modes in \"buffer_name\" bar item" +msgstr "" + msgid "" "comma separated list of tags for messages that may produce highlight " "(usually any message from another user, not server messages,..)" @@ -4798,6 +4787,13 @@ msgstr "%s no es posible crear el servidor\n" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s falta un argumento para la opción --dir\n" +#~ msgid "" +#~ "format for input prompt ('%c' is replaced by channel or server, '%n' by " +#~ "nick and '%m' by nick modes)" +#~ msgstr "" +#~ "formato para el prompt de entrada ('%c' es reemplazado por un canal o " +#~ "servidor, '%n' por un nick y '%m' por modos de nick)" + #, fuzzy #~ msgid "%s: creating new speller for lang \"%s\"" #~ msgstr "" diff --git a/po/fr.po b/po/fr.po index a66d1bf67..fab5e67fa 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2008-10-18 16:15+0200\n" -"PO-Revision-Date: 2008-10-18 15:35+0200\n" +"POT-Creation-Date: 2008-10-23 18:35+0200\n" +"PO-Revision-Date: 2008-10-23 18:38+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -1199,14 +1199,6 @@ msgstr "" "group_time_desc, group_number_asc, group_number_desc, number_asc, " "number_desc)" -#, c-format -msgid "" -"format for input prompt ('%c' is replaced by channel or server, '%n' by nick " -"and '%m' by nick modes)" -msgstr "" -"format pour l'invite de la zone de saisie ('%c' est remplacé par le canal ou " -"serveur, '%n' par le pseudo et '%m' par les modes du pseudo)" - msgid "time format for \"time\" bar item" msgstr "format de date/heure pour l'objet de barre \"time\"" @@ -1928,12 +1920,6 @@ msgstr "Pas assez de mémoire pour une nouvelle ligne" msgid "Error: not enough memory to add a buffer to hotlist" msgstr "Erreur: impossible d'ajouter le tampon à la liste des tampons actifs" -msgid "Text search (exact): " -msgstr "Recherche texte (exact): " - -msgid "Text search: " -msgstr "Recherche texte: " - #, c-format msgid "Error: unable to bind key \"%s\"" msgstr "Erreur: impossible de créer la touche \"%s\"" @@ -3433,6 +3419,9 @@ msgstr "" msgid "display message when (un)marking as away" msgstr "affiche un message pour l'absence/le retour" +msgid "display channel modes in \"buffer_name\" bar item" +msgstr "affiche les modes du canal dans l'objet de barre \"buffer_name\"" + msgid "" "comma separated list of tags for messages that may produce highlight " "(usually any message from another user, not server messages,..)" @@ -4838,3 +4827,16 @@ msgstr "%s%s: impossible de positionner l'option \"nonblock\" pour la socket" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: délai d'attente dépassé pour \"%s\" avec %s" + +#~ msgid "" +#~ "format for input prompt ('%c' is replaced by channel or server, '%n' by " +#~ "nick and '%m' by nick modes)" +#~ msgstr "" +#~ "format pour l'invite de la zone de saisie ('%c' est remplacé par le canal " +#~ "ou serveur, '%n' par le pseudo et '%m' par les modes du pseudo)" + +#~ msgid "Text search (exact): " +#~ msgstr "Recherche texte (exact): " + +#~ msgid "Text search: " +#~ msgstr "Recherche texte: " diff --git a/po/hu.po b/po/hu.po index e365c4bd5..24840ac3a 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2008-10-18 16:15+0200\n" +"POT-Creation-Date: 2008-10-23 18:35+0200\n" "PO-Revision-Date: 2007-10-10 18:07+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -1152,14 +1152,6 @@ msgid "" "group_number_asc, group_number_desc, number_asc, number_desc)" msgstr "" -#, c-format -msgid "" -"format for input prompt ('%c' is replaced by channel or server, '%n' by nick " -"and '%m' by nick modes)" -msgstr "" -"beviteli mező kinézete ('%c' helyére a szoba vagy a szerver, '%n' helyére a " -"név és '%m' helyére a mód kerül)" - #, fuzzy msgid "time format for \"time\" bar item" msgstr "időbélyeg a információs pult idejéhez" @@ -1937,12 +1929,6 @@ msgstr "Nincs elég memória az új sorhoz\n" msgid "Error: not enough memory to add a buffer to hotlist" msgstr "%s nincs elég memória az ignore elkészítéséhez\n" -msgid "Text search (exact): " -msgstr "Szöveg keresése (pontos): " - -msgid "Text search: " -msgstr "Szöveg keresése: " - #, fuzzy, c-format msgid "Error: unable to bind key \"%s\"" msgstr "%s nem sikerült a(z) \"%s\" billentyűt hozzárendelni\n" @@ -3413,6 +3399,9 @@ msgstr "okos névkiegészítés (először az utolsó partnerre egészít ki)" msgid "display message when (un)marking as away" msgstr "üzenet mutatása távollétkor/visszatéréskor" +msgid "display channel modes in \"buffer_name\" bar item" +msgstr "" + msgid "" "comma separated list of tags for messages that may produce highlight " "(usually any message from another user, not server messages,..)" @@ -4816,6 +4805,19 @@ msgstr "%s DCC: nem sikerült 'nonblock' opciót beállítani a csatornán\n" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n" +#~ msgid "" +#~ "format for input prompt ('%c' is replaced by channel or server, '%n' by " +#~ "nick and '%m' by nick modes)" +#~ msgstr "" +#~ "beviteli mező kinézete ('%c' helyére a szoba vagy a szerver, '%n' helyére " +#~ "a név és '%m' helyére a mód kerül)" + +#~ msgid "Text search (exact): " +#~ msgstr "Szöveg keresése (pontos): " + +#~ msgid "Text search: " +#~ msgstr "Szöveg keresése: " + #, fuzzy #~ msgid "%s: creating new speller for lang \"%s\"" #~ msgstr "%s nincs elég memória az információs pult üzenethez\n" diff --git a/po/ru.po b/po/ru.po index 93419efdc..b53f43d7e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2008-10-18 16:15+0200\n" +"POT-Creation-Date: 2008-10-23 18:35+0200\n" "PO-Revision-Date: 2007-09-06 12:44+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -1153,14 +1153,6 @@ msgstr "" "тип сортировки хотлиста (group_time_asc (по-умолчанию), group_time_desc, " "group_number_asc, group_number_desc, number_asc, number_desc)" -#, c-format -msgid "" -"format for input prompt ('%c' is replaced by channel or server, '%n' by nick " -"and '%m' by nick modes)" -msgstr "" -"формат приглашения ввода ('%c' заменяется на сервер или канал, '%n' на ник, " -"а '%m' - на режимы ника" - #, fuzzy msgid "time format for \"time\" bar item" msgstr "время в информационной строке" @@ -1942,12 +1934,6 @@ msgstr "Недостаточно памяти для новой строчки\n msgid "Error: not enough memory to add a buffer to hotlist" msgstr "%s не могу добавить буфер в хотлист\n" -msgid "Text search (exact): " -msgstr "Поиск текста (регистрозависимый): " - -msgid "Text search: " -msgstr "Поиск текста: " - #, fuzzy, c-format msgid "Error: unable to bind key \"%s\"" msgstr "%s не могу установить клавишу \"%s\"\n" @@ -3407,6 +3393,9 @@ msgstr "умное дополнение ников (начинает переб msgid "display message when (un)marking as away" msgstr "показывать сообщение во все каналы при установке/снятии отсутствия" +msgid "display channel modes in \"buffer_name\" bar item" +msgstr "" + msgid "" "comma separated list of tags for messages that may produce highlight " "(usually any message from another user, not server messages,..)" @@ -4798,6 +4787,19 @@ msgstr "%s DCC: не могу установить неблокирующий р msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s нет аргумента для параметра \"%s\"\n" +#~ msgid "" +#~ "format for input prompt ('%c' is replaced by channel or server, '%n' by " +#~ "nick and '%m' by nick modes)" +#~ msgstr "" +#~ "формат приглашения ввода ('%c' заменяется на сервер или канал, '%n' на " +#~ "ник, а '%m' - на режимы ника" + +#~ msgid "Text search (exact): " +#~ msgstr "Поиск текста (регистрозависимый): " + +#~ msgid "Text search: " +#~ msgstr "Поиск текста: " + #, fuzzy #~ msgid "%s: creating new speller for lang \"%s\"" #~ msgstr "%s недостаточно памяти для сообщения в строке информации\n" diff --git a/po/weechat.pot b/po/weechat.pot index f9c8c2e98..d088a7c62 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: 2008-10-18 16:15+0200\n" +"POT-Creation-Date: 2008-10-23 18:35+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -965,12 +965,6 @@ msgid "" "group_number_asc, group_number_desc, number_asc, number_desc)" msgstr "" -#, c-format -msgid "" -"format for input prompt ('%c' is replaced by channel or server, '%n' by nick " -"and '%m' by nick modes)" -msgstr "" - msgid "time format for \"time\" bar item" msgstr "" @@ -1621,12 +1615,6 @@ msgstr "" msgid "Error: not enough memory to add a buffer to hotlist" msgstr "" -msgid "Text search (exact): " -msgstr "" - -msgid "Text search: " -msgstr "" - #, c-format msgid "Error: unable to bind key \"%s\"" msgstr "" @@ -2877,6 +2865,9 @@ msgstr "" msgid "display message when (un)marking as away" msgstr "" +msgid "display channel modes in \"buffer_name\" bar item" +msgstr "" + msgid "" "comma separated list of tags for messages that may produce highlight " "(usually any message from another user, not server messages,..)" diff --git a/src/plugins/irc/irc-bar-item.c b/src/plugins/irc/irc-bar-item.c index a7e521c28..983fd5c55 100644 --- a/src/plugins/irc/irc-bar-item.c +++ b/src/plugins/irc/irc-bar-item.c @@ -131,6 +131,7 @@ irc_bar_item_buffer_name (void *data, struct t_gui_bar_item *item, if (channel) { if (channel->nicks + && weechat_config_boolean (irc_config_look_display_channel_modes) && channel->modes && channel->modes[0] && (strcmp (channel->modes, "+") != 0)) { diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index 385cf856b..598dfd3d8 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -56,6 +56,7 @@ 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_completion_smart; struct t_config_option *irc_config_look_display_away; +struct t_config_option *irc_config_look_display_channel_modes; struct t_config_option *irc_config_look_highlight_tags; struct t_config_option *irc_config_look_show_away_once; struct t_config_option *irc_config_look_notice_as_pv; @@ -151,6 +152,17 @@ irc_config_change_one_server_buffer () irc_buffer_split_server (); } +/* + * irc_config_change_display_channel_modes: called when the "display channel modes" + * setting is changed + */ + +void +irc_config_change_display_channel_modes () +{ + weechat_bar_item_update ("buffer_name"); +} + /* * irc_config_change_away_check: called when away check is changed */ @@ -994,6 +1006,11 @@ irc_config_init () "display_away", "integer", N_("display message when (un)marking as away"), "off|local|channel", 0, 0, "local", NULL, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_look_display_channel_modes = weechat_config_new_option ( + irc_config_file, ptr_section, + "display_channel_modes", "boolean", + N_("display channel modes in \"buffer_name\" bar item"), + NULL, 0, 0, "on", NULL, NULL, NULL, &irc_config_change_display_channel_modes, NULL, NULL, NULL); irc_config_look_highlight_tags = weechat_config_new_option ( irc_config_file, ptr_section, "highlight_tags", "string", diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h index 9a6f80b16..d1c110254 100644 --- a/src/plugins/irc/irc-config.h +++ b/src/plugins/irc/irc-config.h @@ -68,6 +68,7 @@ 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_completion_smart; extern struct t_config_option *irc_config_look_display_away; +extern struct t_config_option *irc_config_look_display_channel_modes; extern struct t_config_option *irc_config_look_highlight_tags; extern struct t_config_option *irc_config_look_show_away_once; extern struct t_config_option *irc_config_look_notice_as_pv;