1
0
mirror of https://github.com/weechat/weechat.git synced 2026-06-29 14:26:39 +02:00

irc: evaluate content of server option "nicks"

This commit is contained in:
Sébastien Helleu
2015-07-10 20:10:22 +02:00
parent 653a392d9a
commit 14496c41a3
21 changed files with 118 additions and 42 deletions
+1
View File
@@ -26,6 +26,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
* api: add support of evaluated sub-strings and current date/time in function
string_eval_expression() and command /eval
* api: add function string_eval_path_home()
* irc: evaluate content of server option "nicks"
* logger: evaluate content of option logger.file.path (issue #388)
* relay: display value of HTTP header "X-Real-IP" for websocket connections
(closes #440)
+1 -1
View File
@@ -543,7 +543,7 @@
** Werte: beliebige Zeichenkette (Standardwert: `""`)
* [[option_irc.server_default.nicks]] *irc.server_default.nicks*
** Beschreibung: `Nicknamen, die auf dem IRC-Server benutzt werden sollen (durch Komma getrennt)`
** Beschreibung: `Nicknamen, die auf dem IRC-Server benutzt werden sollen (durch Komma getrennt) (Hinweis: Inhalt wird evaluiert, siehe /help eval)`
** Typ: Zeichenkette
** Werte: beliebige Zeichenkette (Standardwert: `""`)
+1 -1
View File
@@ -543,7 +543,7 @@
** values: any string (default value: `""`)
* [[option_irc.server_default.nicks]] *irc.server_default.nicks*
** description: `nicknames to use on server (separated by comma)`
** description: `nicknames to use on server (separated by comma) (note: content is evaluated, see /help eval)`
** type: string
** values: any string (default value: `""`)
+1 -1
View File
@@ -543,7 +543,7 @@
** valeurs: toute chaîne (valeur par défaut: `""`)
* [[option_irc.server_default.nicks]] *irc.server_default.nicks*
** description: `pseudos à utiliser sur le serveur (séparés par des virgules)`
** description: `pseudos à utiliser sur le serveur (séparés par des virgules) (note : le contenu est évalué, voir /help eval)`
** type: chaîne
** valeurs: toute chaîne (valeur par défaut: `""`)
+1 -1
View File
@@ -543,7 +543,7 @@
** valori: qualsiasi stringa (valore predefinito: `""`)
* [[option_irc.server_default.nicks]] *irc.server_default.nicks*
** descrizione: `nick da usare sul server (separati da virgole)`
** descrizione: `nicknames to use on server (separated by comma) (note: content is evaluated, see /help eval)`
** tipo: stringa
** valori: qualsiasi stringa (valore predefinito: `""`)
+1 -1
View File
@@ -543,7 +543,7 @@
** 値: 未制約文字列 (デフォルト値: `""`)
* [[option_irc.server_default.nicks]] *irc.server_default.nicks*
** 説明: `サーバで使用するニックネーム (コンマ区切り)`
** 説明: `nicknames to use on server (separated by comma) (note: content is evaluated, see /help eval)`
** タイプ: 文字列
** 値: 未制約文字列 (デフォルト値: `""`)
+1 -1
View File
@@ -543,7 +543,7 @@
** wartości: dowolny ciąg (domyślna wartość: `""`)
* [[option_irc.server_default.nicks]] *irc.server_default.nicks*
** opis: `lista nicków używanych na serwerze (oddzielone przecinkiem)`
** opis: `nicknames to use on server (separated by comma) (note: content is evaluated, see /help eval)`
** typ: ciąg
** wartości: dowolny ciąg (domyślna wartość: `""`)
+9 -3
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-07-09 20:32+0200\n"
"POT-Creation-Date: 2015-07-10 17:57+0200\n"
"PO-Revision-Date: 2015-03-21 08:41+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6852,8 +6852,11 @@ msgstr "automaticky znovu připojit server, když je odpojen"
msgid "delay (in seconds) before trying again to reconnect to server"
msgstr "doba (v sekundách) před novým zkušením znovupřipojení na server"
msgid "nicknames to use on server (separated by comma)"
msgstr "přezdívky použité na serveru (oddělené čárkami)"
#, fuzzy
msgid ""
"nicknames to use on server (separated by comma) (note: content is evaluated, "
"see /help eval)"
msgstr "příkaz spuštěný při startu WeeChat, před načtením pluginů"
#, fuzzy
msgid "user name to use on server (note: content is evaluated, see /help eval)"
@@ -11079,6 +11082,9 @@ msgstr "%s%s: vypršel časový limit \"%s\" pro %s"
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr "%s%s: nemohu se připojit k odesílateli"
#~ msgid "nicknames to use on server (separated by comma)"
#~ msgstr "přezdívky použité na serveru (oddělené čárkami)"
#~ msgid ""
#~ "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
#~ "\"~/.weechat\" by default)"
+11 -4
View File
@@ -24,8 +24,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-07-09 20:32+0200\n"
"PO-Revision-Date: 2015-07-10 14:50+0100\n"
"POT-Creation-Date: 2015-07-10 17:57+0200\n"
"PO-Revision-Date: 2015-07-10 20:07+0200\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <>\n"
"Language: de_DE\n"
@@ -7889,10 +7889,12 @@ msgstr ""
"Zeit (in Sekunden) die gewartet werden soll bevor ein neuer "
"Verbindungsaufbau durchgeführt werden soll"
msgid "nicknames to use on server (separated by comma)"
msgid ""
"nicknames to use on server (separated by comma) (note: content is evaluated, "
"see /help eval)"
msgstr ""
"Nicknamen, die auf dem IRC-Server benutzt werden sollen (durch Komma "
"getrennt)"
"getrennt) (Hinweis: Inhalt wird evaluiert, siehe /help eval)"
msgid "user name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
@@ -12596,6 +12598,11 @@ msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr ""
"%s%s: Verbindung konnte nicht hergestellt werden: unerwarteter Fehler (%d)"
#~ msgid "nicknames to use on server (separated by comma)"
#~ msgstr ""
#~ "Nicknamen, die auf dem IRC-Server benutzt werden sollen (durch Komma "
#~ "getrennt)"
#~ msgid ""
#~ "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
#~ "\"~/.weechat\" by default)"
+9 -3
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-07-09 20:32+0200\n"
"POT-Creation-Date: 2015-07-10 17:57+0200\n"
"PO-Revision-Date: 2015-03-21 08:41+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7104,8 +7104,11 @@ msgid "delay (in seconds) before trying again to reconnect to server"
msgstr ""
"espera (en segundos) antes de intentar de nuevo una reconexión del servidor"
msgid "nicknames to use on server (separated by comma)"
msgstr "apodos para usar en el servidor (separados por comas)"
#, fuzzy
msgid ""
"nicknames to use on server (separated by comma) (note: content is evaluated, "
"see /help eval)"
msgstr "comando ejecutado cuando WeeChat inicia, antes de cargar los plugins"
#, fuzzy
msgid "user name to use on server (note: content is evaluated, see /help eval)"
@@ -11371,6 +11374,9 @@ msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s"
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr "%s%s: no es posible conectarse al transmisor"
#~ msgid "nicknames to use on server (separated by comma)"
#~ msgstr "apodos para usar en el servidor (separados por comas)"
#~ msgid ""
#~ "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
#~ "\"~/.weechat\" by default)"
+11 -4
View File
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-07-09 20:32+0200\n"
"PO-Revision-Date: 2015-07-09 20:34+0200\n"
"POT-Creation-Date: 2015-07-10 17:57+0200\n"
"PO-Revision-Date: 2015-07-10 20:07+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -7720,8 +7720,12 @@ msgstr "reconnexion automatique au serveur après une déconnexion"
msgid "delay (in seconds) before trying again to reconnect to server"
msgstr "délai (en secondes) avant de tenter une reconnexion au serveur"
msgid "nicknames to use on server (separated by comma)"
msgstr "pseudos à utiliser sur le serveur (séparés par des virgules)"
msgid ""
"nicknames to use on server (separated by comma) (note: content is evaluated, "
"see /help eval)"
msgstr ""
"pseudos à utiliser sur le serveur (séparés par des virgules) (note : le "
"contenu est évalué, voir /help eval)"
msgid "user name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
@@ -12332,6 +12336,9 @@ msgstr "%s%s : délai d'attente dépassé pour \"%s\" avec %s"
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr "%s%s : impossible de se connecter : erreur inattendue (%d)"
#~ msgid "nicknames to use on server (separated by comma)"
#~ msgstr "pseudos à utiliser sur le serveur (séparés par des virgules)"
#~ msgid ""
#~ "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
#~ "\"~/.weechat\" by default)"
+4 -2
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-07-09 20:32+0200\n"
"POT-Creation-Date: 2015-07-10 17:57+0200\n"
"PO-Revision-Date: 2015-03-21 08:41+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6338,7 +6338,9 @@ msgid "delay (in seconds) before trying again to reconnect to server"
msgstr "két újracsatlakozási próba közti szünet (másodpercben)"
#, fuzzy
msgid "nicknames to use on server (separated by comma)"
msgid ""
"nicknames to use on server (separated by comma) (note: content is evaluated, "
"see /help eval)"
msgstr "felhasználónév az IRC szerveren"
msgid "user name to use on server (note: content is evaluated, see /help eval)"
+11 -3
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-07-09 20:32+0200\n"
"POT-Creation-Date: 2015-07-10 17:57+0200\n"
"PO-Revision-Date: 2015-03-21 08:41+0100\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7254,8 +7254,13 @@ msgstr "riconnette automaticamente al server alla disconnessione"
msgid "delay (in seconds) before trying again to reconnect to server"
msgstr "ritardo (in secondi) prima di riprovare a riconnettersi al server"
msgid "nicknames to use on server (separated by comma)"
msgstr "nick da usare sul server (separati da virgole)"
#, fuzzy
msgid ""
"nicknames to use on server (separated by comma) (note: content is evaluated, "
"see /help eval)"
msgstr ""
"nome utente per il server proxy (nota: il contenuto viene valutato, "
"consultare /help eval)"
#, fuzzy
msgid "user name to use on server (note: content is evaluated, see /help eval)"
@@ -11552,6 +11557,9 @@ msgstr "%s%s: timeout per \"%s\" con %s"
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr "%s%s: impossibile connettersi al mittente"
#~ msgid "nicknames to use on server (separated by comma)"
#~ msgstr "nick da usare sul server (separati da virgole)"
#~ msgid ""
#~ "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
#~ "\"~/.weechat\" by default)"
+11 -3
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-07-09 20:32+0200\n"
"POT-Creation-Date: 2015-07-10 17:57+0200\n"
"PO-Revision-Date: 2015-06-21 22:54+0900\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n"
@@ -7400,8 +7400,13 @@ msgstr "接続が切れたときに自動的に再接続"
msgid "delay (in seconds) before trying again to reconnect to server"
msgstr "サーバへの再接続の際の遅延 (秒単位) 時間"
msgid "nicknames to use on server (separated by comma)"
msgstr "サーバで使用するニックネーム (コンマ区切り)"
#, fuzzy
msgid ""
"nicknames to use on server (separated by comma) (note: content is evaluated, "
"see /help eval)"
msgstr ""
"サーバで使用するユーザ名 (注意: 値は評価されます、/help eval を参照してくださ"
"い)"
msgid "user name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
@@ -11849,6 +11854,9 @@ msgstr "%s%s: \"%s\" のタイムアウト %s"
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr "%s%s: 接続できません: 未定義のエラー (%d)"
#~ msgid "nicknames to use on server (separated by comma)"
#~ msgstr "サーバで使用するニックネーム (コンマ区切り)"
#~ msgid ""
#~ "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
#~ "\"~/.weechat\" by default)"
+11 -3
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-07-09 20:32+0200\n"
"POT-Creation-Date: 2015-07-10 17:57+0200\n"
"PO-Revision-Date: 2015-05-09 14:00+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -7559,8 +7559,13 @@ msgid "delay (in seconds) before trying again to reconnect to server"
msgstr ""
"opóźnienie (w sekundach) przed próbą ponownego połączenia się z serwerem"
msgid "nicknames to use on server (separated by comma)"
msgstr "lista nicków używanych na serwerze (oddzielone przecinkiem)"
#, fuzzy
msgid ""
"nicknames to use on server (separated by comma) (note: content is evaluated, "
"see /help eval)"
msgstr ""
"nazwa użytkownika do użycia na serwerze (uwaga: zawartość jest przetwarzana, "
"zobacz /help eval)"
msgid "user name to use on server (note: content is evaluated, see /help eval)"
msgstr ""
@@ -12071,6 +12076,9 @@ msgstr "%s%s: przekroczono czas na \"%s\" z %s"
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr "%s%s: nie można połączyć: niespodziewany błąd (%d)"
#~ msgid "nicknames to use on server (separated by comma)"
#~ msgstr "lista nicków używanych na serwerze (oddzielone przecinkiem)"
#~ msgid ""
#~ "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
#~ "\"~/.weechat\" by default)"
+11 -3
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-07-09 20:32+0200\n"
"POT-Creation-Date: 2015-07-10 17:57+0200\n"
"PO-Revision-Date: 2015-03-21 08:41+0100\n"
"Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6720,8 +6720,13 @@ msgstr ""
"tempo de espera (em segundos) antes de tentar reconectar ao servidor "
"novamente"
msgid "nicknames to use on server (separated by comma)"
msgstr "apelidos para utilizar no servidor (separados por vírgula)"
#, fuzzy
msgid ""
"nicknames to use on server (separated by comma) (note: content is evaluated, "
"see /help eval)"
msgstr ""
"comando executado quando o WeeChat inicia, antes do carregamento dos plugins "
"(nota: conteúdo é avaliado, veja /help eval)"
#, fuzzy
msgid "user name to use on server (note: content is evaluated, see /help eval)"
@@ -10856,6 +10861,9 @@ msgstr "%s%s: tempo esgotado para \"%s\" com %s"
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr "%s%s: não foi possível conectar ao remetente"
#~ msgid "nicknames to use on server (separated by comma)"
#~ msgstr "apelidos para utilizar no servidor (separados por vírgula)"
#~ msgid ""
#~ "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
#~ "\"~/.weechat\" by default)"
+4 -2
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-07-09 20:32+0200\n"
"POT-Creation-Date: 2015-07-10 17:57+0200\n"
"PO-Revision-Date: 2015-03-21 08:41+0100\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6364,7 +6364,9 @@ msgid "delay (in seconds) before trying again to reconnect to server"
msgstr "задержка (в секундах) перед повторным соединением с сервером"
#, fuzzy
msgid "nicknames to use on server (separated by comma)"
msgid ""
"nicknames to use on server (separated by comma) (note: content is evaluated, "
"see /help eval)"
msgstr "ник, используемый на IRC сервере"
msgid "user name to use on server (note: content is evaluated, see /help eval)"
+4 -2
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-07-09 20:32+0200\n"
"POT-Creation-Date: 2015-07-10 17:57+0200\n"
"PO-Revision-Date: 2015-03-10 21:33+0100\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5681,7 +5681,9 @@ msgstr ""
msgid "delay (in seconds) before trying again to reconnect to server"
msgstr ""
msgid "nicknames to use on server (separated by comma)"
msgid ""
"nicknames to use on server (separated by comma) (note: content is evaluated, "
"see /help eval)"
msgstr ""
msgid "user name to use on server (note: content is evaluated, see /help eval)"
+4 -2
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2015-07-09 20:32+0200\n"
"POT-Creation-Date: 2015-07-10 17:57+0200\n"
"PO-Revision-Date: 2014-08-16 10:27+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5616,7 +5616,9 @@ msgstr ""
msgid "delay (in seconds) before trying again to reconnect to server"
msgstr ""
msgid "nicknames to use on server (separated by comma)"
msgid ""
"nicknames to use on server (separated by comma) (note: content is evaluated, "
"see /help eval)"
msgstr ""
msgid "user name to use on server (note: content is evaluated, see /help eval)"
+2 -1
View File
@@ -1875,7 +1875,8 @@ irc_config_server_new_option (struct t_config_file *config_file,
new_option = weechat_config_new_option (
config_file, section,
option_name, "string",
N_("nicknames to use on server (separated by comma)"),
N_("nicknames to use on server (separated by comma) "
"(note: content is evaluated, see /help eval)"),
NULL, 0, 0,
default_value, value,
null_value_allowed,
+9 -1
View File
@@ -494,6 +494,8 @@ irc_server_set_index_current_address (struct t_irc_server *server, int index)
void
irc_server_set_nicks (struct t_irc_server *server, const char *nicks)
{
char *nicks2;
/* free data */
server->nicks_count = 0;
if (server->nicks_array)
@@ -502,10 +504,16 @@ irc_server_set_nicks (struct t_irc_server *server, const char *nicks)
server->nicks_array = NULL;
}
/* evaluate value */
nicks2 = weechat_string_eval_expression (nicks, NULL, NULL, NULL);
/* set new nicks */
server->nicks_array = weechat_string_split (
(nicks) ? nicks : IRC_SERVER_DEFAULT_NICKS,
(nicks2) ? nicks2 : IRC_SERVER_DEFAULT_NICKS,
",", 0, 0, &server->nicks_count);
if (nicks2)
free (nicks2);
}
/*