pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-29 22:36:38 +02:00
Code Activity

relay: change input prompt label when fetching data from remote, keep remote status displayed

Browse Source
This commit is contained in:
Sébastien Helleu
2024-08-24 11:25:06 +02:00
parent c1130446eb
commit 4572e46ced
16 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1 -1
View File
@@ -8,7 +8,7 @@
### Added
- relay: display connection status in input prompt of remote buffers, if not connected or if synchronizing data with the remote
- relay: display connection status in input prompt of remote buffers, if not connected or if fetching data from remote
### Fixed
po/cs.po
+2 -2
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-08-24 10:59+0200\n"
"POT-Creation-Date: 2024-08-24 11:22+0200\n"
"PO-Revision-Date: 2024-08-12 21:35+0200\n"
"Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14024,7 +14024,7 @@ msgstr "%s%s: nemohu se připojit k odesílateli"
msgid "%s%s: not enough memory for parsing message"
msgstr "%s%s: nedostatek paměti pro rozdělení zprávy"
msgid "data synchronization"
msgid "fetching data"
msgstr ""
msgid "Actions (letter+enter):"
po/de.po
+2 -2
View File
@@ -26,7 +26,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-08-24 10:59+0200\n"
"POT-Creation-Date: 2024-08-24 11:22+0200\n"
"PO-Revision-Date: 2024-08-24 10:45+0200\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -15390,7 +15390,7 @@ msgstr ""
msgid "%s%s: not enough memory for parsing message"
msgstr "%s%s: Nicht genug Speicher vorhanden um Nachricht zu parsen"
msgid "data synchronization"
msgid "fetching data"
msgstr ""
msgid "Actions (letter+enter):"
po/es.po
+2 -2
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-08-24 10:59+0200\n"
"POT-Creation-Date: 2024-08-24 11:22+0200\n"
"PO-Revision-Date: 2024-06-11 07:49+0200\n"
"Last-Translator: Santiago Forero <santiago@forero.xyz>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14366,7 +14366,7 @@ msgstr "%s%s: no es posible conectarse al transmisor"
msgid "%s%s: not enough memory for parsing message"
msgstr "%s%s: memoria insuficiente para analizar el mensaje"
msgid "data synchronization"
msgid "fetching data"
msgstr ""
msgid "Actions (letter+enter):"
po/fr.po
+7 -4
View File
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-08-24 10:59+0200\n"
"PO-Revision-Date: 2024-08-24 11:00+0200\n"
"POT-Creation-Date: 2024-08-24 11:22+0200\n"
"PO-Revision-Date: 2024-08-24 11:22+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -15079,8 +15079,8 @@ msgstr "remote[%s] : impossible de se connecter, pas assez de mémoire"
msgid "%s%s: not enough memory for parsing message"
msgstr "%s%s : pas assez de mémoire pour analyser le message"
msgid "data synchronization"
msgstr "synchronisation des données"
msgid "fetching data"
msgstr "récupération des données"
msgid "Actions (letter+enter):"
msgstr "Actions (lettre+entrée) :"
@@ -18334,3 +18334,6 @@ msgid ""
msgstr ""
"%s%s : impossible d'accepter de continuer le fichier \"%s\" (port : %d, "
"position de départ : %llu) : xfer non trouvé ou non prêt pour le transfert"
#~ msgid "data synchronization"
#~ msgstr "synchronisation des données"
po/hu.po
+2 -2
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-08-24 10:59+0200\n"
"POT-Creation-Date: 2024-08-24 11:22+0200\n"
"PO-Revision-Date: 2024-06-11 07:49+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -13422,7 +13422,7 @@ msgstr "%s DCC: nem sikerült kapcsolódni a küldőhöz\n"
msgid "%s%s: not enough memory for parsing message"
msgstr "%s nincs elegendő memória a fogadott IRC üzenet számára\n"
msgid "data synchronization"
msgid "fetching data"
msgstr ""
msgid "Actions (letter+enter):"
po/it.po
+2 -2
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-08-24 10:59+0200\n"
"POT-Creation-Date: 2024-08-24 11:22+0200\n"
"PO-Revision-Date: 2024-08-12 21:35+0200\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14376,7 +14376,7 @@ msgstr "%s%s: impossibile connettersi al mittente"
msgid "%s%s: not enough memory for parsing message"
msgstr "%s%s: memoria non sufficiente per verificare il messaggio"
msgid "data synchronization"
msgid "fetching data"
msgstr ""
msgid "Actions (letter+enter):"
po/ja.po
+2 -2
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-08-24 10:59+0200\n"
"POT-Creation-Date: 2024-08-24 11:22+0200\n"
"PO-Revision-Date: 2024-08-12 21:35+0200\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -14823,7 +14823,7 @@ msgstr "%s%s: 送信者に接続できません"
msgid "%s%s: not enough memory for parsing message"
msgstr "%s%s: メッセージ解析用のメモリが足りません"
msgid "data synchronization"
msgid "fetching data"
msgstr ""
msgid "Actions (letter+enter):"
po/pl.po
+2 -2
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-08-24 10:59+0200\n"
"POT-Creation-Date: 2024-08-24 11:22+0200\n"
"PO-Revision-Date: 2024-08-23 08:27+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14792,7 +14792,7 @@ msgstr "remote[%s]: połączenie nie powiodło się, za mało pamięci"
msgid "%s%s: not enough memory for parsing message"
msgstr "%s%s: za mało pamięci na przetworzenie otrzymanych wiadomości"
msgid "data synchronization"
msgid "fetching data"
msgstr ""
msgid "Actions (letter+enter):"
po/pt.po
+2 -2
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-08-24 10:59+0200\n"
"POT-Creation-Date: 2024-08-24 11:22+0200\n"
"PO-Revision-Date: 2024-08-12 21:35+0200\n"
"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
"Language-Team: Portuguese <>\n"
@@ -14727,7 +14727,7 @@ msgstr "%s%s: não foi possível conectar para enviar"
msgid "%s%s: not enough memory for parsing message"
msgstr "%s%s: memória insuficiente para analisar a mensagem"
msgid "data synchronization"
msgid "fetching data"
msgstr ""
msgid "Actions (letter+enter):"
po/pt_BR.po
+2 -2
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-08-24 10:59+0200\n"
"POT-Creation-Date: 2024-08-24 11:22+0200\n"
"PO-Revision-Date: 2024-06-11 07:49+0200\n"
"Last-Translator: Érico Nogueira <ericonr@disroot.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -13878,7 +13878,7 @@ msgstr "%s%s: não foi possível conectar ao remetente"
msgid "%s%s: not enough memory for parsing message"
msgstr "%s%s: memória insuficiente para interpretar mensagem"
msgid "data synchronization"
msgid "fetching data"
msgstr ""
msgid "Actions (letter+enter):"
po/ru.po
+2 -2
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-08-24 10:59+0200\n"
"POT-Creation-Date: 2024-08-24 11:22+0200\n"
"PO-Revision-Date: 2024-06-11 07:49+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -13475,7 +13475,7 @@ msgstr "%s DCC: не могу соединиться с отправителем
msgid "%s%s: not enough memory for parsing message"
msgstr "%s недостаточно памяти для полученного сообщения\n"
msgid "data synchronization"
msgid "fetching data"
msgstr ""
msgid "Actions (letter+enter):"
po/sr.po
+2 -2
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-08-24 10:59+0200\n"
"POT-Creation-Date: 2024-08-24 11:22+0200\n"
"PO-Revision-Date: 2024-08-24 10:56+0200\n"
"Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14684,7 +14684,7 @@ msgstr "удаљени[%s]: није успело повезивање, нема
msgid "%s%s: not enough memory for parsing message"
msgstr "%s%s: нема довољно слободне меморије за парсирање поруке"
msgid "data synchronization"
msgid "fetching data"
msgstr ""
msgid "Actions (letter+enter):"
po/tr.po
+2 -2
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-08-24 10:59+0200\n"
"POT-Creation-Date: 2024-08-24 11:22+0200\n"
"PO-Revision-Date: 2024-08-12 21:36+0200\n"
"Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -14997,7 +14997,7 @@ msgstr "%s%s: Göndericiye bağlanılamıyor"
msgid "%s%s: not enough memory for parsing message"
msgstr "%s%s: ayrıştırma iletisi için bellek yetersiz"
msgid "data synchronization"
msgid "fetching data"
msgstr ""
msgid "Actions (letter+enter):"
po/weechat.pot
+2 -2
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2024-08-24 10:59+0200\n"
"POT-Creation-Date: 2024-08-24 11: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"
@@ -12271,7 +12271,7 @@ msgstr ""
msgid "%s%s: not enough memory for parsing message"
msgstr ""
msgid "data synchronization"
msgid "fetching data"
msgstr ""
msgid "Actions (letter+enter):"
src/plugins/relay/relay-bar-item.c
+9 -8
View File
@@ -41,6 +41,7 @@ relay_bar_item_input_prompt (const void *pointer, void *data,
struct t_hashtable *extra_info)
{
char str_status[512], *input_prompt;
int fetching_data;
const char *ptr_input_prompt;
struct t_relay_remote *ptr_remote;
@@ -58,18 +59,18 @@ relay_bar_item_input_prompt (const void *pointer, void *data,
ptr_remote = relay_remote_search (weechat_buffer_get_string (buffer, "localvar_relay_remote"));
if (ptr_remote)
{
if ((ptr_remote->status == RELAY_STATUS_CONNECTED) && !ptr_remote->synced)
{
snprintf (str_status, sizeof (str_status),
"<%s>", _("data synchronization"));
}
else if (ptr_remote->status != RELAY_STATUS_CONNECTED)
fetching_data = (ptr_remote->status == RELAY_STATUS_CONNECTED)
&& !ptr_remote->synced;
if ((ptr_remote->status != RELAY_STATUS_CONNECTED) || fetching_data)
{
snprintf (
str_status, sizeof (str_status),
"%s<%s>",
"%s<%s%s%s%s>",
weechat_color (weechat_config_string (relay_config_color_status[ptr_remote->status])),
_(relay_status_string[ptr_remote->status]));
_(relay_status_string[ptr_remote->status]),
(fetching_data) ? " (" : "",
(fetching_data) ? _("fetching data") : "",
(fetching_data) ? ")" : "");
}
}