pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-02 15:53:12 +02:00
Code Activity

irc: display STATUSMSG actions differently from standard actions on channels (closes #1577, issue #139)

Browse Source
This commit is contained in:
Sébastien Helleu
2023-05-27 09:32:52 +02:00
parent 93d447ffc7
commit 0babf5db23
20 changed files with 251 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.adoc
+1
View File
@@ -44,6 +44,7 @@ New features::
* irc: add support of capabilities "batch" and "draft/multiline" (issue #1292, issue #1923)
* irc: add support of capability "echo-message" (issue #139)
* irc: display CTCP ACTION to channel on the channel buffer (issue #207)
* irc: display STATUSMSG actions differently from standard actions on channels (issue #1577)
* irc: add modifier "irc_cap_sync_req" (issue #1767)
* irc: add support of "LINELEN" in message 005 (max message length in bytes) (issue #1927)
* irc: add support of "UTF8ONLY" in message 005 (issue #1688)
po/cs.po
+7 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-25 22:15+0200\n"
"POT-Creation-Date: 2023-05-27 09:28+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9511,6 +9511,12 @@ msgstr "%s%s: nemohu rozpársovat příkaz \"%s\""
msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s: neznámý DCC CHAT typ obdržen od %s%s%s: \"%s\""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#, fuzzy
#| msgid "Option"
msgid "Action"
msgstr "Volba"
#, c-format
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sNeznámý CTCP požadavek od %s%s%s: %s%s%s%s%s"
po/de.po
+20 -94
View File
@@ -26,7 +26,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-25 22:15+0200\n"
"POT-Creation-Date: 2023-05-27 09:28+0200\n"
"PO-Revision-Date: 2023-05-25 22:34+0200\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -6491,41 +6491,6 @@ msgstr ""
"|| rename <alias> <new_alias>"
#, no-c-format
#| msgid ""
#| " list: list aliases (without argument, this list is displayed)\n"
#| " add: add an alias\n"
#| "addcompletion: add an alias with a custom completion\n"
#| " del: delete an alias\n"
#| " rename: rename an alias\n"
#| " completion: completion for alias: by default completion is done with "
#| "target command\n"
#| " note: you can use %%command to use completion of an "
#| "existing command\n"
#| " alias: name of alias\n"
#| " command: command name with arguments (many commands can be "
#| "separated by semicolons)\n"
#| "\n"
#| "Note: in command, special variables are replaced:\n"
#| " $n: argument 'n' (between 1 and 9)\n"
#| " $-m: arguments from 1 to 'm'\n"
#| " $n-: arguments from 'n' to last\n"
#| " $n-m: arguments from 'n' to 'm'\n"
#| " $*: all arguments\n"
#| " $~: last argument\n"
#| " $var: where \"var\" is a local variable of buffer (see /buffer "
#| "listvar)\n"
#| " examples: $nick, $channel, $server, $plugin, $name\n"
#| "\n"
#| "Examples:\n"
#| " alias /split to split window horizontally:\n"
#| " /alias add split /window splith\n"
#| " alias /hello to say \"hello\" on all channels but not on #weechat:\n"
#| " /alias add hello /allchan -exclude=#weechat hello\n"
#| " rename alias \"hello\" to \"Hello\":\n"
#| " /alias rename hello Hello\n"
#| " alias /forcejoin to send IRC command \"forcejoin\" with completion of /"
#| "sajoin:\n"
#| " /alias addcompletion %%sajoin forcejoin /quote forcejoin"
msgid ""
" list: list aliases (without argument, this list is displayed)\n"
" add: add an alias\n"
@@ -9200,35 +9165,6 @@ msgstr "Aushandlung der Clientfähigkeit"
msgid "ls || list || req|ack [<capability> [<capability>...]] || end"
msgstr "ls || list || req|ack [<capability> [<capability>...]] || end"
#| msgid ""
#| " ls: list the capabilities supported by the server\n"
#| " list: list the capabilities currently enabled\n"
#| " req: request a new capability or remove a capability (if starting with "
#| "\"-\", for example: \"-multi-prefix\")\n"
#| " ack: acknowledge capabilities which require client-side "
#| "acknowledgement\n"
#| " end: end the capability negotiation\n"
#| "\n"
#| "Without argument, \"ls\" and \"list\" are sent.\n"
#| "\n"
#| "Capabilities supported by WeeChat are: account-notify, away-notify, "
#| "batch, cap-notify, chghost, draft/multiline, extended-join, invite-"
#| "notify, message-tags, multi-prefix, server-time, setname, userhost-in-"
#| "names.\n"
#| "\n"
#| "The capabilities to automatically enable on servers can be set in option "
#| "irc.server_default.capabilities (or by server in option irc.server.xxx."
#| "capabilities).\n"
#| "\n"
#| "Examples:\n"
#| " display supported and enabled capabilities:\n"
#| " /cap\n"
#| " request capabilities multi-prefix and away-notify:\n"
#| " /cap req multi-prefix away-notify\n"
#| " request capability extended-join, remove capability multi-prefix:\n"
#| " /cap req extended-join -multi-prefix\n"
#| " remove capability away-notify:\n"
#| " /cap req -away-notify"
msgid ""
" ls: list the capabilities supported by the server\n"
" list: list the capabilities currently enabled\n"
@@ -9267,10 +9203,9 @@ msgstr ""
"\n"
"Ohne Angaben von Argumenten werden \"ls\" und \"list\" gesendet.\n"
"\n"
"Fähigkeiten die von WeeChat unterstützt werden: account-notify, away-notify,"
" batch, "
"cap-notify, chghost, draft/multiline, echo-message, extended-join, invite-"
"notify, message-tags, multi-prefix, server-time, setname, userhost-in-"
"Fähigkeiten die von WeeChat unterstützt werden: account-notify, away-notify, "
"batch, cap-notify, chghost, draft/multiline, echo-message, extended-join, "
"invite-notify, message-tags, multi-prefix, server-time, setname, userhost-in-"
"names.\n"
"\n"
"Fähigkeiten die standardmäßig genutzt werden sollen, können mit der Option "
@@ -11879,6 +11814,12 @@ msgstr "%s%s: Kann den Befehl \"%s\" nicht parsen"
msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s: unbekannter DCC CHAT-Typ empfangen von %s%s%s: \"%s\""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#, fuzzy
#| msgid "Option"
msgid "Action"
msgstr "Einstellung"
#, c-format
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sunbekannte CTCP Anfrage von %s%s%s: %s%s%s%s%s"
@@ -13203,19 +13144,15 @@ msgstr ""
"fügt eine Information in die Protokoll-Datei ein, wenn die Protokollierung "
"gestartet oder beendet wird"
#| msgid ""
#| "conditions to display the backlog (note: content is evaluated, see /help "
#| "eval); empty value displays the backlog on all buffers; for example to "
#| "display backlog on private buffers only: \"${type} == private\""
msgid ""
"conditions to save content of buffers to files (note: content is evaluated, "
"see /help eval); empty value saves content on all buffers; for example to "
"log only private buffers: \"${type} == private\""
msgstr ""
"Bedingungen zum Speichern von Bufferinhalten in Dateien (Hinweis: Inhalt wird"
" evaluiert, siehe /help eval); leerer Wert speichert Inhalt von allen"
" Buffern; Beispiel"
" um nur private Buffer zu protokollieren: „${type} == private“"
"Bedingungen zum Speichern von Bufferinhalten in Dateien (Hinweis: Inhalt "
"wird evaluiert, siehe /help eval); leerer Wert speichert Inhalt von allen "
"Buffern; Beispiel um nur private Buffer zu protokollieren: „${type} == "
"private“"
msgid ""
"default file name mask for log files (format is \"directory/to/file\" or "
@@ -14709,37 +14646,28 @@ msgid "relay pointer (optional)"
msgstr "Relay Pointer (optional)"
#, c-format
#| msgid ""
#| "%s%s: warning: no TLS certificate/key found (option relay.network."
#| "tls_cert_key)"
msgid ""
"%s%s: no TLS certificate/key found (option relay.network.tls_cert_key is "
"empty)"
msgstr ""
"%s%s: kein TLS Zertifikat/Schlüssel gefunden (Option relay."
"network.tls_cert_key ist leer)"
"%s%s: kein TLS Zertifikat/Schlüssel gefunden (Option relay.network."
"tls_cert_key ist leer)"
#, c-format
msgid "%s: TLS certificate and key have been set"
msgstr "%s: TLS Zertifikat und Schlüssel wurden festgelegt"
#, c-format
#| msgid ""
#| "%s%s: warning: no TLS certificate/key found (option relay.network."
#| "tls_cert_key)"
msgid "%s%s: gnutls error: %s: %s (option relay.network.tls_cert_key)"
msgstr "%s%s: gnutls Fehler: %s: %s (Option relay.network.tls_cert_key)"
#, c-format
#| msgid ""
#| "%s%s: warning: no TLS certificate/key found (option relay.network."
#| "tls_cert_key)"
msgid ""
"%s%s: error: file with TLS certificate/key is not readable: \"%s\" (option "
"relay.network.tls_cert_key)"
msgstr ""
"%s%s: Fehler: Datei mit TLS Zertifikat/Schlüssel ist nicht lesbar: \"%s\""
" (Option relay.network.tls_cert_key)"
"%s%s: Fehler: Datei mit TLS Zertifikat/Schlüssel ist nicht lesbar: "
"\"%s\" (Option relay.network.tls_cert_key)"
#, c-format
msgid "%s%s: unable to initialize priority for TLS"
@@ -16058,8 +15986,7 @@ msgstr "verwaltet Trigger, das Schweizer Armeemesser für WeeChat"
msgid ""
"list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<"
"return_code>\" [\"<post_action>\"]]]]]] "
"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] "
"|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> "
"<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|-"
"all [<name>...]] || restart <name>|-all [<name>...] || show <name> || del "
@@ -16067,8 +15994,7 @@ msgid ""
"monitor [<filter>]"
msgstr ""
"list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<"
"return_code>\" [\"<post_action>\"]]]]]] "
"[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>\" [\"<return_code>\" [\"<post_action>\"]]]]]] "
"|| addinput [<hook>] || input|output|recreate <name> || set <name> <option> "
"<value> || rename|copy <name> <new_name> || enable|disable|toggle [<name>|-"
"all [<name>...]] || restart <name>|-all [<name>...] || show <name> || del "
po/es.po
+7 -1
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-25 22:15+0200\n"
"POT-Creation-Date: 2023-05-27 09:28+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: Santiago Forero <santiago@forero.xyz>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10230,6 +10230,12 @@ msgstr "%s%s: no es posible analizar el comando \"%s\""
msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s: tipo de DCC CHAT desconocido recibido de %s%s%s: \"%s\""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#, fuzzy
#| msgid "Option"
msgid "Action"
msgstr "Opción"
#, c-format
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sCTCP desconocido solicitado por %s%s%s: %s%s%s%s%s"
po/fr.po
+6 -2
View File
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-25 22:15+0200\n"
"PO-Revision-Date: 2023-05-23 21:22+0200\n"
"POT-Creation-Date: 2023-05-27 09:28+0200\n"
"PO-Revision-Date: 2023-05-27 09:29+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -11572,6 +11572,10 @@ msgstr "%s%s : impossible d'analyser la commande \"%s\""
msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s : type de DCC CHAT inconnu reçu de %s%s%s : \"%s\""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
msgid "Action"
msgstr "Action"
#, c-format
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sCTCP inconnu demandé par %s%s%s : %s%s%s%s%s"
po/hu.po
+6 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-25 22:15+0200\n"
"POT-Creation-Date: 2023-05-27 09:28+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8952,6 +8952,11 @@ msgstr "%s nem sikerült végrehajtani a \"%s\" parancsot\n"
msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s usmeretlen DCC CHAT típus érkezett a következőtől:"
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#, fuzzy
msgid "Action"
msgstr "[parancs]"
#, fuzzy, c-format
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "Ismeretlen CTCP %s%s%s érkezett innen: %s%s"
po/it.po
+7 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-25 22:15+0200\n"
"POT-Creation-Date: 2023-05-27 09:28+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9962,6 +9962,12 @@ msgstr "%s%s: impossibile verificare il comando \"%s\""
msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s: tipo di DCC CHAT sconosciuto ricevuto da %s%s%s: \"%s\""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#, fuzzy
#| msgid "Option"
msgid "Action"
msgstr "Opzione"
#, c-format
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sCTCP sconosciuto richiesto da %s%s%s: %s%s%s%s%s"
po/ja.po
+7 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-25 22:15+0200\n"
"POT-Creation-Date: 2023-05-27 09:28+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -11143,6 +11143,12 @@ msgstr "%s%s: \"%s\" コマンドの解析に失敗"
msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s: %s%s%s からの未知の DCC CHAT タイプ: \"%s\""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#, fuzzy
#| msgid "Option"
msgid "Action"
msgstr "オプション"
#, c-format
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%s%s%s%s からの未知の CTCP 要求: %s%s%s%s%s"
po/pl.po
+7 -1
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-25 22:15+0200\n"
"POT-Creation-Date: 2023-05-27 09:28+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
"Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -12141,6 +12141,12 @@ msgstr "%s%s: nie można przetworzyć komendy \"%s\""
msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s: nieznany typ DCC CHAT otrzymano od %s%s%s: \"%s\""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#, fuzzy
#| msgid "Option"
msgid "Action"
msgstr "Opcja"
#, c-format
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sNieznane zażądane CTCP przez %s%s%s: %s%s%s%s%s"
po/pt.po
+7 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-25 22:15+0200\n"
"POT-Creation-Date: 2023-05-27 09:28+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
"Language-Team: Portuguese <>\n"
@@ -10915,6 +10915,12 @@ msgstr "%s%s: não é possível analisar o comando \"%s\""
msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s: tipo desconhecido de DCC CHAT recebido de %s%s%s: \"%s\""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#, fuzzy
#| msgid "Option"
msgid "Action"
msgstr "Opção"
#, c-format
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%spedido CTCP desconhecido por %s%s%s: %s%s%s%s%s"
po/pt_BR.po
+7 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-25 22:15+0200\n"
"POT-Creation-Date: 2023-05-27 09:28+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: Érico Nogueira <ericonr@disroot.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9496,6 +9496,12 @@ msgstr "%s%s: não foi possível interpretar comando \"%s\""
msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr ""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#, fuzzy
#| msgid "Option"
msgid "Action"
msgstr "Opção"
#, c-format
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sRequisição CTCP desconhecida por %s%s%s: %s%s%s%s%s"
po/ru.po
+6 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-25 22:15+0200\n"
"POT-Creation-Date: 2023-05-27 09:28+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8989,6 +8989,11 @@ msgstr "%s не могу проанализировать команду \"%s\"\
msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s неизвестный режим DCC CHAT получен от "
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#, fuzzy
msgid "Action"
msgstr "[команда]"
#, fuzzy, c-format
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "Получен неизвестный CTCP %s%s%s от %s%s"
po/sr.po
+7 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-25 22:15+0200\n"
"POT-Creation-Date: 2023-05-27 09:28+0200\n"
"PO-Revision-Date: 2023-05-14 15:29+0200\n"
"Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -11334,6 +11334,12 @@ msgstr "%s%s: команда „%s” не може да се парсира"
msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s: примљен је непознати DCC CHAT тип од %s%s%s: „%s”"
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#, fuzzy
#| msgid "Option"
msgid "Action"
msgstr "Опција"
#, c-format
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%sСтигао је непознати CTCP од %s%s%s: %s%s%s%s%s"
po/tr.po
+7 -1
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-25 22:15+0200\n"
"POT-Creation-Date: 2023-05-27 09:28+0200\n"
"PO-Revision-Date: 2023-05-01 20:23+0200\n"
"Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -11702,6 +11702,12 @@ msgstr "%s%s: \"%s\" komutu ayrıştırılamıyor"
msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr "%s%s: %s%s%s konumundan bilinmeyen DCC CHAT türü alındı: \"%s\""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
#, fuzzy
#| msgid "Option"
msgid "Action"
msgstr "Seçenek"
#, c-format
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr "%s%s%s%s tarafından bilinmeyen CTCP istendi: %s%s%s%s%s"
po/weechat.pot
+5 -1
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2023-05-25 22:15+0200\n"
"POT-Creation-Date: 2023-05-27 09:28+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"
@@ -8034,6 +8034,10 @@ msgstr ""
msgid "%s%s: unknown DCC CHAT type received from %s%s%s: \"%s\""
msgstr ""
#. TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me
msgid "Action"
msgstr ""
#, c-format
msgid "%sUnknown CTCP requested by %s%s%s: %s%s%s%s%s"
msgstr ""
src/plugins/irc/irc-command.c
+8 -5
View File
@@ -1850,6 +1850,7 @@ IRC_COMMAND_CALLBACK(connect)
IRC_COMMAND_CALLBACK(ctcp)
{
struct t_irc_channel *ptr_channel_target;
char **targets, *ctcp_type, str_time[512];
const char *ctcp_target, *ctcp_args;
int num_targets, arg_target, arg_type, arg_args, i;
@@ -1932,12 +1933,14 @@ IRC_COMMAND_CALLBACK(ctcp)
/* display message only if capability "echo-message" is NOT enabled */
if (!weechat_hashtable_has_key (ptr_server->cap_list, "echo-message"))
{
irc_ctcp_display_send (
ptr_channel_target = irc_channel_search (
ptr_server,
irc_channel_search (ptr_server, ctcp_target),
ctcp_target,
ctcp_type,
ctcp_args);
(irc_server_prefix_char_statusmsg (ptr_server,
ctcp_target[0])
&& irc_channel_is_channel (ptr_server, ctcp_target + 1)) ?
ctcp_target + 1 : ctcp_target);
irc_ctcp_display_send (ptr_server, ptr_channel_target,
ctcp_target, ctcp_type, ctcp_args);
}
irc_ctcp_send (ptr_server, ctcp_target, ctcp_type, ctcp_args);
}
src/plugins/irc/irc-ctcp.c
+107 -38
View File
@@ -1042,8 +1042,8 @@ irc_ctcp_recv_dcc (struct t_irc_server *server, const char *nick,
void
irc_ctcp_recv (struct t_irc_server *server, time_t date,
struct t_hashtable *tags, const char *command,
struct t_irc_channel *channel, const char *address,
const char *nick, const char *remote_nick,
struct t_irc_channel *channel, const char *target,
const char *address, const char *nick, const char *remote_nick,
const char *arguments, const char *message)
{
char *dup_arguments, *ptr_args, *pos_end, *pos_space, *pos_args;
@@ -1098,25 +1098,59 @@ irc_ctcp_recv (struct t_irc_server *server, time_t date,
nick_color = irc_nick_find_color (nick);
else
nick_color = strdup (IRC_COLOR_CHAT_NICK);
weechat_printf_date_tags (
channel->buffer,
date,
irc_protocol_tags (
server,
command,
tags,
(nick_is_me) ?
"irc_action,self_msg,notify_none,no_highlight" :
"irc_action,notify_message",
nick, address),
"%s%s%s%s%s%s%s",
weechat_prefix ("action"),
irc_nick_mode_for_display (server, ptr_nick, 0),
nick_color,
nick,
(pos_args) ? IRC_COLOR_RESET : "",
(pos_args) ? " " : "",
(pos_args) ? pos_args : "");
if (irc_server_prefix_char_statusmsg (server, target[0]))
{
/* STATUSMSG action */
weechat_printf_date_tags (
channel->buffer,
date,
irc_protocol_tags (
server,
command,
tags,
(nick_is_me) ?
"irc_action,self_msg,notify_none,no_highlight" :
"irc_action,notify_message",
nick,
address),
"%s%s -> %s%s%s: %s%s%s%s%s%s",
weechat_prefix ("network"),
/* TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me */
_("Action"),
IRC_COLOR_CHAT_CHANNEL,
target,
IRC_COLOR_RESET,
irc_nick_mode_for_display (server, ptr_nick, 0),
nick_color,
nick,
(pos_args) ? IRC_COLOR_RESET : "",
(pos_args) ? " " : "",
(pos_args) ? pos_args : "");
}
else
{
/* standard action */
weechat_printf_date_tags (
channel->buffer,
date,
irc_protocol_tags (
server,
command,
tags,
(nick_is_me) ?
"irc_action,self_msg,notify_none,no_highlight" :
"irc_action,notify_message",
nick,
address),
"%s%s%s%s%s%s%s",
weechat_prefix ("action"),
irc_nick_mode_for_display (server, ptr_nick, 0),
nick_color,
nick,
(pos_args) ? IRC_COLOR_RESET : "",
(pos_args) ? " " : "",
(pos_args) ? pos_args : "");
}
if (nick_color)
free (nick_color);
}
@@ -1265,25 +1299,60 @@ irc_ctcp_display_send (struct t_irc_server *server,
struct t_irc_channel *channel,
const char *target, const char *type, const char *args)
{
struct t_irc_nick *ptr_nick;
if (weechat_strcasecmp (type, "action") == 0)
{
weechat_printf_date_tags (
(channel) ? channel->buffer : irc_msgbuffer_get_target_buffer (
server, target, NULL, "ctcp", NULL),
0,
irc_protocol_tags (
server,
"privmsg",
NULL,
"irc_action,self_msg,notify_none,no_highlight",
server->nick, NULL),
"%s%s%s%s%s%s",
weechat_prefix ("action"),
IRC_COLOR_CHAT_NICK_SELF,
server->nick,
(args && args[0]) ? IRC_COLOR_RESET : "",
(args && args[0]) ? " " : "",
(args && args[0]) ? args : "");
if (channel
&& irc_server_prefix_char_statusmsg (server, target[0]))
{
/* STATUSMSG action */
ptr_nick = irc_nick_search (server, channel, server->nick);
weechat_printf_date_tags (
channel->buffer,
0,
irc_protocol_tags (
server,
"privmsg",
NULL,
"irc_action,self_msg,notify_none,no_highlight",
server->nick,
NULL),
"%s%s -> %s%s%s: %s%s%s%s %s",
weechat_prefix ("network"),
/* TRANSLATORS: "Action" is an IRC CTCP "ACTION" sent with /me */
_("Action"),
IRC_COLOR_CHAT_CHANNEL,
target,
IRC_COLOR_RESET,
irc_nick_mode_for_display (server, ptr_nick, 0),
IRC_COLOR_CHAT_NICK_SELF,
server->nick,
IRC_COLOR_RESET,
args);
}
else
{
/* standard action */
weechat_printf_date_tags (
(channel) ? channel->buffer : irc_msgbuffer_get_target_buffer (
server, target, NULL, "ctcp", NULL),
0,
irc_protocol_tags (
server,
"privmsg",
NULL,
"irc_action,self_msg,notify_none,no_highlight",
server->nick,
NULL),
"%s%s%s%s%s%s",
weechat_prefix ("action"),
IRC_COLOR_CHAT_NICK_SELF,
server->nick,
(args && args[0]) ? IRC_COLOR_RESET : "",
(args && args[0]) ? " " : "",
(args && args[0]) ? args : "");
}
}
else
{
src/plugins/irc/irc-ctcp.h
+1 -1
View File
@@ -45,7 +45,7 @@ extern char *irc_ctcp_replace_variables (struct t_irc_server *server,
const char *format);
extern void irc_ctcp_recv (struct t_irc_server *server, time_t date,
struct t_hashtable *tags, const char *command,
struct t_irc_channel *channel,
struct t_irc_channel *channel, const char *target,
const char *address, const char *nick,
const char *remote_nick, const char *arguments,
const char *message);
src/plugins/irc/irc-protocol.c
+3 -2
View File
@@ -3059,7 +3059,8 @@ IRC_PROTOCOL_CALLBACK(privmsg)
else
{
irc_ctcp_recv (server, date, tags, command, ptr_channel,
address, nick, NULL, msg_args, irc_message);
params[0], address, nick, NULL, msg_args,
irc_message);
}
goto end;
}
@@ -3165,7 +3166,7 @@ IRC_PROTOCOL_CALLBACK(privmsg)
}
else
{
irc_ctcp_recv (server, date, tags, command, NULL,
irc_ctcp_recv (server, date, tags, command, NULL, params[0],
address, nick, remote_nick, msg_args, irc_message);
}
goto end;
tests/unit/plugins/irc/test-irc-protocol.cpp
+25 -4
View File
@@ -597,7 +597,8 @@ TEST_GROUP(IrcProtocolWithServer)
};
/*
* Tests send of messages to channel and nick, without cap echo-message:
* Tests send of messages to channel (STATUSMSG and normal) and nick,
* without capability "echo-message" enabled:
* - message (text)
* - notice (/notice)
* - action (/me + /ctcp)
@@ -629,6 +630,12 @@ TEST(IrcProtocolWithServer, SendMessagesWithoutEchoMessage)
"irc_privmsg,self_msg,notify_none,no_highlight,prefix_nick_white,"
"nick_alice,log1");
/* STATUSMSG message to channel (with /msg @<channel>) */
server_input_data (buffer_server, "/msg @#test msg chan ops");
CHECK_SENT("PRIVMSG @#test :msg chan ops");
CHECK_CHAN("--", "Msg(alice) -> @#test: msg chan ops",
"irc_privmsg,self_msg,notify_none,no_highlight,nick_alice,log1");
/* message to a nick (text in private buffer) */
server_input_data (buffer_pv, "msg pv 1");
CHECK_SENT("PRIVMSG bob :msg pv 1");
@@ -649,6 +656,12 @@ TEST(IrcProtocolWithServer, SendMessagesWithoutEchoMessage)
CHECK_CHAN("--", "Notice(alice) -> #test: notice chan",
"irc_notice,self_msg,notify_none,no_highlight,nick_alice,log1");
/* STATUSMSG notice to channel */
server_input_data (buffer_server, "/notice @#test notice chan ops");
CHECK_SENT("NOTICE @#test :notice chan ops");
CHECK_CHAN("--", "Notice(alice) -> @#test: notice chan ops",
"irc_notice,self_msg,notify_none,no_highlight,nick_alice,log1");
/* notice to a nick */
server_input_data (buffer_server, "/notice bob notice pv");
CHECK_SENT("NOTICE bob :notice pv");
@@ -662,13 +675,20 @@ TEST(IrcProtocolWithServer, SendMessagesWithoutEchoMessage)
"irc_privmsg,irc_action,self_msg,notify_none,no_highlight,"
"nick_alice,log1");
/* action on channel (with /ctcp) */
server_input_data (buffer_server, "/ctcp #test ACTION action chan 2");
/* action on channel (with /ctcp <channel> action) */
server_input_data (buffer_server, "/ctcp #test action action chan 2");
CHECK_SENT("PRIVMSG #test :\01ACTION action chan 2\01");
CHECK_CHAN(" *", "alice action chan 2",
"irc_privmsg,irc_action,self_msg,notify_none,no_highlight,"
"nick_alice,log1");
/* STATUSMSG action on channel (with /ctcp @<channel> action) */
server_input_data (buffer_server, "/ctcp @#test action action chan ops");
CHECK_SENT("PRIVMSG @#test :\01ACTION action chan ops\01");
CHECK_CHAN("--", "Action -> @#test: alice action chan ops",
"irc_privmsg,irc_action,self_msg,notify_none,no_highlight,"
"nick_alice,log1");
/* action in private (with /me) */
server_input_data (buffer_pv, "/me action pv 1");
CHECK_SENT("PRIVMSG bob :\01ACTION action pv 1\01");
@@ -709,7 +729,8 @@ TEST(IrcProtocolWithServer, SendMessagesWithoutEchoMessage)
}
/*
* Tests send of messages to channel and nick, with cap echo-message:
* Tests send of messages to channel (STATUSMSG and normal) and nick,
* with capability "echo-message" enabled:
* - message (text)
* - notice (/notice)
* - action (/me + /ctcp)