scripts: display the script name in stdout/stderr output from scripts

This commit is contained in:
Sébastien Helleu 2018-02-19 21:27:08 +01:00
parent 5e3c55bacc
commit 20f9ca7d4a
19 changed files with 62 additions and 47 deletions

View File

@ -38,6 +38,7 @@ Improvements::
* api: add time in info "date" (WeeChat compilation date/time) (issue #1138)
* irc: allow ${irc_server.xxx} and ${server} in server evaluated options (issue #1144)
* script: change default value of option script.look.sort from "p,n" to "i,p,n"
* scripts: display the script name in stdout/stderr output from scripts
Build::

View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-02-10 08:21+0100\n"
"POT-Creation-Date: 2018-02-19 21:26+0100\n"
"PO-Revision-Date: 2018-02-05 21:30+0100\n"
"Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6101,7 +6101,7 @@ msgid "Support of scheme scripts (with Guile)"
msgstr "Podpora scriptů v Sheme (pomocí Guile)"
#, fuzzy, c-format
msgid "%s: stdout/stderr: %s"
msgid "%s: stdout/stderr (%s): %s"
msgstr "%s: stdout/stderr: %s%s"
#, c-format

View File

@ -24,7 +24,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-02-10 08:21+0100\n"
"POT-Creation-Date: 2018-02-19 21:26+0100\n"
"PO-Revision-Date: 2018-02-10 10:14+0100\n"
"Last-Translator: w8rabbit <w8rabbit@mail.i2p>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n"
@ -7502,8 +7502,8 @@ msgstr "%s: registriertes Skript \"%s\", Version %s (%s)"
msgid "Support of scheme scripts (with Guile)"
msgstr "Unterstützung von Scheme-Skripten (mittels Guile)"
#, c-format
msgid "%s: stdout/stderr: %s"
#, fuzzy, c-format
msgid "%s: stdout/stderr (%s): %s"
msgstr "%s: stdout/stderr: %s"
#, c-format
@ -14501,4 +14501,3 @@ msgstr "%s%s: Zeitüberschreitung für \"%s\" mit %s"
msgid "%s%s: unable to connect: unexpected error (%d)"
msgstr ""
"%s%s: Verbindung konnte nicht hergestellt werden: unerwarteter Fehler (%d)"

View File

@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-02-10 08:21+0100\n"
"POT-Creation-Date: 2018-02-19 21:26+0100\n"
"PO-Revision-Date: 2018-02-05 21:30+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6330,7 +6330,7 @@ msgid "Support of scheme scripts (with Guile)"
msgstr ""
#, fuzzy, c-format
msgid "%s: stdout/stderr: %s"
msgid "%s: stdout/stderr (%s): %s"
msgstr "%s: stdout/stderr: %s%s"
#, c-format

View File

@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-02-10 08:21+0100\n"
"PO-Revision-Date: 2018-02-10 08:21+0100\n"
"POT-Creation-Date: 2018-02-19 21:26+0100\n"
"PO-Revision-Date: 2018-02-19 21:26+0100\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@ -7343,8 +7343,8 @@ msgid "Support of scheme scripts (with Guile)"
msgstr "Support des scripts scheme (avec Guile)"
#, c-format
msgid "%s: stdout/stderr: %s"
msgstr "%s : stdout/stderr : %s"
msgid "%s: stdout/stderr (%s): %s"
msgstr "%s : stdout/stderr (%s) : %s"
#, c-format
msgid "%s%s: function \"%s\" must return a valid value"

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-02-10 08:21+0100\n"
"POT-Creation-Date: 2018-02-19 21:26+0100\n"
"PO-Revision-Date: 2018-01-06 13:50+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5627,7 +5627,7 @@ msgid "Support of scheme scripts (with Guile)"
msgstr ""
#, fuzzy, c-format
msgid "%s: stdout/stderr: %s"
msgid "%s: stdout/stderr (%s): %s"
msgstr "%sSzerver: %s%s\n"
#, fuzzy, c-format

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-02-10 08:21+0100\n"
"POT-Creation-Date: 2018-02-19 21:26+0100\n"
"PO-Revision-Date: 2018-02-05 21:30+0100\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6504,7 +6504,7 @@ msgid "Support of scheme scripts (with Guile)"
msgstr "Supporto agli script scheme (con Guile)"
#, fuzzy, c-format
msgid "%s: stdout/stderr: %s"
msgid "%s: stdout/stderr (%s): %s"
msgstr "%s: stdout/stderr: %s%s"
#, c-format

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-02-10 08:21+0100\n"
"POT-Creation-Date: 2018-02-19 21:26+0100\n"
"PO-Revision-Date: 2018-02-10 09:00+0900\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@ -7021,8 +7021,8 @@ msgstr "%s: スクリプト \"%s\"、バージョン %s (%s) が登録されま
msgid "Support of scheme scripts (with Guile)"
msgstr "scheme スクリプトサポート (Guile を利用)"
#, c-format
msgid "%s: stdout/stderr: %s"
#, fuzzy, c-format
msgid "%s: stdout/stderr (%s): %s"
msgstr "%s: 標準出力/標準エラー: %s"
#, c-format

View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-02-10 08:21+0100\n"
"POT-Creation-Date: 2018-02-19 21:26+0100\n"
"PO-Revision-Date: 2018-02-05 21:30+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -7153,8 +7153,8 @@ msgstr "%s: zarejestrowano skrypt \"%s\", wersja %s (%s)"
msgid "Support of scheme scripts (with Guile)"
msgstr "Wsparcie dla skryptów scheme (za pomocą Guile)"
#, c-format
msgid "%s: stdout/stderr: %s"
#, fuzzy, c-format
msgid "%s: stdout/stderr (%s): %s"
msgstr "%s: stdout/stderr: %s"
#, c-format

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-02-10 08:21+0100\n"
"POT-Creation-Date: 2018-02-19 21:26+0100\n"
"PO-Revision-Date: 2018-02-05 21:30+0100\n"
"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
"Language-Team: Portuguese <>\n"
@ -6862,7 +6862,7 @@ msgid "Support of scheme scripts (with Guile)"
msgstr "Suporte de scripts scheme (com Guile)"
#, fuzzy, c-format
msgid "%s: stdout/stderr: %s"
msgid "%s: stdout/stderr (%s): %s"
msgstr "%s: stdout/stderr: %s%s"
#, c-format

View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-02-10 08:21+0100\n"
"POT-Creation-Date: 2018-02-19 21:26+0100\n"
"PO-Revision-Date: 2018-02-05 21:30+0100\n"
"Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6287,7 +6287,7 @@ msgid "Support of scheme scripts (with Guile)"
msgstr ""
#, fuzzy, c-format
msgid "%s: stdout/stderr: %s"
msgid "%s: stdout/stderr (%s): %s"
msgstr "%s: stdout/stderr: %s%s"
#, c-format

View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-02-10 08:21+0100\n"
"POT-Creation-Date: 2018-02-19 21:26+0100\n"
"PO-Revision-Date: 2018-01-06 13:50+0100\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5665,7 +5665,7 @@ msgid "Support of scheme scripts (with Guile)"
msgstr ""
#, fuzzy, c-format
msgid "%s: stdout/stderr: %s"
msgid "%s: stdout/stderr (%s): %s"
msgstr "%sСервер: %s%s\n"
#, fuzzy, c-format

View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-02-10 08:21+0100\n"
"POT-Creation-Date: 2018-02-19 21:26+0100\n"
"PO-Revision-Date: 2017-06-26 23:33+0200\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5193,7 +5193,7 @@ msgid "Support of scheme scripts (with Guile)"
msgstr ""
#, fuzzy, c-format
msgid "%s: stdout/stderr: %s"
msgid "%s: stdout/stderr (%s): %s"
msgstr "%s%s: hata: %s"
#, c-format

View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-02-10 08:21+0100\n"
"POT-Creation-Date: 2018-02-19 21:26+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"
@ -5134,7 +5134,7 @@ msgid "Support of scheme scripts (with Guile)"
msgstr ""
#, c-format
msgid "%s: stdout/stderr: %s"
msgid "%s: stdout/stderr (%s): %s"
msgstr ""
#, c-format

View File

@ -162,9 +162,12 @@ weechat_guile_output_flush ()
else
{
/* script (no eval mode) */
weechat_printf (NULL,
weechat_gettext ("%s: stdout/stderr: %s"),
GUILE_PLUGIN_NAME, *guile_buffer_output);
weechat_printf (
NULL,
weechat_gettext ("%s: stdout/stderr (%s): %s"),
GUILE_PLUGIN_NAME,
(guile_current_script) ? guile_current_script->name : "?",
*guile_buffer_output);
}
weechat_string_dyn_copy (guile_buffer_output, NULL);

View File

@ -234,9 +234,12 @@ weechat_lua_output_flush ()
else
{
/* script (no eval mode) */
weechat_printf (NULL,
weechat_gettext ("%s: stdout/stderr: %s"),
LUA_PLUGIN_NAME, *lua_buffer_output);
weechat_printf (
NULL,
weechat_gettext ("%s: stdout/stderr (%s): %s"),
LUA_PLUGIN_NAME,
(lua_current_script) ? lua_current_script->name : "?",
*lua_buffer_output);
}
weechat_string_dyn_copy (lua_buffer_output, NULL);

View File

@ -270,9 +270,12 @@ weechat_perl_output_flush ()
else
{
/* script (no eval mode) */
weechat_printf (NULL,
weechat_gettext ("%s: stdout/stderr: %s"),
PERL_PLUGIN_NAME, *perl_buffer_output);
weechat_printf (
NULL,
weechat_gettext ("%s: stdout/stderr (%s): %s"),
PERL_PLUGIN_NAME,
(perl_current_script) ? perl_current_script->name : "?",
*perl_buffer_output);
}
weechat_string_dyn_copy (perl_buffer_output, NULL);

View File

@ -381,9 +381,12 @@ weechat_python_output_flush ()
else
{
/* script (no eval mode) */
weechat_printf (NULL,
weechat_gettext ("%s: stdout/stderr: %s"),
PYTHON_PLUGIN_NAME, *python_buffer_output);
weechat_printf (
NULL,
weechat_gettext ("%s: stdout/stderr (%s): %s"),
PYTHON_PLUGIN_NAME,
(python_current_script) ? python_current_script->name : "?",
*python_buffer_output);
}
weechat_string_dyn_copy (python_buffer_output, NULL);

View File

@ -406,9 +406,12 @@ weechat_ruby_output_flush ()
else
{
/* script (no eval mode) */
weechat_printf (NULL,
weechat_gettext ("%s: stdout/stderr: %s"),
RUBY_PLUGIN_NAME, *ruby_buffer_output);
weechat_printf (
NULL,
weechat_gettext ("%s: stdout/stderr (%s): %s"),
RUBY_PLUGIN_NAME,
(ruby_current_script) ? ruby_current_script->name : "?",
*ruby_buffer_output);
}
weechat_string_dyn_copy (ruby_buffer_output, NULL);