diff --git a/CHANGELOG.md b/CHANGELOG.md index cd2c00471..4d471233d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ ### Added -- relay: redefine bar item "input_prompt" to display the connection status on remote buffers, if different from "connected" +- relay: display connection status in input prompt of remote buffers, if not connected or if synchronizing data with the remote ### Fixed diff --git a/po/cs.po b/po/cs.po index befc412c9..4bceaaef8 100644 --- a/po/cs.po +++ b/po/cs.po @@ -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:27+0200\n" +"POT-Creation-Date: 2024-08-24 10:59+0200\n" "PO-Revision-Date: 2024-08-12 21:35+0200\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -14024,6 +14024,9 @@ 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" +msgstr "" + msgid "Actions (letter+enter):" msgstr "Akce (písmeno+enter):" diff --git a/po/de.po b/po/de.po index bdccadac3..29bf26033 100644 --- a/po/de.po +++ b/po/de.po @@ -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:27+0200\n" +"POT-Creation-Date: 2024-08-24 10:59+0200\n" "PO-Revision-Date: 2024-08-24 10:45+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -15390,6 +15390,9 @@ msgstr "" msgid "%s%s: not enough memory for parsing message" msgstr "%s%s: Nicht genug Speicher vorhanden um Nachricht zu parsen" +msgid "data synchronization" +msgstr "" + msgid "Actions (letter+enter):" msgstr "Aktion (Zeichen+Enter):" diff --git a/po/es.po b/po/es.po index 74b1e6af6..c8b5bdd3c 100644 --- a/po/es.po +++ b/po/es.po @@ -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:27+0200\n" +"POT-Creation-Date: 2024-08-24 10:59+0200\n" "PO-Revision-Date: 2024-06-11 07:49+0200\n" "Last-Translator: Santiago Forero \n" "Language-Team: weechat-dev \n" @@ -14366,6 +14366,9 @@ 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" +msgstr "" + msgid "Actions (letter+enter):" msgstr "Acciones (letra+enter):" diff --git a/po/fr.po b/po/fr.po index d9a330359..c915f8d4e 100644 --- a/po/fr.po +++ b/po/fr.po @@ -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:27+0200\n" -"PO-Revision-Date: 2024-08-24 10:37+0200\n" +"POT-Creation-Date: 2024-08-24 10:59+0200\n" +"PO-Revision-Date: 2024-08-24 11:00+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -15079,6 +15079,9 @@ 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 "Actions (letter+enter):" msgstr "Actions (lettre+entrée) :" diff --git a/po/hu.po b/po/hu.po index 97b3faa48..11260ae19 100644 --- a/po/hu.po +++ b/po/hu.po @@ -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:27+0200\n" +"POT-Creation-Date: 2024-08-24 10:59+0200\n" "PO-Revision-Date: 2024-06-11 07:49+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -13422,6 +13422,9 @@ 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" +msgstr "" + msgid "Actions (letter+enter):" msgstr "" diff --git a/po/it.po b/po/it.po index 78848d308..82d7ff5ab 100644 --- a/po/it.po +++ b/po/it.po @@ -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:27+0200\n" +"POT-Creation-Date: 2024-08-24 10:59+0200\n" "PO-Revision-Date: 2024-08-12 21:35+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -14376,6 +14376,9 @@ 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" +msgstr "" + msgid "Actions (letter+enter):" msgstr "Azioni (lettera+invio):" diff --git a/po/ja.po b/po/ja.po index b12cc4a89..003d627e4 100644 --- a/po/ja.po +++ b/po/ja.po @@ -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:27+0200\n" +"POT-Creation-Date: 2024-08-24 10:59+0200\n" "PO-Revision-Date: 2024-08-12 21:35+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" "Language-Team: weechat-dev \n" @@ -14792,6 +14792,9 @@ 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" +msgstr "" + msgid "Actions (letter+enter):" msgstr "Akcje (litera+enter):" diff --git a/po/pt.po b/po/pt.po index ef83f1962..dade88338 100644 --- a/po/pt.po +++ b/po/pt.po @@ -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:27+0200\n" +"POT-Creation-Date: 2024-08-24 10:59+0200\n" "PO-Revision-Date: 2024-08-12 21:35+0200\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -14727,6 +14727,9 @@ 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" +msgstr "" + msgid "Actions (letter+enter):" msgstr "Ações (letra+enter):" diff --git a/po/pt_BR.po b/po/pt_BR.po index b71310fba..c5603dd2c 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: 2024-08-24 10:27+0200\n" +"POT-Creation-Date: 2024-08-24 10:59+0200\n" "PO-Revision-Date: 2024-06-11 07:49+0200\n" "Last-Translator: Érico Nogueira \n" "Language-Team: weechat-dev \n" @@ -13878,6 +13878,9 @@ 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" +msgstr "" + msgid "Actions (letter+enter):" msgstr "Ações (letra+ENTER):" diff --git a/po/ru.po b/po/ru.po index 6f386b4ae..0792e0dd6 100644 --- a/po/ru.po +++ b/po/ru.po @@ -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:27+0200\n" +"POT-Creation-Date: 2024-08-24 10:59+0200\n" "PO-Revision-Date: 2024-06-11 07:49+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -13475,6 +13475,9 @@ msgstr "%s DCC: не могу соединиться с отправителем msgid "%s%s: not enough memory for parsing message" msgstr "%s недостаточно памяти для полученного сообщения\n" +msgid "data synchronization" +msgstr "" + msgid "Actions (letter+enter):" msgstr "" diff --git a/po/sr.po b/po/sr.po index 31f8c7a34..f3c831385 100644 --- a/po/sr.po +++ b/po/sr.po @@ -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:27+0200\n" +"POT-Creation-Date: 2024-08-24 10:59+0200\n" "PO-Revision-Date: 2024-08-24 10:56+0200\n" "Last-Translator: Ivan Pešić \n" "Language-Team: weechat-dev \n" @@ -14684,6 +14684,9 @@ msgstr "удаљени[%s]: није успело повезивање, нема msgid "%s%s: not enough memory for parsing message" msgstr "%s%s: нема довољно слободне меморије за парсирање поруке" +msgid "data synchronization" +msgstr "" + msgid "Actions (letter+enter):" msgstr "Акције (слово+ентер):" diff --git a/po/tr.po b/po/tr.po index b44255515..30ee37cea 100644 --- a/po/tr.po +++ b/po/tr.po @@ -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:27+0200\n" +"POT-Creation-Date: 2024-08-24 10:59+0200\n" "PO-Revision-Date: 2024-08-12 21:36+0200\n" "Last-Translator: Emir SARI \n" "Language-Team: weechat-dev \n" @@ -14997,6 +14997,9 @@ 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" +msgstr "" + msgid "Actions (letter+enter):" msgstr "Eylemler (harf+enter):" diff --git a/po/weechat.pot b/po/weechat.pot index cb1c3acc1..85a944fb2 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: 2024-08-24 10:27+0200\n" +"POT-Creation-Date: 2024-08-24 10:59+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -12271,6 +12271,9 @@ msgstr "" msgid "%s%s: not enough memory for parsing message" msgstr "" +msgid "data synchronization" +msgstr "" + msgid "Actions (letter+enter):" msgstr "" diff --git a/src/plugins/relay/api/remote/relay-remote-event.c b/src/plugins/relay/api/remote/relay-remote-event.c index 475f794a5..9c557b11e 100644 --- a/src/plugins/relay/api/remote/relay-remote-event.c +++ b/src/plugins/relay/api/remote/relay-remote-event.c @@ -1221,6 +1221,8 @@ relay_remote_event_sync_with_remote (struct t_relay_remote *remote) remote->synced = 1; + weechat_bar_item_update ("input_prompt"); + end: cJSON_Delete (json); } diff --git a/src/plugins/relay/relay-bar-item.c b/src/plugins/relay/relay-bar-item.c index b5b429761..1f098a651 100644 --- a/src/plugins/relay/relay-bar-item.c +++ b/src/plugins/relay/relay-bar-item.c @@ -56,12 +56,21 @@ relay_bar_item_input_prompt (const void *pointer, void *data, str_status[0] = '\0'; ptr_remote = relay_remote_search (weechat_buffer_get_string (buffer, "localvar_relay_remote")); - if (ptr_remote && (ptr_remote->status != RELAY_STATUS_CONNECTED)) + if (ptr_remote) { - snprintf (str_status, sizeof (str_status), - "%s<%s>", - weechat_color (weechat_config_string (relay_config_color_status[ptr_remote->status])), - _(relay_status_string[ptr_remote->status])); + 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) + { + snprintf ( + str_status, sizeof (str_status), + "%s<%s>", + weechat_color (weechat_config_string (relay_config_color_status[ptr_remote->status])), + _(relay_status_string[ptr_remote->status])); + } } ptr_input_prompt = weechat_buffer_get_string (buffer, "input_prompt");