foxiepaws
/
weechat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

irc: add option irc.look.ctcp_time_format to customize reply to CTCP TIME (task #12150)

v2.8-utf8proc
Sebastien Helleu 2012-06-30 14:19:00 +02:00
parent 00a9028f42
commit 08c3c848bd
23 changed files with 136 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,7 +1,7 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
v0.3.9-dev, 2012-06-14
v0.3.9-dev, 2012-06-30
Version 0.3.9 (under dev!)
@ -18,6 +18,8 @@ Version 0.3.9 (under dev!)
(bug #36584)
* guile: fix crash when unloading a script without pointer to interpreter
* guile: fix path of guile include dirs in cmake build (patch #7790)
* irc: add option irc.look.ctcp_time_format to customize reply to CTCP TIME
(task #12150)
* irc: fix freeze when reading on socket with SSL enabled (bug #35097)
* irc: reallow names beginning with "#" for servers
* lua: fix crash when unloading a script without pointer to interpreter

5
doc/de/autogen/user/irc_options.txt
View File

@ -103,6 +103,11 @@
** Typ: boolesch
** Werte: on, off (Standardwert: `on`)
* [[option_irc.look.ctcp_time_format]] *irc.look.ctcp_time_format*
** Beschreibung: `time format used in answer to message CTCP TIME (see man strftime for date/time specifiers)`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `"%a, %d %b %Y %T %z"`)
* [[option_irc.look.display_away]] *irc.look.display_away*
** Beschreibung: `bei Abwesenheit und Rückkehr eine Nachricht anzeigen`
** Typ: integer

2
doc/de/weechat_user.de.txt
View File

@ -1730,7 +1730,7 @@ mit dem entsprechenden Wert ersetzt:
| $osinfo | Info über das genutzte OS | Linux 2.6.31 / i686
| $site | WeeChat Seite | http://www.weechat.org
| $download | WeeChat, download Seite | http://www.weechat.org/download
| $time | aktuelle Uhrzeit/Datum | Sun Sep 13 15:48:31 2009
| $time | aktuelle Uhrzeit/Datum | Sun, 13 Sep 2009 15:48:31 +0200
| $username | Username beim IRC Server | Nick
| $realname | Realname beim IRC Server | mein Name
|========================================

5
doc/en/autogen/user/irc_options.txt
View File

@ -103,6 +103,11 @@
** type: boolean
** values: on, off (default value: `on`)
* [[option_irc.look.ctcp_time_format]] *irc.look.ctcp_time_format*
** description: `time format used in answer to message CTCP TIME (see man strftime for date/time specifiers)`
** type: string
** values: any string (default value: `"%a, %d %b %Y %T %z"`)
* [[option_irc.look.display_away]] *irc.look.display_away*
** description: `display message when (un)marking as away`
** type: integer

2
doc/en/weechat_user.en.txt
View File

@ -1693,7 +1693,7 @@ when replying to CTCP:
| $osinfo | info about OS | Linux 2.6.31 / i686
| $site | WeeChat site | http://www.weechat.org
| $download | WeeChat site, download page | http://www.weechat.org/download
| $time | current date/time | Sun Sep 13 15:48:31 2009
| $time | current date/time | Sun, 13 Sep 2009 15:48:31 +0200
| $username | user name on IRC server | nick
| $realname | real name on IRC server | My name
|========================================

5
doc/fr/autogen/user/irc_options.txt
View File

@ -103,6 +103,11 @@
** type: booléen
** valeurs: on, off (valeur par défaut: `on`)
* [[option_irc.look.ctcp_time_format]] *irc.look.ctcp_time_format*
** description: `format de date/heure utilisé pour la réponse au message CTCP TIME (voir man strftime pour le format de date/heure)`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `"%a, %d %b %Y %T %z"`)
* [[option_irc.look.display_away]] *irc.look.display_away*
** description: `affiche un message pour l'absence/le retour`
** type: entier

2
doc/fr/weechat_user.fr.txt
View File

@ -1742,7 +1742,7 @@ automatiquement remplacées par WeeChat lors de la réponse au CTCP :
| $osinfo | information sur l'OS | Linux 2.6.31 / i686
| $site | site WeeChat | http://www.weechat.org
| $download | site WeeChat, page téléchargement | http://www.weechat.org/download
| $time | date/heure courante | Sun Sep 13 15:48:31 2009
| $time | date/heure courante | Sun, 13 Sep 2009 15:48:31 +0200
| $username | nom d'utilisateur sur le serveur | pseudo
| $realname | nom réel sur le serveur | Mon nom
|========================================

5
doc/it/autogen/user/irc_options.txt
View File

@ -103,6 +103,11 @@
** tipo: bool
** valori: on, off (valore predefinito: `on`)
* [[option_irc.look.ctcp_time_format]] *irc.look.ctcp_time_format*
** descrizione: `time format used in answer to message CTCP TIME (see man strftime for date/time specifiers)`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `"%a, %d %b %Y %T %z"`)
* [[option_irc.look.display_away]] *irc.look.display_away*
** descrizione: `visualizza messaggio al cambio dello stato di assenza`
** tipo: intero

2
doc/it/weechat_user.it.txt
View File

@ -1741,7 +1741,7 @@ automaticamente da WeeChat quando si risponde alle CTCP
| $osinfo | informazioni sull'OS | Linux 2.6.31 / i686
| $site | sito di WeeChat | http://www.weechat.org
| $download | sito di WeeChat, pagina di download | http://www.weechat.org/download
| $time | data/ora correnti | Sun Sep 13 15:48:31 2009
| $time | data/ora correnti | Sun, 13 Sep 2009 15:48:31 +0200
| $username | nome utente sul server IRC | nick
| $realname | nome reale sul server IRC | Mio nome
|=======================================

10
po/cs.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-06-10 22:58+0200\n"
"POT-Creation-Date: 2012-06-30 14:13+0200\n"
"PO-Revision-Date: 2012-06-03 09:49+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5547,6 +5547,14 @@ msgstr "použít barvu přezdívky ve zprávách ze serveru"
msgid "use same nick color for channel and private"
msgstr "použít stejnou barvu přezdívky pro kanál a soukromý rozhovor"
#, fuzzy
msgid ""
"time format used in answer to message CTCP TIME (see man strftime for date/"
"time specifiers)"
msgstr ""
"časový formát pro \"time\" položku panelu (viz. man strftime pro specifikaci "
"data/času)"
msgid "merge server buffers"
msgstr "spojit buffery serverů"

10
po/de.po
View File

@ -23,7 +23,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-06-10 22:58+0200\n"
"POT-Creation-Date: 2012-06-30 14:13+0200\n"
"PO-Revision-Date: 2012-06-03 09:49+0200\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@ -5970,6 +5970,14 @@ msgstr ""
"nutzt die selbe Farbe für die Darstellung des Nicks im Channel wie auch im "
"privaten Buffer"
#, fuzzy
msgid ""
"time format used in answer to message CTCP TIME (see man strftime for date/"
"time specifiers)"
msgstr ""
"Format für die Zeitanzeige, \"time\", in der Bar-Item (siehe man strftime "
"für Datum/Zeit Platzhalter)"
msgid "merge server buffers"
msgstr "Server-Buffer zusammenfügen"

10
po/es.po
View File

@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-06-10 22:58+0200\n"
"POT-Creation-Date: 2012-06-30 14:13+0200\n"
"PO-Revision-Date: 2012-06-03 09:49+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5770,6 +5770,14 @@ msgstr "usar color del apodo en mensajes del servidor"
msgid "use same nick color for channel and private"
msgstr "usar el mismo color de apodo en el canal y conversaciones privadas"
#, fuzzy
msgid ""
"time format used in answer to message CTCP TIME (see man strftime for date/"
"time specifiers)"
msgstr ""
"formato de hora para el elemento de barra \"time\" (ver el manual de "
"strftime para los especificadores de fecha/hora)"
msgid "merge server buffers"
msgstr "unir buffers de los servidores"

14
po/fr.po
View File

@ -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-06-10 22:58+0200\n"
"PO-Revision-Date: 2012-06-10 23:00+0200\n"
"POT-Creation-Date: 2012-06-30 14:13+0200\n"
"PO-Revision-Date: 2012-06-30 13:20+0200\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@ -5810,6 +5810,13 @@ msgstr "utiliser la couleur du pseudo dans les messages du serveur"
msgid "use same nick color for channel and private"
msgstr "utiliser la même couleur de pseudo pour le canal et le privé"
msgid ""
"time format used in answer to message CTCP TIME (see man strftime for date/"
"time specifiers)"
msgstr ""
"format de date/heure utilisé pour la réponse au message CTCP TIME (voir man "
"strftime pour le format de date/heure)"
msgid "merge server buffers"
msgstr "mélange des tampons de serveur"
@ -8707,6 +8714,9 @@ msgstr "Type"
msgid "Constants"
msgstr "Constantes"
#~ msgid "time format used in answer to message CTCP TIME"
#~ msgstr "format de l'heure utilisé dans la réponse au message CTCP TIME"
#~ msgid "%sError: name can not start with \"#\""
#~ msgstr "%sErreur: le nom ne peut pas commencer par \"#\""

7
po/hu.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-06-10 22:58+0200\n"
"POT-Creation-Date: 2012-06-30 14:13+0200\n"
"PO-Revision-Date: 2012-06-03 09:49+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5142,6 +5142,11 @@ msgstr "helyi idő lekérdezése a szerverről"
msgid "use same nick color for channel and private"
msgstr "másik fél nevének színe privát beszélgetésben"
msgid ""
"time format used in answer to message CTCP TIME (see man strftime for date/"
"time specifiers)"
msgstr ""
#, fuzzy
msgid "merge server buffers"
msgstr "pufferek kezelése"

10
po/it.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-06-10 22:58+0200\n"
"POT-Creation-Date: 2012-06-30 14:13+0200\n"
"PO-Revision-Date: 2012-06-03 09:49+0200\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5751,6 +5751,14 @@ msgstr "usa i colori dei nick nei messaggi dal server"
msgid "use same nick color for channel and private"
msgstr "usa lo stesso colore del nick per canale e privato"
#, fuzzy
msgid ""
"time format used in answer to message CTCP TIME (see man strftime for date/"
"time specifiers)"
msgstr ""
"formato dell'ora per l'elemento barra \"time\" (consultare man strftime per "
"gli specificatori data/ora)"
msgid "merge server buffers"
msgstr "unisci i buffer dei server"

10
po/ja.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-06-10 22:58+0200\n"
"POT-Creation-Date: 2012-06-30 14:13+0200\n"
"PO-Revision-Date: 2012-06-03 09:49+0200\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@ -5618,6 +5618,14 @@ msgstr "サーバからのメッセージにニックネーム色を利用"
msgid "use same nick color for channel and private"
msgstr "チャンネルとプライベートバッファで同じニックネーム色を利用"
#, fuzzy
msgid ""
"time format used in answer to message CTCP TIME (see man strftime for date/"
"time specifiers)"
msgstr ""
"\"time\" バーアイテムの時間フォーマット (日付/時間指定子は strftime の man を"
"参照)"
msgid "merge server buffers"
msgstr "サーババッファをマージ"

10
po/pl.po
View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-06-10 22:58+0200\n"
"POT-Creation-Date: 2012-06-30 14:13+0200\n"
"PO-Revision-Date: 2012-06-03 09:49+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5733,6 +5733,14 @@ msgstr "użyj koloru nicka w wiadomościach od serwera"
msgid "use same nick color for channel and private"
msgstr "użyj takiego samego koloru nicka na kanałach i prywatnych rozmowach"
#, fuzzy
msgid ""
"time format used in answer to message CTCP TIME (see man strftime for date/"
"time specifiers)"
msgstr ""
"format czasu dla elementu paska \"time\" (zobacz man strftime dla "
"specyfikatorów daty/czasu)"
msgid "merge server buffers"
msgstr "połącz bufory serwerów"

10
po/pt_BR.po
View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-06-10 22:58+0200\n"
"POT-Creation-Date: 2012-06-30 14:13+0200\n"
"PO-Revision-Date: 2012-06-03 09:49+0200\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5296,6 +5296,14 @@ msgstr "utilizar cor de apelido em mensagens do servidor"
msgid "use same nick color for channel and private"
msgstr "utilizar a mesma cor de apelido para canal e privado"
#, fuzzy
msgid ""
"time format used in answer to message CTCP TIME (see man strftime for date/"
"time specifiers)"
msgstr ""
"formato de tempo para o item de barra \"time\" (veja man strftime para "
"especificadores de data/tempo)"
msgid "merge server buffers"
msgstr "mesclar buffers de servidores"

7
po/ru.po
View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.9-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-06-10 22:58+0200\n"
"POT-Creation-Date: 2012-06-30 14:13+0200\n"
"PO-Revision-Date: 2012-06-03 09:49+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5159,6 +5159,11 @@ msgstr "запросить местное время сервера"
msgid "use same nick color for channel and private"
msgstr "цвет ника собеседника в окне привата"
msgid ""
"time format used in answer to message CTCP TIME (see man strftime for date/"
"time specifiers)"
msgstr ""
#, fuzzy
msgid "merge server buffers"
msgstr "управление буферами"

7
po/weechat.pot
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-06-10 22:58+0200\n"
"POT-Creation-Date: 2012-06-30 14:13+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -4421,6 +4421,11 @@ msgstr ""
msgid "use same nick color for channel and private"
msgstr ""
msgid ""
"time format used in answer to message CTCP TIME (see man strftime for date/"
"time specifiers)"
msgstr ""
msgid "merge server buffers"
msgstr ""

7
src/plugins/irc/irc-config.c
View File

@ -56,6 +56,7 @@ struct t_config_option *irc_config_look_color_nicks_in_names;
struct t_config_option *irc_config_look_color_nicks_in_nicklist;
struct t_config_option *irc_config_look_color_nicks_in_server_messages;
struct t_config_option *irc_config_look_color_pv_nick_like_channel;
struct t_config_option *irc_config_look_ctcp_time_format;
struct t_config_option *irc_config_look_server_buffer;
struct t_config_option *irc_config_look_new_channel_position;
struct t_config_option *irc_config_look_new_pv_position;
@ -2049,6 +2050,12 @@ irc_config_init ()
N_("use same nick color for channel and private"),
NULL, 0, 0, "on", NULL, 0, NULL, NULL,
NULL, NULL, NULL, NULL);
irc_config_look_ctcp_time_format = weechat_config_new_option (
irc_config_file, ptr_section,
"ctcp_time_format", "string",
N_("time format used in answer to message CTCP TIME (see man strftime "
"for date/time specifiers)"),
NULL, 0, 0, "%a, %d %b %Y %T %z", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
irc_config_look_server_buffer = weechat_config_new_option (
irc_config_file, ptr_section,
"server_buffer", "integer",

1
src/plugins/irc/irc-config.h
View File

@ -81,6 +81,7 @@ extern struct t_config_option *irc_config_look_color_nicks_in_names;
extern struct t_config_option *irc_config_look_color_nicks_in_nicklist;
extern struct t_config_option *irc_config_look_color_nicks_in_server_messages;
extern struct t_config_option *irc_config_look_color_pv_nick_like_channel;
extern struct t_config_option *irc_config_look_ctcp_time_format;
extern struct t_config_option *irc_config_look_server_buffer;
extern struct t_config_option *irc_config_look_new_channel_position;
extern struct t_config_option *irc_config_look_new_pv_position;

10
src/plugins/irc/irc-ctcp.c
View File

@ -27,6 +27,7 @@
#include <sys/time.h>
#include <time.h>
#include <sys/utsname.h>
#include <locale.h>
#include "../weechat-plugin.h"
#include "irc.h"
@ -330,6 +331,7 @@ irc_ctcp_replace_variables (struct t_irc_server *server, const char *format)
char *res, *temp;
const char *info;
time_t now;
struct tm *local_time;
char buf[1024];
struct utsname *buf_uname;
@ -390,8 +392,12 @@ irc_ctcp_replace_variables (struct t_irc_server *server, const char *format)
/* time */
now = time (NULL);
snprintf (buf, sizeof (buf), "%s", ctime (&now));
buf[strlen (buf) - 1] = '\0';
local_time = localtime (&now);
setlocale (LC_ALL, "C");
strftime (buf, sizeof (buf),
weechat_config_string (irc_config_look_ctcp_time_format),
local_time);
setlocale (LC_ALL, "");
temp = weechat_string_replace (res, "$time", buf);
free (res);
if (!temp)