diff options
| -rw-r--r-- | ChangeLog.asciidoc | 1 | ||||
| -rw-r--r-- | doc/de/autogen/user/irc_options.asciidoc | 2 | ||||
| -rw-r--r-- | doc/en/autogen/user/irc_options.asciidoc | 2 | ||||
| -rw-r--r-- | doc/fr/autogen/user/irc_options.asciidoc | 2 | ||||
| -rw-r--r-- | doc/it/autogen/user/irc_options.asciidoc | 2 | ||||
| -rw-r--r-- | doc/ja/autogen/user/irc_options.asciidoc | 2 | ||||
| -rw-r--r-- | doc/pl/autogen/user/irc_options.asciidoc | 2 | ||||
| -rw-r--r-- | po/cs.po | 14 | ||||
| -rw-r--r-- | po/de.po | 14 | ||||
| -rw-r--r-- | po/es.po | 12 | ||||
| -rw-r--r-- | po/fr.po | 15 | ||||
| -rw-r--r-- | po/hu.po | 10 | ||||
| -rw-r--r-- | po/it.po | 14 | ||||
| -rw-r--r-- | po/ja.po | 15 | ||||
| -rw-r--r-- | po/pl.po | 15 | ||||
| -rw-r--r-- | po/pt_BR.po | 15 | ||||
| -rw-r--r-- | po/ru.po | 10 | ||||
| -rw-r--r-- | po/tr.po | 6 | ||||
| -rw-r--r-- | po/weechat.pot | 6 | ||||
| -rw-r--r-- | src/plugins/irc/irc-config.c | 3 | ||||
| -rw-r--r-- | src/plugins/irc/irc-server.c | 9 |
21 files changed, 128 insertions, 43 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index 644a83b1c..441110c11 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -33,6 +33,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] * api: add argument "length" in function utf8_is_valid() * alias: display completion in /alias list (issue #518) * fifo: add /fifo command +* irc: evaluate content of server option "addresses" * irc: move option irc.network.alternate_nick into servers (irc.server.xxx.nicks_alternate) (issue #633) * irc: track real names using extended-join and WHO (issue #351) diff --git a/doc/de/autogen/user/irc_options.asciidoc b/doc/de/autogen/user/irc_options.asciidoc index e542ce996..2bc6acc70 100644 --- a/doc/de/autogen/user/irc_options.asciidoc +++ b/doc/de/autogen/user/irc_options.asciidoc @@ -448,7 +448,7 @@ ** Werte: on, off (Standardwert: `off`) * [[option_irc.server_default.addresses]] *irc.server_default.addresses* -** Beschreibung: `Liste der Hostnamen/Ports oder IP/Ports des Servers (durch Komma getrennt)` +** Beschreibung: `list of hostname/port or IP/port for server (separated by comma) (note: content is evaluated, see /help eval)` ** Typ: Zeichenkette ** Werte: beliebige Zeichenkette (Standardwert: `""`) diff --git a/doc/en/autogen/user/irc_options.asciidoc b/doc/en/autogen/user/irc_options.asciidoc index 2a3cc82fd..2197a82b3 100644 --- a/doc/en/autogen/user/irc_options.asciidoc +++ b/doc/en/autogen/user/irc_options.asciidoc @@ -448,7 +448,7 @@ ** values: on, off (default value: `off`) * [[option_irc.server_default.addresses]] *irc.server_default.addresses* -** description: `list of hostname/port or IP/port for server (separated by comma)` +** description: `list of hostname/port or IP/port for server (separated by comma) (note: content is evaluated, see /help eval)` ** type: string ** values: any string (default value: `""`) diff --git a/doc/fr/autogen/user/irc_options.asciidoc b/doc/fr/autogen/user/irc_options.asciidoc index c691f7b6c..d6e2f4fb9 100644 --- a/doc/fr/autogen/user/irc_options.asciidoc +++ b/doc/fr/autogen/user/irc_options.asciidoc @@ -448,7 +448,7 @@ ** valeurs: on, off (valeur par défaut: `off`) * [[option_irc.server_default.addresses]] *irc.server_default.addresses* -** description: `liste de nom/port ou IP/port pour le serveur (séparés par des virgules)` +** description: `liste de nom/port ou IP/port pour 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: `""`) diff --git a/doc/it/autogen/user/irc_options.asciidoc b/doc/it/autogen/user/irc_options.asciidoc index 071499f35..dca1ae4a6 100644 --- a/doc/it/autogen/user/irc_options.asciidoc +++ b/doc/it/autogen/user/irc_options.asciidoc @@ -448,7 +448,7 @@ ** valori: on, off (valore predefinito: `off`) * [[option_irc.server_default.addresses]] *irc.server_default.addresses* -** descrizione: `elenco di host/porte o IP/porte per il server (separati da virgole)` +** descrizione: `list of hostname/port or IP/port for server (separated by comma) (note: content is evaluated, see /help eval)` ** tipo: stringa ** valori: qualsiasi stringa (valore predefinito: `""`) diff --git a/doc/ja/autogen/user/irc_options.asciidoc b/doc/ja/autogen/user/irc_options.asciidoc index d9fe6c4de..fa9e30ebc 100644 --- a/doc/ja/autogen/user/irc_options.asciidoc +++ b/doc/ja/autogen/user/irc_options.asciidoc @@ -448,7 +448,7 @@ ** 値: on, off (デフォルト値: `off`) * [[option_irc.server_default.addresses]] *irc.server_default.addresses* -** 説明: `サーバのホスト名/ポート番号又は IP アドレス/ポート番号のリスト (コンマ区切り)` +** 説明: `list of hostname/port or IP/port for server (separated by comma) (note: content is evaluated, see /help eval)` ** タイプ: 文字列 ** 値: 未制約文字列 (デフォルト値: `""`) diff --git a/doc/pl/autogen/user/irc_options.asciidoc b/doc/pl/autogen/user/irc_options.asciidoc index e5682551d..818ef0325 100644 --- a/doc/pl/autogen/user/irc_options.asciidoc +++ b/doc/pl/autogen/user/irc_options.asciidoc @@ -448,7 +448,7 @@ ** wartości: on, off (domyślna wartość: `off`) * [[option_irc.server_default.addresses]] *irc.server_default.addresses* -** opis: `lista host/port lub adres IP/port dla serwera (oddzielone przecinkiem)` +** opis: `list of hostname/port or IP/port for server (separated by comma) (note: content is evaluated, see /help eval)` ** typ: ciąg ** wartości: dowolny ciąg (domyślna wartość: `""`) @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 20:42+0100\n" +"POT-Creation-Date: 2016-01-02 10:06+0100\n" "PO-Revision-Date: 2015-12-20 17:33+0100\n" "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -6857,9 +6857,11 @@ msgstr "" msgid "%s%s: error creating CTCP \"%s\" => \"%s\"" msgstr "%s%s: chyba vytváření CTCP \"%s\" => \"%s\"" -msgid "list of hostname/port or IP/port for server (separated by comma)" -msgstr "" -"seznam jmen hostů nebo IP adres (s porty) pro servery (oddělený čárkami)" +#, fuzzy +msgid "" +"list of hostname/port or IP/port for 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ů" msgid "" "name of proxy used for this server (optional, proxy must be defined with " @@ -11266,5 +11268,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\" neočekávaná chyba (%d)" +#~ msgid "list of hostname/port or IP/port for server (separated by comma)" +#~ msgstr "" +#~ "seznam jmen hostů nebo IP adres (s porty) pro servery (oddělený čárkami)" + #~ msgid "(unknown)" #~ msgstr "(neznámý)" @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 20:42+0100\n" +"POT-Creation-Date: 2016-01-02 10:06+0100\n" "PO-Revision-Date: 2015-12-25 10:10+0100\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <>\n" @@ -7899,9 +7899,13 @@ msgstr "" msgid "%s%s: error creating CTCP \"%s\" => \"%s\"" msgstr "%s%s: Fehler bei CTCP Erstellung \"%s\" => \"%s\"" -msgid "list of hostname/port or IP/port for server (separated by comma)" +#, fuzzy +msgid "" +"list of hostname/port or IP/port for server (separated by comma) (note: " +"content is evaluated, see /help eval)" msgstr "" -"Liste der Hostnamen/Ports oder IP/Ports des Servers (durch Komma getrennt)" +"Nicknamen, die auf dem IRC-Server benutzt werden sollen (durch Komma " +"getrennt) (Hinweis: Inhalt wird evaluiert, siehe /help eval)" msgid "" "name of proxy used for this server (optional, proxy must be defined with " @@ -12803,5 +12807,9 @@ msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "" "%s%s: Verbindung konnte nicht hergestellt werden: unerwarteter Fehler (%d)" +#~ msgid "list of hostname/port or IP/port for server (separated by comma)" +#~ msgstr "" +#~ "Liste der Hostnamen/Ports oder IP/Ports des Servers (durch Komma getrennt)" + #~ msgid "(unknown)" #~ msgstr "(unbekannt)" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 20:42+0100\n" +"POT-Creation-Date: 2016-01-02 10:06+0100\n" "PO-Revision-Date: 2015-12-02 19:26+0100\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7102,8 +7102,11 @@ msgstr "" msgid "%s%s: error creating CTCP \"%s\" => \"%s\"" msgstr "%s%s: error al crear CTCP \"%s\" => \"%s\"" -msgid "list of hostname/port or IP/port for server (separated by comma)" -msgstr "lista de dirección/puerto para el servidor (separados por comas)" +#, fuzzy +msgid "" +"list of hostname/port or IP/port for server (separated by comma) (note: " +"content is evaluated, see /help eval)" +msgstr "comando ejecutado cuando WeeChat inicia, antes de cargar los plugins" msgid "" "name of proxy used for this server (optional, proxy must be defined with " @@ -11535,5 +11538,8 @@ 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 "list of hostname/port or IP/port for server (separated by comma)" +#~ msgstr "lista de dirección/puerto para el servidor (separados por comas)" + #~ msgid "(unknown)" #~ msgstr "(desconocido)" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 20:42+0100\n" -"PO-Revision-Date: 2016-01-01 10:25+0100\n" +"POT-Creation-Date: 2016-01-02 10:06+0100\n" +"PO-Revision-Date: 2016-01-02 10:07+0100\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -7740,9 +7740,12 @@ msgstr "" msgid "%s%s: error creating CTCP \"%s\" => \"%s\"" msgstr "%s%s : erreur en création du CTCP \"%s\" => \"%s\"" -msgid "list of hostname/port or IP/port for server (separated by comma)" +msgid "" +"list of hostname/port or IP/port for server (separated by comma) (note: " +"content is evaluated, see /help eval)" msgstr "" -"liste de nom/port ou IP/port pour le serveur (séparés par des virgules)" +"liste de nom/port ou IP/port pour le serveur (séparés par des virgules) " +"(note : le contenu est évalué, voir /help eval)" msgid "" "name of proxy used for this server (optional, proxy must be defined with " @@ -12541,5 +12544,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 "list of hostname/port or IP/port for server (separated by comma)" +#~ msgstr "" +#~ "liste de nom/port ou IP/port pour le serveur (séparés par des virgules)" + #~ msgid "(unknown)" #~ msgstr "(inconnu)" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 20:42+0100\n" +"POT-Creation-Date: 2016-01-02 10:06+0100\n" "PO-Revision-Date: 2015-12-02 19:26+0100\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -6344,7 +6344,9 @@ msgid "%s%s: error creating CTCP \"%s\" => \"%s\"" msgstr "%s nincs elég memória az információs pult üzenethez\n" #, fuzzy -msgid "list of hostname/port or IP/port for server (separated by comma)" +msgid "" +"list of hostname/port or IP/port for server (separated by comma) (note: " +"content is evaluated, see /help eval)" msgstr "felhasználónév az IRC szerveren" msgid "" @@ -10587,5 +10589,9 @@ msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s DCC: nem sikerült kapcsolódni a küldőhöz\n" +#, fuzzy +#~ msgid "list of hostname/port or IP/port for server (separated by comma)" +#~ msgstr "felhasználónév az IRC szerveren" + #~ msgid "(unknown)" #~ msgstr "(ismeretlen)" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 20:42+0100\n" +"POT-Creation-Date: 2016-01-02 10:06+0100\n" "PO-Revision-Date: 2015-12-02 19:26+0100\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7252,8 +7252,13 @@ msgstr "" msgid "%s%s: error creating CTCP \"%s\" => \"%s\"" msgstr "%s%s: errore nella creazione del CTCP \"%s\" => \"%s\"" -msgid "list of hostname/port or IP/port for server (separated by comma)" -msgstr "elenco di host/porte o IP/porte per il server (separati da virgole)" +#, fuzzy +msgid "" +"list of hostname/port or IP/port for 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)" msgid "" "name of proxy used for this server (optional, proxy must be defined with " @@ -11718,5 +11723,8 @@ 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 "list of hostname/port or IP/port for server (separated by comma)" +#~ msgstr "elenco di host/porte o IP/porte per il server (separati da virgole)" + #~ msgid "(unknown)" #~ msgstr "(sconosciuto)" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 20:42+0100\n" +"POT-Creation-Date: 2016-01-02 10:06+0100\n" "PO-Revision-Date: 2015-12-25 09:00+0900\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n" @@ -7434,9 +7434,13 @@ msgstr "" msgid "%s%s: error creating CTCP \"%s\" => \"%s\"" msgstr "%s%s: CTCP の作成中にエラー \"%s\" => \"%s\"" -msgid "list of hostname/port or IP/port for server (separated by comma)" +#, fuzzy +msgid "" +"list of hostname/port or IP/port for server (separated by comma) (note: " +"content is evaluated, see /help eval)" msgstr "" -"サーバのホスト名/ポート番号又は IP アドレス/ポート番号のリスト (コンマ区切り)" +"サーバで使用するニックネーム (コンマ区切り) (注意: 値は評価されます、/help " +"eval を参照してください)" msgid "" "name of proxy used for this server (optional, proxy must be defined with " @@ -12058,5 +12062,10 @@ msgstr "%s%s: \"%s\" のタイムアウト %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: 接続できません: 未定義のエラー (%d)" +#~ msgid "list of hostname/port or IP/port for server (separated by comma)" +#~ msgstr "" +#~ "サーバのホスト名/ポート番号又は IP アドレス/ポート番号のリスト (コンマ区切" +#~ "り)" + #~ msgid "(unknown)" #~ msgstr "(未定義)" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 20:42+0100\n" +"POT-Creation-Date: 2016-01-02 10:06+0100\n" "PO-Revision-Date: 2015-12-02 19:26+0100\n" "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7553,8 +7553,13 @@ msgstr "" msgid "%s%s: error creating CTCP \"%s\" => \"%s\"" msgstr "%s%s: błąd podczas tworzenia CTCP \"%s\" => \"%s\"" -msgid "list of hostname/port or IP/port for server (separated by comma)" -msgstr "lista host/port lub adres IP/port dla serwera (oddzielone przecinkiem)" +#, fuzzy +msgid "" +"list of hostname/port or IP/port for server (separated by comma) (note: " +"content is evaluated, see /help eval)" +msgstr "" +"nazwy użytkownika do użycia na serwerze (oddzielone przecinkiem) (uwaga: " +"zawartość jest przetwarzana, zobacz /help eval)" msgid "" "name of proxy used for this server (optional, proxy must be defined with " @@ -12246,5 +12251,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 "list of hostname/port or IP/port for server (separated by comma)" +#~ msgstr "" +#~ "lista host/port lub adres IP/port dla serwera (oddzielone przecinkiem)" + #~ msgid "(unknown)" #~ msgstr "(nieznane)" diff --git a/po/pt_BR.po b/po/pt_BR.po index be07a4b97..0160bc73c 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 20:42+0100\n" +"POT-Creation-Date: 2016-01-02 10:06+0100\n" "PO-Revision-Date: 2015-09-30 20:56+0200\n" "Last-Translator: Eduardo Elias <camponez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -6717,9 +6717,13 @@ msgstr "" msgid "%s%s: error creating CTCP \"%s\" => \"%s\"" msgstr "%s%s: erro ao criar CTCP \"%s\" => \"%s\"" -msgid "list of hostname/port or IP/port for server (separated by comma)" +#, fuzzy +msgid "" +"list of hostname/port or IP/port for server (separated by comma) (note: " +"content is evaluated, see /help eval)" msgstr "" -"lista de hostname/porta ou IP/porta para o servidor (separados por vírgula)" +"comando executado quando o WeeChat inicia, antes do carregamento dos plugins " +"(nota: conteúdo é avaliado, veja /help eval)" msgid "" "name of proxy used for this server (optional, proxy must be defined with " @@ -11018,5 +11022,10 @@ 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 "list of hostname/port or IP/port for server (separated by comma)" +#~ msgstr "" +#~ "lista de hostname/porta ou IP/porta para o servidor (separados por " +#~ "vírgula)" + #~ msgid "(unknown)" #~ msgstr "(desconhecido)" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 20:42+0100\n" +"POT-Creation-Date: 2016-01-02 10:06+0100\n" "PO-Revision-Date: 2015-12-02 19:26+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -6374,7 +6374,9 @@ msgid "%s%s: error creating CTCP \"%s\" => \"%s\"" msgstr "%s недостаточно памяти для сообщения в строке информации\n" #, fuzzy -msgid "list of hostname/port or IP/port for server (separated by comma)" +msgid "" +"list of hostname/port or IP/port for server (separated by comma) (note: " +"content is evaluated, see /help eval)" msgstr "ник, используемый на IRC сервере" msgid "" @@ -10614,5 +10616,9 @@ msgstr "%s нет аргумента для параметра \"%s\"\n" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s DCC: не могу соединиться с отправителем\n" +#, fuzzy +#~ msgid "list of hostname/port or IP/port for server (separated by comma)" +#~ msgstr "ник, используемый на IRC сервере" + #~ msgid "(unknown)" #~ msgstr "(неизвестен)" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 20:42+0100\n" +"POT-Creation-Date: 2016-01-02 10:06+0100\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" @@ -5698,7 +5698,9 @@ msgstr "" msgid "%s%s: error creating CTCP \"%s\" => \"%s\"" msgstr "" -msgid "list of hostname/port or IP/port for server (separated by comma)" +msgid "" +"list of hostname/port or IP/port for server (separated by comma) (note: " +"content is evaluated, see /help eval)" msgstr "" msgid "" diff --git a/po/weechat.pot b/po/weechat.pot index a265fccfe..65865eb88 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 20:42+0100\n" +"POT-Creation-Date: 2016-01-02 10:06+0100\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" @@ -5624,7 +5624,9 @@ msgstr "" msgid "%s%s: error creating CTCP \"%s\" => \"%s\"" msgstr "" -msgid "list of hostname/port or IP/port for server (separated by comma)" +msgid "" +"list of hostname/port or IP/port for server (separated by comma) (note: " +"content is evaluated, see /help eval)" msgstr "" msgid "" diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index a4a608088..20b6aff58 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -1593,7 +1593,8 @@ irc_config_server_new_option (struct t_config_file *config_file, config_file, section, option_name, "string", N_("list of hostname/port or IP/port for server (separated by " - "comma)"), + "comma) " + "(note: content is evaluated, see /help eval)"), NULL, 0, 0, default_value, value, null_value_allowed, diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index 19193c688..6c081e3a0 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -408,7 +408,7 @@ void irc_server_set_addresses (struct t_irc_server *server, const char *addresses) { int i; - char *pos, *error; + char *pos, *error, *addresses_eval; long number; /* free data */ @@ -432,8 +432,11 @@ irc_server_set_addresses (struct t_irc_server *server, const char *addresses) /* set new addresses/ports */ if (addresses && addresses[0]) { + addresses_eval = weechat_string_eval_expression (addresses, + NULL, NULL, NULL); server->addresses_array = weechat_string_split ( - addresses, ",", 0, 0, &server->addresses_count); + (addresses_eval) ? addresses_eval : addresses, + ",", 0, 0, &server->addresses_count); server->ports_array = malloc ( server->addresses_count * sizeof (server->ports_array[0])); server->retry_array = malloc ( @@ -456,6 +459,8 @@ irc_server_set_addresses (struct t_irc_server *server, const char *addresses) } server->retry_array[i] = 0; } + if (addresses_eval) + free (addresses_eval); } } |