foxiepaws
/
weechat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

irc: add signals and tags in messages for irc notify (patch from Quentin Glidic) (task #11887)

v2.8-utf8proc
Sebastien Helleu 2012-03-12 11:09:22 +01:00
parent d1c59c7536
commit a6336885b8
20 changed files with 221 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -13,6 +13,7 @@ Version 0.3.8 (under dev!)
(task #11316)
* core: fix display of wide chars on last column of chat area (patch #7733)
* api: add list "gui_buffer_last_displayed" in hdata "buffer"
* irc: add signals and tags in messages for irc notify (task #11887)
* irc: check notify immediately when adding a nick to notify list, improve
first notify message for a nick (bug #35731)
* irc: fix display of color in hostname (join/part/quit messages)

3
doc/de/weechat_user.de.txt
View File

@ -2071,7 +2071,8 @@ Paket Ersteller::
Patches::
Dmitry Kobylin, Rudolf Polzer, Jim Ramsay, Pistos, Gwenn, Dominik Honnef,
JD Horelick, Stefano Pigozzi, Gu1ll4um3r0m41n, Kyle Fuller
JD Horelick, Stefano Pigozzi, Gu1ll4um3r0m41n, Kyle Fuller,
Quentin Glidic (SardemFF7)
[[support]]

25
doc/en/weechat_plugin_api.en.txt
View File

@ -7380,6 +7380,31 @@ Arguments:
- |
ignore removed
| irc | irc_notify_join +
(_new in version 0.3.8_) |
string: server name + "," + nick |
a nick in notify list has joined server
| irc | irc_notify_quit +
(_new in version 0.3.8_) |
string: server name + "," + nick |
a nick in notify list has quit server
| irc | irc_notify_away +
(_new in version 0.3.8_) |
string: server name + "," + nick + "," + away message |
a nick in notify list is now away on server
| irc | irc_notify_still_away +
(_new in version 0.3.8_) |
string: server name + "," + nick + "," + away message |
a nick in notify list is still away on server (away message has changed)
| irc | irc_notify_back +
(_new in version 0.3.8_) |
string: server name + "," + nick |
a nick in notify list is back (away status removed)
| logger | logger_start |
pointer: buffer |
start logging for buffer

3
doc/en/weechat_user.en.txt
View File

@ -2039,7 +2039,8 @@ Translations::
Patches::
Dmitry Kobylin, Rudolf Polzer, Jim Ramsay, Pistos, Gwenn, Dominik Honnef,
JD Horelick, Stefano Pigozzi, Gu1ll4um3r0m41n, Kyle Fuller
JD Horelick, Stefano Pigozzi, Gu1ll4um3r0m41n, Kyle Fuller,
Quentin Glidic (SardemFF7)
[[support]]

25
doc/fr/weechat_plugin_api.fr.txt
View File

@ -7490,6 +7490,31 @@ Paramètres :
- |
ignore supprimé
| irc | irc_notify_join +
(_nouveau dans la version 0.3.8_) |
chaîne: nom du serveur + "," + pseudo |
un pseudo dans la liste de notifications a rejoint le serveur
| irc | irc_notify_quit +
(_nouveau dans la version 0.3.8_) |
chaîne: nom du serveur + "," + pseudo |
un pseudo dans la liste de notifications a quitté le serveur
| irc | irc_notify_away +
(_nouveau dans la version 0.3.8_) |
chaîne: nom du serveur + "," + pseudo + "," + message d'absence |
un pseudo dans la liste de notifications est maintenant absent sur le serveur
| irc | irc_notify_still_away +
(_nouveau dans la version 0.3.8_) |
chaîne: nom du serveur + "," + pseudo + "," + message d'absence |
un pseudo dans la liste de notifications est toujours absent sur le serveur (le message d'absence a changé)
| irc | irc_notify_back +
(_nouveau dans la version 0.3.8_) |
chaîne: nom du serveur + "," + pseudo |
un pseudo dans la liste de notifications est de retour (statut d'absence supprimé)
| logger | logger_start |
pointeur : tampon |
démarrage de l'enregistrement sur disque pour le tampon

3
doc/fr/weechat_user.fr.txt
View File

@ -2100,7 +2100,8 @@ Traductions::
Patchs::
Dmitry Kobylin, Rudolf Polzer, Jim Ramsay, Pistos, Gwenn, Dominik Honnef,
JD Horelick, Stefano Pigozzi, Gu1ll4um3r0m41n, Kyle Fuller
JD Horelick, Stefano Pigozzi, Gu1ll4um3r0m41n, Kyle Fuller,
Quentin Glidic (SardemFF7)
[[support]]

30
doc/it/weechat_plugin_api.it.txt
View File

@ -7410,6 +7410,36 @@ Argomenti:
- |
ignore rimosso
// TRANSLATION MISSING
| irc | irc_notify_join +
(_new in version 0.3.8_) |
string: server name + "," + nick |
a nick in notify list has joined server
// TRANSLATION MISSING
| irc | irc_notify_quit +
(_new in version 0.3.8_) |
string: server name + "," + nick |
a nick in notify list has quit server
// TRANSLATION MISSING
| irc | irc_notify_away +
(_new in version 0.3.8_) |
string: server name + "," + nick + "," + away message |
a nick in notify list is now away on server
// TRANSLATION MISSING
| irc | irc_notify_still_away +
(_new in version 0.3.8_) |
string: server name + "," + nick + "," + away message |
a nick in notify list is still away on server (away message has changed)
// TRANSLATION MISSING
| irc | irc_notify_back +
(_new in version 0.3.8_) |
string: server name + "," + nick |
a nick in notify list is back (away status removed)
| logger | logger_start |
puntatore: buffer |
avvia il logging per il buffer

3
doc/it/weechat_user.it.txt
View File

@ -2086,7 +2086,8 @@ Traduzioni::
Patches::
Dmitry Kobylin, Rudolf Polzer, Jim Ramsay, Pistos, Gwenn, Dominik Honnef,
JD Horelick, Stefano Pigozzi, Gu1ll4um3r0m41n, Kyle Fuller
JD Horelick, Stefano Pigozzi, Gu1ll4um3r0m41n, Kyle Fuller,
Quentin Glidic (SardemFF7)
[[support]]

18
po/cs.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.8-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-12 07:47+0100\n"
"POT-Creation-Date: 2012-03-12 10:27+0100\n"
"PO-Revision-Date: 2012-02-26 09:16+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6082,24 +6082,20 @@ msgstr "Seznam notifikací pro všechny servery:"
msgid "Notify list is empty on all servers"
msgstr "Seznam notifikací na všech serverech je prázdný"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s is connected on %s%s"
msgid "%snotify: %s%s%s is connected"
msgstr "%snotifikace: %s%s%s se připojil %s%s"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s is offline on %s%s"
msgid "%snotify: %s%s%s is offline"
msgstr "%snotifikace: %s%s%s se připojil %s%s"
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s has joined %s%s"
#, fuzzy, c-format
msgid "%snotify: %s%s%s has joined"
msgstr "%snotifikace: %s%s%s se připojil %s%s"
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s has quit %s%s"
#, fuzzy, c-format
msgid "%snotify: %s%s%s has quit"
msgstr "%snotifikace: %s%s%s odešel %s%s"
#, c-format

18
po/de.po
View File

@ -23,7 +23,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.8-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-12 07:47+0100\n"
"POT-Creation-Date: 2012-03-12 10:27+0100\n"
"PO-Revision-Date: 2012-02-26 09:16+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@ -6535,24 +6535,20 @@ msgstr "Benachrichtigungen für alle Server:"
msgid "Notify list is empty on all servers"
msgstr "Es existiert keine Benachrichtigung für Server"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s is connected on %s%s"
msgid "%snotify: %s%s%s is connected"
msgstr "%snotify: %s%s%s hat sich am Server %s%s angemeldet"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s is offline on %s%s"
msgid "%snotify: %s%s%s is offline"
msgstr "%snotify: %s%s%s hat sich am Server %s%s angemeldet"
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s has joined %s%s"
#, fuzzy, c-format
msgid "%snotify: %s%s%s has joined"
msgstr "%snotify: %s%s%s hat sich am Server %s%s angemeldet"
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s has quit %s%s"
#, fuzzy, c-format
msgid "%snotify: %s%s%s has quit"
msgstr "%snotify: %s%s%s hat sich vom Server %s%s abgemeldet"
#, c-format

18
po/es.po
View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.8-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-12 07:47+0100\n"
"POT-Creation-Date: 2012-03-12 10:27+0100\n"
"PO-Revision-Date: 2012-02-26 09:16+0100\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6321,24 +6321,20 @@ msgstr "Lista de notificaciones para todos los servidores:"
msgid "Notify list is empty on all servers"
msgstr "Lista de notificaciones vacía en todos los servidores"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s is connected on %s%s"
msgid "%snotify: %s%s%s is connected"
msgstr "%saviso: %s%s%s se ha unido a %s%s"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s is offline on %s%s"
msgid "%snotify: %s%s%s is offline"
msgstr "%saviso: %s%s%s se ha unido a %s%s"
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s has joined %s%s"
#, fuzzy, c-format
msgid "%snotify: %s%s%s has joined"
msgstr "%saviso: %s%s%s se ha unido a %s%s"
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s has quit %s%s"
#, fuzzy, c-format
msgid "%snotify: %s%s%s has quit"
msgstr "%saviso: %s%s%s ha salido de %s%s"
#, c-format

24
po/fr.po
View File

@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.8-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-12 07:47+0100\n"
"PO-Revision-Date: 2012-03-11 13:40+0100\n"
"POT-Creation-Date: 2012-03-12 10:27+0100\n"
"PO-Revision-Date: 2012-03-12 10:28+0100\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@ -6383,25 +6383,21 @@ msgstr "Liste de notifications pour tous les serveurs:"
msgid "Notify list is empty on all servers"
msgstr "La liste de notifications est vide sur tous les serveurs"
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s is connected on %s%s"
msgstr "%snotify: %s%s%s est connecté sur %s%s"
msgid "%snotify: %s%s%s is connected"
msgstr "%snotify: %s%s%s est connecté"
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s is offline on %s%s"
msgstr "%snotify: %s%s%s est déconnecté de %s%s"
msgid "%snotify: %s%s%s is offline"
msgstr "%snotify: %s%s%s est déconnecté"
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s has joined %s%s"
msgstr "%snotify: %s%s%s a rejoint %s%s"
msgid "%snotify: %s%s%s has joined"
msgstr "%snotify: %s%s%s a rejoint"
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s has quit %s%s"
msgstr "%snotify: %s%s%s a quitté %s%s"
msgid "%snotify: %s%s%s has quit"
msgstr "%snotify: %s%s%s a quitté"
#, c-format
msgid "%snotify: %s%s%s is now away: \"%s\""

14
po/hu.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.8-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-12 07:47+0100\n"
"POT-Creation-Date: 2012-03-12 10:27+0100\n"
"PO-Revision-Date: 2012-02-26 09:16+0100\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5663,24 +5663,20 @@ msgstr "hotlist törlése"
msgid "Notify list is empty on all servers"
msgstr ""
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s is connected on %s%s"
msgid "%snotify: %s%s%s is connected"
msgstr "%s%s%s kirúgta %s%s%s-t a(z) %s%s szobából"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s is offline on %s%s"
msgid "%snotify: %s%s%s is offline"
msgstr "%s%s%s kirúgta %s%s%s-t a(z) %s%s szobából"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s has joined %s%s"
msgid "%snotify: %s%s%s has joined"
msgstr "%s%s%s kirúgta %s%s%s-t a(z) %s%s szobából"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s has quit %s%s"
msgid "%snotify: %s%s%s has quit"
msgstr "%s%s%s kirúgta %s%s%s-t a(z) %s%s szobából"
#, fuzzy, c-format

18
po/it.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.8-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-12 07:47+0100\n"
"POT-Creation-Date: 2012-03-12 10:27+0100\n"
"PO-Revision-Date: 2012-02-26 09:16+0100\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6316,24 +6316,20 @@ msgstr "La lista notifiche per tutti i server:"
msgid "Notify list is empty on all servers"
msgstr "La lista notifiche è vuota su tutti i server"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s is connected on %s%s"
msgid "%snotify: %s%s%s is connected"
msgstr "%snotifica: %s%s%s è entrato in %s%s"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s is offline on %s%s"
msgid "%snotify: %s%s%s is offline"
msgstr "%snotifica: %s%s%s è entrato in %s%s"
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s has joined %s%s"
#, fuzzy, c-format
msgid "%snotify: %s%s%s has joined"
msgstr "%snotifica: %s%s%s è entrato in %s%s"
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s has quit %s%s"
#, fuzzy, c-format
msgid "%snotify: %s%s%s has quit"
msgstr "%snotifica: %s%s%s è uscito da %s%s"
#, c-format

18
po/ja.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.8-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-12 07:47+0100\n"
"POT-Creation-Date: 2012-03-12 10:27+0100\n"
"PO-Revision-Date: 2012-02-26 09:16+0100\n"
"Last-Translator: \"AYANOKOUZI, Ryuunosuke\" <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese\n"
@ -6151,24 +6151,20 @@ msgstr "全てのサーバの通知リスト:"
msgid "Notify list is empty on all servers"
msgstr "全てのサーバの通知リストは空です"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s is connected on %s%s"
msgid "%snotify: %s%s%s is connected"
msgstr "%s通知: %s%s%s が %s%s に参加"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s is offline on %s%s"
msgid "%snotify: %s%s%s is offline"
msgstr "%s通知: %s%s%s が %s%s に参加"
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s has joined %s%s"
#, fuzzy, c-format
msgid "%snotify: %s%s%s has joined"
msgstr "%s通知: %s%s%s が %s%s に参加"
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s has quit %s%s"
#, fuzzy, c-format
msgid "%snotify: %s%s%s has quit"
msgstr "%s通知: %s%s%s が %s%s から終了"
#, c-format

18
po/pl.po
View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.8-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-12 07:47+0100\n"
"POT-Creation-Date: 2012-03-12 10:27+0100\n"
"PO-Revision-Date: 2012-02-26 09:16+0100\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -6281,24 +6281,20 @@ msgstr "Lista powiadomień dla wszystkich serwerów"
msgid "Notify list is empty on all servers"
msgstr "Lista powiadomień jest pusta na wszystkich serwerach"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s is connected on %s%s"
msgid "%snotify: %s%s%s is connected"
msgstr "%spowiadomienie: %s%s%s wszedł na %s%s"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s is offline on %s%s"
msgid "%snotify: %s%s%s is offline"
msgstr "%spowiadomienie: %s%s%s wszedł na %s%s"
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s has joined %s%s"
#, fuzzy, c-format
msgid "%snotify: %s%s%s has joined"
msgstr "%spowiadomienie: %s%s%s wszedł na %s%s"
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s has quit %s%s"
#, fuzzy, c-format
msgid "%snotify: %s%s%s has quit"
msgstr "%spowiadomienie: %s%s%s wyszedł %s%s"
#, c-format

18
po/pt_BR.po
View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.8-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-12 07:47+0100\n"
"POT-Creation-Date: 2012-03-12 10:27+0100\n"
"PO-Revision-Date: 2012-02-26 09:16+0100\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5799,24 +5799,20 @@ msgstr "Lista de notificação para todos os servidores:"
msgid "Notify list is empty on all servers"
msgstr "Lista de notificação está vazia em todos os servidores"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s is connected on %s%s"
msgid "%snotify: %s%s%s is connected"
msgstr "%snotificação: %s%s%s entrou %s%s"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s is offline on %s%s"
msgid "%snotify: %s%s%s is offline"
msgstr "%snotificação: %s%s%s entrou %s%s"
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s has joined %s%s"
#, fuzzy, c-format
msgid "%snotify: %s%s%s has joined"
msgstr "%snotificação: %s%s%s entrou %s%s"
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s has quit %s%s"
#, fuzzy, c-format
msgid "%snotify: %s%s%s has quit"
msgstr "%snotificação: %s%s%s saiu %s%s"
#, c-format

14
po/ru.po
View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.8-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-12 07:47+0100\n"
"POT-Creation-Date: 2012-03-12 10:27+0100\n"
"PO-Revision-Date: 2012-02-26 09:16+0100\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -5688,24 +5688,20 @@ msgstr "очистить хотлист"
msgid "Notify list is empty on all servers"
msgstr ""
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s is connected on %s%s"
msgid "%snotify: %s%s%s is connected"
msgstr "%s%s%s выкинул %s%s%s с канала %s%s"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s is offline on %s%s"
msgid "%snotify: %s%s%s is offline"
msgstr "%s%s%s выкинул %s%s%s с канала %s%s"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s has joined %s%s"
msgid "%snotify: %s%s%s has joined"
msgstr "%s%s%s выкинул %s%s%s с канала %s%s"
#. TRANSLATORS: final "%s%s" is the server name
#, fuzzy, c-format
msgid "%snotify: %s%s%s has quit %s%s"
msgid "%snotify: %s%s%s has quit"
msgstr "%s%s%s выкинул %s%s%s с канала %s%s"
#, fuzzy, c-format

14
po/weechat.pot
View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2012-03-12 07:47+0100\n"
"POT-Creation-Date: 2012-03-12 10:27+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -4898,24 +4898,20 @@ msgstr ""
msgid "Notify list is empty on all servers"
msgstr ""
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s is connected on %s%s"
msgid "%snotify: %s%s%s is connected"
msgstr ""
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s is offline on %s%s"
msgid "%snotify: %s%s%s is offline"
msgstr ""
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s has joined %s%s"
msgid "%snotify: %s%s%s has joined"
msgstr ""
#. TRANSLATORS: final "%s%s" is the server name
#, c-format
msgid "%snotify: %s%s%s has quit %s%s"
msgid "%snotify: %s%s%s has quit"
msgstr ""
#, c-format

75
src/plugins/irc/irc-notify.c
View File

@ -465,20 +465,55 @@ irc_notify_display_list (struct t_irc_server *server)
*/
const char *
irc_notify_get_tags (struct t_config_option *option)
irc_notify_get_tags (struct t_config_option *option, const char *type,
const char *nick)
{
static char string[1024];
const char *tags;
tags = weechat_config_string (option);
snprintf (string, sizeof (string), "irc_notify%s%s",
snprintf (string, sizeof (string), "irc_notify,irc_notify_%s,nick_%s%s%s",
type,
nick,
(tags && tags[0]) ? "," : "",
(tags && tags[0]) ? tags : "");
return string;
}
/*
* irc_notify_send_signal: send signal on notify event
*/
void
irc_notify_send_signal (struct t_irc_notify *notify,
const char *type,
const char *away_message)
{
char signal[128], *data;
int length;
snprintf (signal, sizeof (signal), "irc_notify_%s", type);
length = strlen (notify->server->name) + 1 + strlen (notify->nick) + 1
+ ((away_message) ? strlen (away_message) : 0) + 1;
data = malloc (length);
if (data)
{
snprintf (data, length, "%s,%s%s%s",
notify->server->name,
notify->nick,
(away_message && away_message[0]) ? "," : "",
(away_message && away_message[0]) ? away_message : "");
}
weechat_hook_signal_send (signal, WEECHAT_HOOK_SIGNAL_STRING, data);
if (data)
free (data);
}
/*
* irc_notify_set_is_on_server: set flag "is_on_server" for a notify
* and display message if user was not on server
@ -496,25 +531,22 @@ irc_notify_set_is_on_server (struct t_irc_notify *notify,
return;
weechat_printf_tags (notify->server->buffer,
irc_notify_get_tags (irc_config_look_notify_tags_ison),
irc_notify_get_tags (irc_config_look_notify_tags_ison,
(is_on_server) ? "join" : "quit",
notify->nick),
(notify->is_on_server < 0) ?
((is_on_server) ?
/* TRANSLATORS: final "%s%s" is the server name */
_("%snotify: %s%s%s is connected on %s%s") :
/* TRANSLATORS: final "%s%s" is the server name */
_("%snotify: %s%s%s is offline on %s%s")) :
_("%snotify: %s%s%s is connected") :
_("%snotify: %s%s%s is offline")) :
((is_on_server) ?
/* TRANSLATORS: final "%s%s" is the server name */
_("%snotify: %s%s%s has joined %s%s") :
/* TRANSLATORS: final "%s%s" is the server name */
_("%snotify: %s%s%s has quit %s%s")),
_("%snotify: %s%s%s has joined") :
_("%snotify: %s%s%s has quit")),
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK,
notify->nick,
(is_on_server) ?
IRC_COLOR_MESSAGE_JOIN : IRC_COLOR_MESSAGE_QUIT,
IRC_COLOR_CHAT_SERVER,
notify->server->name);
IRC_COLOR_MESSAGE_JOIN : IRC_COLOR_MESSAGE_QUIT);
irc_notify_send_signal (notify, (is_on_server) ? "join" : "quit", NULL);
notify->is_on_server = is_on_server;
}
@ -540,34 +572,43 @@ irc_notify_set_away_message (struct t_irc_notify *notify,
if (!notify->away_message && away_message)
{
weechat_printf_tags (notify->server->buffer,
irc_notify_get_tags (irc_config_look_notify_tags_whois),
irc_notify_get_tags (irc_config_look_notify_tags_whois,
"away",
notify->nick),
_("%snotify: %s%s%s is now away: \"%s\""),
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK,
notify->nick,
IRC_COLOR_RESET,
away_message);
irc_notify_send_signal (notify, "away", away_message);
}
else if (notify->away_message && !away_message)
{
weechat_printf_tags (notify->server->buffer,
irc_notify_get_tags (irc_config_look_notify_tags_whois),
irc_notify_get_tags (irc_config_look_notify_tags_whois,
"back",
notify->nick),
_("%snotify: %s%s%s is back"),
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK,
notify->nick,
IRC_COLOR_RESET);
irc_notify_send_signal (notify, "back", NULL);
}
else if (notify->away_message && away_message)
{
weechat_printf_tags (notify->server->buffer,
irc_notify_get_tags (irc_config_look_notify_tags_whois),
irc_notify_get_tags (irc_config_look_notify_tags_whois,
"still_away",
notify->nick),
_("%snotify: %s%s%s is still away: \"%s\""),
weechat_prefix ("network"),
IRC_COLOR_CHAT_NICK,
notify->nick,
IRC_COLOR_RESET,
away_message);
irc_notify_send_signal (notify, "still_away", away_message);
}
if (notify->away_message)