diff options
| -rw-r--r-- | ChangeLog.asciidoc | 2 | ||||
| -rw-r--r-- | ReleaseNotes.asciidoc | 8 | ||||
| -rw-r--r-- | doc/de/autogen/user/relay_options.asciidoc | 2 | ||||
| -rw-r--r-- | doc/en/autogen/user/relay_options.asciidoc | 2 | ||||
| -rw-r--r-- | doc/fr/autogen/user/relay_options.asciidoc | 2 | ||||
| -rw-r--r-- | doc/it/autogen/user/relay_options.asciidoc | 2 | ||||
| -rw-r--r-- | doc/ja/autogen/user/relay_options.asciidoc | 2 | ||||
| -rw-r--r-- | doc/pl/autogen/user/relay_options.asciidoc | 2 | ||||
| -rw-r--r-- | po/cs.po | 16 | ||||
| -rw-r--r-- | po/de.po | 21 | ||||
| -rw-r--r-- | po/es.po | 14 | ||||
| -rw-r--r-- | po/fr.po | 23 | ||||
| -rw-r--r-- | po/hu.po | 16 | ||||
| -rw-r--r-- | po/it.po | 14 | ||||
| -rw-r--r-- | po/ja.po | 37 | ||||
| -rw-r--r-- | po/pl.po | 15 | ||||
| -rw-r--r-- | po/pt_BR.po | 14 | ||||
| -rw-r--r-- | po/ru.po | 16 | ||||
| -rw-r--r-- | po/tr.po | 11 | ||||
| -rw-r--r-- | po/weechat.pot | 11 | ||||
| -rw-r--r-- | src/plugins/relay/irc/relay-irc.h | 1 | ||||
| -rw-r--r-- | src/plugins/relay/relay-config.c | 58 |
22 files changed, 173 insertions, 116 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index 4b950cf9c..b1669e026 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -37,6 +37,8 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] * irc: fix translation of CTCP PING reply (closes #137) * lua: add detection of Lua 5.2 * python: fix Python detection with Homebrew (closes #217) +* relay: use comma separator in option relay.irc.backlog_tags, check the value + of option when it is changed with /set * relay: remove "::ffff:" from IPv4-mapped IPv6 client address (closes #111) == Version 1.0.1 (2014-09-28) diff --git a/ReleaseNotes.asciidoc b/ReleaseNotes.asciidoc index 26ae79f39..c6a4a54b0 100644 --- a/ReleaseNotes.asciidoc +++ b/ReleaseNotes.asciidoc @@ -17,6 +17,14 @@ http://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog] == Version 1.1 (under dev) +=== Relay option relay.irc.backlog_tags + +The option 'relay.irc.backlog_tags' is now a list separated by commas +(it was separated by semicolons in older versions). + +If you are using a list of tags in this option, you must adjust the value +manually. + === IPv4-mapped IPv6 client address in relay The string "::ffff:" has been removed from IPv4-mapped IPv6 client address diff --git a/doc/de/autogen/user/relay_options.asciidoc b/doc/de/autogen/user/relay_options.asciidoc index 20c717964..c8b53e26a 100644 --- a/doc/de/autogen/user/relay_options.asciidoc +++ b/doc/de/autogen/user/relay_options.asciidoc @@ -59,7 +59,7 @@ ** Werte: on, off (Standardwert: `on`) * [[option_relay.irc.backlog_tags]] *relay.irc.backlog_tags* -** Beschreibung: `Nachrichten-Tags welche im Verlaufsspeicher, für IRC Channels, angezeigt werden (unterstützte Tags: "irc_join", "irc_part", "irc_quit", "irc_nick", "irc_privmsg"), "*" = alle unterstützten Tags` +** Beschreibung: `comma-separated list of messages tags which are displayed in backlog per IRC channel (supported tags: "irc_join", "irc_part", "irc_quit", "irc_nick", "irc_privmsg"), "*" = all supported tags` ** Typ: Zeichenkette ** Werte: beliebige Zeichenkette (Standardwert: `"irc_privmsg"`) diff --git a/doc/en/autogen/user/relay_options.asciidoc b/doc/en/autogen/user/relay_options.asciidoc index 70bfe3d3f..fd439b5e1 100644 --- a/doc/en/autogen/user/relay_options.asciidoc +++ b/doc/en/autogen/user/relay_options.asciidoc @@ -59,7 +59,7 @@ ** values: on, off (default value: `on`) * [[option_relay.irc.backlog_tags]] *relay.irc.backlog_tags* -** description: `tags of messages which are displayed in backlog per IRC channel (supported tags: "irc_join", "irc_part", "irc_quit", "irc_nick", "irc_privmsg"), "*" = all supported tags` +** description: `comma-separated list of messages tags which are displayed in backlog per IRC channel (supported tags: "irc_join", "irc_part", "irc_quit", "irc_nick", "irc_privmsg"), "*" = all supported tags` ** type: string ** values: any string (default value: `"irc_privmsg"`) diff --git a/doc/fr/autogen/user/relay_options.asciidoc b/doc/fr/autogen/user/relay_options.asciidoc index 26278c002..460b114a4 100644 --- a/doc/fr/autogen/user/relay_options.asciidoc +++ b/doc/fr/autogen/user/relay_options.asciidoc @@ -59,7 +59,7 @@ ** valeurs: on, off (valeur par défaut: `on`) * [[option_relay.irc.backlog_tags]] *relay.irc.backlog_tags* -** description: `étiquettes des messages qui sont affichés dans l'historique par canal IRC (étiquettes supportées : "irc_join", "irc_part", "irc_quit", "irc_nick", "irc_privmsg"), "*" = toutes les étiquettes supportées` +** description: `liste d'étiquettes de messages (séparées par des virgules) qui sont affichés dans l'historique par canal IRC (étiquettes supportées : "irc_join", "irc_part", "irc_quit", "irc_nick", "irc_privmsg"), "*" = toutes les étiquettes supportées` ** type: chaîne ** valeurs: toute chaîne (valeur par défaut: `"irc_privmsg"`) diff --git a/doc/it/autogen/user/relay_options.asciidoc b/doc/it/autogen/user/relay_options.asciidoc index 22b29063d..b08912850 100644 --- a/doc/it/autogen/user/relay_options.asciidoc +++ b/doc/it/autogen/user/relay_options.asciidoc @@ -59,7 +59,7 @@ ** valori: on, off (valore predefinito: `on`) * [[option_relay.irc.backlog_tags]] *relay.irc.backlog_tags* -** descrizione: `tags of messages which are displayed in backlog per IRC channel (supported tags: "irc_join", "irc_part", "irc_quit", "irc_nick", "irc_privmsg"), "*" = all supported tags` +** descrizione: `comma-separated list of messages tags which are displayed in backlog per IRC channel (supported tags: "irc_join", "irc_part", "irc_quit", "irc_nick", "irc_privmsg"), "*" = all supported tags` ** tipo: stringa ** valori: qualsiasi stringa (valore predefinito: `"irc_privmsg"`) diff --git a/doc/ja/autogen/user/relay_options.asciidoc b/doc/ja/autogen/user/relay_options.asciidoc index fb000e404..e58762903 100644 --- a/doc/ja/autogen/user/relay_options.asciidoc +++ b/doc/ja/autogen/user/relay_options.asciidoc @@ -59,7 +59,7 @@ ** 値: on, off (デフォルト値: `on`) * [[option_relay.irc.backlog_tags]] *relay.irc.backlog_tags* -** 説明: `IRC チャンネルごとのバックログに表示するメッセージのタグ (利用可能なタグ: "irc_join"、"irc_part"、"irc_quit"、"irc_nick"、"irc_privmsg")、"*" = 利用可能な全てのタグ` +** 説明: `comma-separated list of messages tags which are displayed in backlog per IRC channel (supported tags: "irc_join", "irc_part", "irc_quit", "irc_nick", "irc_privmsg"), "*" = all supported tags` ** タイプ: 文字列 ** 値: 未制約文字列 (デフォルト値: `"irc_privmsg"`) diff --git a/doc/pl/autogen/user/relay_options.asciidoc b/doc/pl/autogen/user/relay_options.asciidoc index 49feca873..d3761a370 100644 --- a/doc/pl/autogen/user/relay_options.asciidoc +++ b/doc/pl/autogen/user/relay_options.asciidoc @@ -59,7 +59,7 @@ ** wartości: on, off (domyślna wartość: `on`) * [[option_relay.irc.backlog_tags]] *relay.irc.backlog_tags* -** opis: `tagi dla wiadomości, które są wyświetlane w backlogu dla kanałów IRC (wspierane tagi: "irc_join", "irc_part", "irc_quit", "irc_nick", "irc_privmsg"), "*" = dla wszystkich wspieranych tagów` +** opis: `comma-separated list of messages tags which are displayed in backlog per IRC channel (supported tags: "irc_join", "irc_part", "irc_quit", "irc_nick", "irc_privmsg"), "*" = all supported tags` ** typ: ciąg ** wartości: dowolny ciąg (domyślna wartość: `"irc_privmsg"`) @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-09-20 14:37+0200\n" +"POT-Creation-Date: 2014-10-08 22:22+0200\n" "PO-Revision-Date: 2014-08-16 11:46+0200\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -8680,10 +8680,6 @@ msgid "structure with completion" msgstr "funkce pro příkazovou řádku" #, fuzzy -msgid "structure with partial completion" -msgstr "upozornit uživatele pokud nastane částečné doplnění" - -#, fuzzy msgid "config file" msgstr "konfigurační soubory" @@ -9332,9 +9328,9 @@ msgid "display backlog starting from last client disconnect" msgstr "" msgid "" -"tags of messages which are displayed in backlog per IRC channel (supported " -"tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick\", \"irc_privmsg" -"\"), \"*\" = all supported tags" +"comma-separated list of messages tags which are displayed in backlog per IRC " +"channel (supported tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick" +"\", \"irc_privmsg\"), \"*\" = all supported tags" msgstr "" msgid "" @@ -10793,3 +10789,7 @@ msgstr "%s%s: nemohu nastavit \"neblokovaci\" volbu na soket" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: vypršel časový limit \"%s\" pro %s" + +#, fuzzy +#~ msgid "structure with partial completion" +#~ msgstr "upozornit uživatele pokud nastane částečné doplnění" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-09-20 14:37+0200\n" +"POT-Creation-Date: 2014-10-08 22:22+0200\n" "PO-Revision-Date: 2014-09-21 19:48+0100\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <weechatter@arcor.de>\n" @@ -5641,9 +5641,9 @@ msgid "" "default options for command /exec (see /help exec); example: \"-nosh -bg\" " "to run all commands in background (no output), and without using the shell" msgstr "" -"Standardoptionen für den Befehl /exec (siehe /help exec); Beispiele: \"-" -"nosh -bg\" führt alle Befehle im Hintergrund aus (keine Textausgabe) und " -"ohne das die shell genutzt wird" +"Standardoptionen für den Befehl /exec (siehe /help exec); Beispiele: \"-nosh " +"-bg\" führt alle Befehle im Hintergrund aus (keine Textausgabe) und ohne das " +"die shell genutzt wird" msgid "" "delay for purging finished commands (in seconds, 0 = purge commands " @@ -9774,9 +9774,6 @@ msgstr "besuchte Buffer" msgid "structure with completion" msgstr "Struktur mit Vervollständigung" -msgid "structure with partial completion" -msgstr "Struktur mit teilweise Vervollständigung" - msgid "config file" msgstr "Konfigurationsdatei" @@ -10466,10 +10463,11 @@ msgid "display backlog starting from last client disconnect" msgstr "" "Verlaufsspeicher anzeigen, beginnend mit dem Client der zuletzt beendet wurde" +#, fuzzy msgid "" -"tags of messages which are displayed in backlog per IRC channel (supported " -"tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick\", \"irc_privmsg" -"\"), \"*\" = all supported tags" +"comma-separated list of messages tags which are displayed in backlog per IRC " +"channel (supported tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick" +"\", \"irc_privmsg\"), \"*\" = all supported tags" msgstr "" "Nachrichten-Tags welche im Verlaufsspeicher, für IRC Channels, angezeigt " "werden (unterstützte Tags: \"irc_join\", \"irc_part\", \"irc_quit\", " @@ -12174,3 +12172,6 @@ msgstr "" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: Zeitüberschreitung für \"%s\" mit %s" + +#~ msgid "structure with partial completion" +#~ msgstr "Struktur mit teilweise Vervollständigung" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-09-20 14:37+0200\n" +"POT-Creation-Date: 2014-10-08 22:22+0200\n" "PO-Revision-Date: 2014-08-16 11:46+0200\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -8967,9 +8967,6 @@ msgstr "lista de buffers" msgid "structure with completion" msgstr "estructura con auto-completador" -msgid "structure with partial completion" -msgstr "estructura con auto-completador parcial" - msgid "config file" msgstr "archivo de configuración" @@ -9630,9 +9627,9 @@ msgid "display backlog starting from last client disconnect" msgstr "" msgid "" -"tags of messages which are displayed in backlog per IRC channel (supported " -"tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick\", \"irc_privmsg" -"\"), \"*\" = all supported tags" +"comma-separated list of messages tags which are displayed in backlog per IRC " +"channel (supported tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick" +"\", \"irc_privmsg\"), \"*\" = all supported tags" msgstr "" msgid "" @@ -11076,3 +11073,6 @@ msgstr "%s%s: no es posible configurar la opción \"nonblock\" para el socket" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s" + +#~ msgid "structure with partial completion" +#~ msgstr "estructura con auto-completador parcial" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-09-20 14:37+0200\n" -"PO-Revision-Date: 2014-09-20 14:38+0200\n" +"POT-Creation-Date: 2014-10-08 22:22+0200\n" +"PO-Revision-Date: 2014-10-08 22:23+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -9538,9 +9538,6 @@ msgstr "tampon visité" msgid "structure with completion" msgstr "structure avec une complétion" -msgid "structure with partial completion" -msgstr "structure avec une complétion partielle" - msgid "config file" msgstr "fichier de configuration" @@ -10230,13 +10227,14 @@ msgid "display backlog starting from last client disconnect" msgstr "afficher l'historique en démarrant à la dernière déconnexion du client" msgid "" -"tags of messages which are displayed in backlog per IRC channel (supported " -"tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick\", \"irc_privmsg" -"\"), \"*\" = all supported tags" +"comma-separated list of messages tags which are displayed in backlog per IRC " +"channel (supported tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick" +"\", \"irc_privmsg\"), \"*\" = all supported tags" msgstr "" -"étiquettes des messages qui sont affichés dans l'historique par canal IRC " -"(étiquettes supportées : \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick" -"\", \"irc_privmsg\"), \"*\" = toutes les étiquettes supportées" +"liste d'étiquettes de messages (séparées par des virgules) qui sont affichés " +"dans l'historique par canal IRC (étiquettes supportées : \"irc_join\", " +"\"irc_part\", \"irc_quit\", \"irc_nick\", \"irc_privmsg\"), \"*\" = toutes " +"les étiquettes supportées" msgid "" "format for time in backlog messages (see man strftime for format) (not used " @@ -11922,3 +11920,6 @@ msgstr "" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s : délai d'attente dépassé pour \"%s\" avec %s" + +#~ msgid "structure with partial completion" +#~ msgstr "structure avec une complétion partielle" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-09-20 14:37+0200\n" +"POT-Creation-Date: 2014-10-08 22:22+0200\n" "PO-Revision-Date: 2014-08-16 11:46+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -8072,10 +8072,6 @@ msgid "structure with completion" msgstr "szöveg beillesztése a parancssorba" #, fuzzy -msgid "structure with partial completion" -msgstr "szöveg beillesztése a parancssorba" - -#, fuzzy msgid "config file" msgstr "szerver konfigurációs fájljának újraolvastatása" @@ -8703,9 +8699,9 @@ msgid "display backlog starting from last client disconnect" msgstr "" msgid "" -"tags of messages which are displayed in backlog per IRC channel (supported " -"tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick\", \"irc_privmsg" -"\"), \"*\" = all supported tags" +"comma-separated list of messages tags which are displayed in backlog per IRC " +"channel (supported tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick" +"\", \"irc_privmsg\"), \"*\" = all supported tags" msgstr "" msgid "" @@ -10173,3 +10169,7 @@ msgstr "%s DCC: nem sikerült 'nonblock' opciót beállítani a csatornán\n" #, fuzzy, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n" + +#, fuzzy +#~ msgid "structure with partial completion" +#~ msgstr "szöveg beillesztése a parancssorba" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-09-20 14:37+0200\n" +"POT-Creation-Date: 2014-10-08 22:22+0200\n" "PO-Revision-Date: 2014-08-16 11:46+0200\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -9117,9 +9117,6 @@ msgstr "elenco dei buffer" msgid "structure with completion" msgstr "struttura con completamento" -msgid "structure with partial completion" -msgstr "struttura con completamento parziale" - msgid "config file" msgstr "file di configurazione" @@ -9795,9 +9792,9 @@ msgid "display backlog starting from last client disconnect" msgstr "mostra la cronologia a partire dall'ultima disconnessione del client" msgid "" -"tags of messages which are displayed in backlog per IRC channel (supported " -"tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick\", \"irc_privmsg" -"\"), \"*\" = all supported tags" +"comma-separated list of messages tags which are displayed in backlog per IRC " +"channel (supported tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick" +"\", \"irc_privmsg\"), \"*\" = all supported tags" msgstr "" msgid "" @@ -11247,3 +11244,6 @@ msgstr "" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: timeout per \"%s\" con %s" + +#~ msgid "structure with partial completion" +#~ msgstr "struttura con completamento parziale" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-09-20 14:37+0200\n" +"POT-Creation-Date: 2014-10-08 22:22+0200\n" "PO-Revision-Date: 2014-09-20 23:10+0900\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n" @@ -40,11 +40,11 @@ msgid "max chars" msgstr "最大文字数" msgid "" -"a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)" -"green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal " -"color number or an alias; attributes are allowed before color (for text " -"color only, not background): \"*\" for bold, \"!\" for reverse, \"/\" for " -"italic, \"_\" for underline" +"a WeeChat color name (default, black, (dark)gray, white, (light)red, " +"(light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a " +"terminal color number or an alias; attributes are allowed before color (for " +"text color only, not background): \"*\" for bold, \"!\" for reverse, \"/\" " +"for italic, \"_\" for underline" msgstr "" "WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、" "brown、yellow、(light)blue、(light)magenta、(light)cyan) 、ターミナル色番号ま" @@ -5914,8 +5914,8 @@ msgstr "" " - 内部サーバ名 (/server add で作成されたもの、利用推奨)\n" " - ホスト名/ポート番号又は IP アドレス/ポート番号、デフォルトの" "ポート番号は 6667\n" -" - 次のフォーマットに従う URL: irc[6][s]://[nickname[:password]@]" -"irc.example.org[:port][/#channel1][,#channel2[...]]\n" +" - 次のフォーマットに従う URL: irc[6][s]://[nickname[:" +"password]@]irc.example.org[:port][/#channel1][,#channel2[...]]\n" " 注意: アドレス/IP/URL を指定した場合、サーバを一時的に作ります " "(保存しません)、/help irc.look.temporary_servers を参照してください。\n" " option: サーバに関するオプション (ブール型オプションでは、value は無視さ" @@ -9177,9 +9177,6 @@ msgstr "訪問済みバッファ" msgid "structure with completion" msgstr "補完する構造" -msgid "structure with partial completion" -msgstr "部分補完する構造" - msgid "config file" msgstr "設定ファイル" @@ -9846,10 +9843,11 @@ msgstr "IRC チャンネルごとのバックログの最大行数 (0 = 制限 msgid "display backlog starting from last client disconnect" msgstr "最後にクライアントを切断した以降のバックログを表示" +#, fuzzy msgid "" -"tags of messages which are displayed in backlog per IRC channel (supported " -"tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick\", \"irc_privmsg" -"\"), \"*\" = all supported tags" +"comma-separated list of messages tags which are displayed in backlog per IRC " +"channel (supported tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick" +"\", \"irc_privmsg\"), \"*\" = all supported tags" msgstr "" "IRC チャンネルごとのバックログに表示するメッセージのタグ (利用可能なタグ: " "\"irc_join\"、\"irc_part\"、\"irc_quit\"、\"irc_nick\"、\"irc_privmsg\")、\"*" @@ -10825,8 +10823,8 @@ msgid "" "Examples (you can also look at default triggers with /trigger listdefault):\n" " add text attributes *bold*, _underline_ and /italic/ (only in user " "messages):\n" -" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==\\*" -"(\\S+)\\*==*${color:bold}$1${color:-bold}*== ==_(\\S+)_==_${color:" +" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==" +"\\*(\\S+)\\*==*${color:bold}$1${color:-bold}*== ==_(\\S+)_==_${color:" "underline}$1${color:-underline}_== ==/(\\S+)/==/${color:italic}$1${color:-" "italic}/\"\n" " hide nicklist bar on small terminals:\n" @@ -10902,8 +10900,8 @@ msgstr "" "\n" "例 (/trigger listdefault でデフォルトトリガを見ることができます):\n" " テキスト属性 *太字*、_下線_、/イタリック/ を追加 (ユーザメッセージのみ):\n" -" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==\\*" -"(\\S+)\\*==*${color:bold}$1${color:-bold}*== ==_(\\S+)_==_${color:" +" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==" +"\\*(\\S+)\\*==*${color:bold}$1${color:-bold}*== ==_(\\S+)_==_${color:" "underline}$1${color:-underline}_== ==/(\\S+)/==/${color:italic}$1${color:-" "italic}/\"\n" " 狭い端末ではニックネームリストバーを隠す:\n" @@ -11469,3 +11467,6 @@ msgstr "%s%s: ソケットにオプション \"nonblock\" を設定できませ #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: \"%s\" のタイムアウト %s" + +#~ msgid "structure with partial completion" +#~ msgstr "部分補完する構造" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-09-20 14:37+0200\n" +"POT-Creation-Date: 2014-10-08 22:22+0200\n" "PO-Revision-Date: 2014-09-14 00:18+0100\n" "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -9356,9 +9356,6 @@ msgstr "odwiedzony bufor" msgid "structure with completion" msgstr "struktura z uzupełnianiem" -msgid "structure with partial completion" -msgstr "struktura z częściowym uzupełnianiem" - msgid "config file" msgstr "plik konfiguracyjne" @@ -10039,10 +10036,11 @@ msgstr "" msgid "display backlog starting from last client disconnect" msgstr "wyświetlaj backlog zaczynając od ostatniego rozłączenia klienta" +#, fuzzy msgid "" -"tags of messages which are displayed in backlog per IRC channel (supported " -"tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick\", \"irc_privmsg" -"\"), \"*\" = all supported tags" +"comma-separated list of messages tags which are displayed in backlog per IRC " +"channel (supported tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick" +"\", \"irc_privmsg\"), \"*\" = all supported tags" msgstr "" "tagi dla wiadomości, które są wyświetlane w backlogu dla kanałów IRC " "(wspierane tagi: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick\", " @@ -11680,3 +11678,6 @@ msgstr "%s%s: nie można ustawić opcji \"nonblock\" dla gniazda: błąd %d %s" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: przekroczono czas na \"%s\" z %s" + +#~ msgid "structure with partial completion" +#~ msgstr "struktura z częściowym uzupełnianiem" diff --git a/po/pt_BR.po b/po/pt_BR.po index e94056231..ebc6d77c2 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: 2014-09-20 14:37+0200\n" +"POT-Creation-Date: 2014-10-08 22:22+0200\n" "PO-Revision-Date: 2014-08-16 11:46+0200\n" "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -8348,9 +8348,6 @@ msgstr "lista de buffers" msgid "structure with completion" msgstr "estrutura com completação" -msgid "structure with partial completion" -msgstr "estrutura com completação parcial" - msgid "config file" msgstr "arquivo de configuração" @@ -8976,9 +8973,9 @@ msgid "display backlog starting from last client disconnect" msgstr "" msgid "" -"tags of messages which are displayed in backlog per IRC channel (supported " -"tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick\", \"irc_privmsg" -"\"), \"*\" = all supported tags" +"comma-separated list of messages tags which are displayed in backlog per IRC " +"channel (supported tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick" +"\", \"irc_privmsg\"), \"*\" = all supported tags" msgstr "" msgid "" @@ -10440,3 +10437,6 @@ msgstr "%s%s: não foi possível setar opção \"nonblock\" para o socket" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: tempo esgotado para \"%s\" com %s" + +#~ msgid "structure with partial completion" +#~ msgstr "estrutura com completação parcial" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-09-20 14:37+0200\n" +"POT-Creation-Date: 2014-10-08 22:22+0200\n" "PO-Revision-Date: 2014-08-16 11:46+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -8100,10 +8100,6 @@ msgid "structure with completion" msgstr "вставить строку в поле ввода" #, fuzzy -msgid "structure with partial completion" -msgstr "вставить строку в поле ввода" - -#, fuzzy msgid "config file" msgstr "перезагрузить конфигурационный файл сервера" @@ -8729,9 +8725,9 @@ msgid "display backlog starting from last client disconnect" msgstr "" msgid "" -"tags of messages which are displayed in backlog per IRC channel (supported " -"tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick\", \"irc_privmsg" -"\"), \"*\" = all supported tags" +"comma-separated list of messages tags which are displayed in backlog per IRC " +"channel (supported tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick" +"\", \"irc_privmsg\"), \"*\" = all supported tags" msgstr "" msgid "" @@ -10195,3 +10191,7 @@ msgstr "%s DCC: не могу установить неблокирующий р #, fuzzy, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s нет аргумента для параметра \"%s\"\n" + +#, fuzzy +#~ msgid "structure with partial completion" +#~ msgstr "вставить строку в поле ввода" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-09-20 14:37+0200\n" +"POT-Creation-Date: 2014-10-08 22:22+0200\n" "PO-Revision-Date: 2014-07-25 07:50+0200\n" "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -7264,9 +7264,6 @@ msgstr "" msgid "structure with completion" msgstr "" -msgid "structure with partial completion" -msgstr "" - msgid "config file" msgstr "" @@ -7832,9 +7829,9 @@ msgid "display backlog starting from last client disconnect" msgstr "" msgid "" -"tags of messages which are displayed in backlog per IRC channel (supported " -"tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick\", \"irc_privmsg" -"\"), \"*\" = all supported tags" +"comma-separated list of messages tags which are displayed in backlog per IRC " +"channel (supported tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick" +"\", \"irc_privmsg\"), \"*\" = all supported tags" msgstr "" msgid "" diff --git a/po/weechat.pot b/po/weechat.pot index 5fc5f567a..fed784ede 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: 2014-09-20 14:37+0200\n" +"POT-Creation-Date: 2014-10-08 22:22+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" @@ -7205,9 +7205,6 @@ msgstr "" msgid "structure with completion" msgstr "" -msgid "structure with partial completion" -msgstr "" - msgid "config file" msgstr "" @@ -7773,9 +7770,9 @@ msgid "display backlog starting from last client disconnect" msgstr "" msgid "" -"tags of messages which are displayed in backlog per IRC channel (supported " -"tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick\", \"irc_privmsg" -"\"), \"*\" = all supported tags" +"comma-separated list of messages tags which are displayed in backlog per IRC " +"channel (supported tags: \"irc_join\", \"irc_part\", \"irc_quit\", \"irc_nick" +"\", \"irc_privmsg\"), \"*\" = all supported tags" msgstr "" msgid "" diff --git a/src/plugins/relay/irc/relay-irc.h b/src/plugins/relay/irc/relay-irc.h index 7a908738a..05b3bc9ea 100644 --- a/src/plugins/relay/irc/relay-irc.h +++ b/src/plugins/relay/irc/relay-irc.h @@ -62,6 +62,7 @@ enum t_relay_irc_server_capab RELAY_IRC_NUM_CAPAB, }; +extern int relay_irc_search_backlog_commands_tags (const char *tag); extern void relay_irc_recv (struct t_relay_client *client, const char *data); extern void relay_irc_close_connection (struct t_relay_client *client); diff --git a/src/plugins/relay/relay-config.c b/src/plugins/relay/relay-config.c index 67c5cfaa0..941733566 100644 --- a/src/plugins/relay/relay-config.c +++ b/src/plugins/relay/relay-config.c @@ -20,12 +20,14 @@ */ #include <stdlib.h> +#include <string.h> #include <limits.h> #include <regex.h> #include "../weechat-plugin.h" #include "relay.h" #include "relay-config.h" +#include "irc/relay-irc.h" #include "relay-client.h" #include "relay-buffer.h" #include "relay-network.h" @@ -229,6 +231,50 @@ relay_config_change_network_websocket_allowed_origins (void *data, } /* + * Checks if IRC backlog tags are valid. + * + * Returns: + * 1: IRC backlog tags are valid + * 0: IRC backlog tags are not valid + */ + +int +relay_config_check_irc_backlog_tags (void *data, + struct t_config_option *option, + const char *value) +{ + char **tags; + int num_tags, i, rc; + + /* make C compiler happy */ + (void) data; + (void) option; + + rc = 1; + + /* "*" means all tags */ + if (strcmp (value, "*") == 0) + return rc; + + /* split tags and check them */ + tags = weechat_string_split (value, ",", 0, 0, &num_tags); + if (tags) + { + for (i = 0; i < num_tags; i++) + { + if (relay_irc_search_backlog_commands_tags (tags[i]) < 0) + { + rc = 0; + break; + } + } + weechat_string_free_split (tags); + } + + return rc; +} + +/* * Callback for changes on option "relay.irc.backlog_tags". */ @@ -255,7 +301,7 @@ relay_config_change_irc_backlog_tags (void *data, weechat_hashtable_remove_all (relay_config_hashtable_irc_backlog_tags); items = weechat_string_split (weechat_config_string (relay_config_irc_backlog_tags), - ";", 0, 0, &num_items); + ",", 0, 0, &num_items); if (items) { for (i = 0; i < num_items; i++) @@ -696,10 +742,12 @@ relay_config_init () relay_config_irc_backlog_tags = weechat_config_new_option ( relay_config_file, ptr_section, "backlog_tags", "string", - N_("tags of messages which are displayed in backlog per IRC channel " - "(supported tags: \"irc_join\", \"irc_part\", \"irc_quit\", " - "\"irc_nick\", \"irc_privmsg\"), \"*\" = all supported tags"), - NULL, 0, 0, "irc_privmsg", NULL, 0, NULL, NULL, + N_("comma-separated list of messages tags which are displayed in " + "backlog per IRC channel (supported tags: \"irc_join\", " + "\"irc_part\", \"irc_quit\", \"irc_nick\", \"irc_privmsg\"), " + "\"*\" = all supported tags"), + NULL, 0, 0, "irc_privmsg", NULL, 0, + &relay_config_check_irc_backlog_tags, NULL, &relay_config_change_irc_backlog_tags, NULL, NULL, NULL); relay_config_irc_backlog_time_format = weechat_config_new_option ( relay_config_file, ptr_section, |