From 52e90dbdee7f53dcca5a9857dd411f98a569263a Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Fri, 28 Jun 2024 17:32:06 +0200 Subject: [PATCH] Bring back custom mempool instance option --- src/lib/locales/de.json | 5 +++-- src/lib/locales/en.json | 5 +++-- src/lib/locales/es.json | 5 +++-- src/lib/locales/nl.json | 5 +++-- src/routes/Settings.svelte | 28 ++++++++++++++++++++++++++++ src/routes/Status.svelte | 4 +++- 6 files changed, 43 insertions(+), 9 deletions(-) diff --git a/src/lib/locales/de.json b/src/lib/locales/de.json index 7541a63..ba98ad3 100644 --- a/src/lib/locales/de.json +++ b/src/lib/locales/de.json @@ -33,7 +33,8 @@ "ownDataSource": "BTClock-Datenquelle verwenden", "flAlwaysOn": "Displaybeleuchtung immer an", "flEffectDelay": "Displaybeleuchtungeffekt Geschwindigkeit", - "flFlashOnUpd": "Displaybeleuchting bei neuem Block" + "flFlashOnUpd": "Displaybeleuchting bei neuem Block", + "mempoolInstanceHelpText": "Nur wirksam, wenn die BTClock-Datenquelle deaktiviert ist. \nZur Anwendung ist ein Neustart erforderlich." }, "control": { "systemInfo": "Systeminfo", @@ -55,7 +56,7 @@ "screenCycle": "Bildschirmzyklus", "memoryFree": "Speicher frei", "wsPriceConnection": "WS-Preisverbindung", - "wsMempoolConnection": "WS Mempool.space-Verbindung", + "wsMempoolConnection": "WS {instance}-Verbindung", "fetchEuroNote": "If you use \"Fetch € price\" the WS Price connection will show ❌ since it uses another data source.", "uptime": "Betriebszeit", "wifiSignalStrength": "WiFi-Signalstärke", diff --git a/src/lib/locales/en.json b/src/lib/locales/en.json index 68fe9f3..ad22952 100644 --- a/src/lib/locales/en.json +++ b/src/lib/locales/en.json @@ -33,7 +33,8 @@ "flMaxBrightness": "Frontlight brightness", "flAlwaysOn": "Frontlight always on", "flEffectDelay": "Frontlight effect speed", - "flFlashOnUpd": "Frontlight flash on new block" + "flFlashOnUpd": "Frontlight flash on new block", + "mempoolInstanceHelpText": "Only effective when BTClock data-source is disabled. A restart is required to apply." }, "control": { "systemInfo": "System info", @@ -57,7 +58,7 @@ "screenCycle": "Screen cycle", "memoryFree": "Memory free", "wsPriceConnection": "WS Price connection", - "wsMempoolConnection": "WS Mempool.space connection", + "wsMempoolConnection": "WS {instance} connection", "fetchEuroNote": "If you use \"Fetch € price\" the WS Price connection will show ❌ since it uses another data source.", "uptime": "Uptime", "wifiSignalStrength": "WiFi Signal strength", diff --git a/src/lib/locales/es.json b/src/lib/locales/es.json index 9e18a4b..47407ba 100644 --- a/src/lib/locales/es.json +++ b/src/lib/locales/es.json @@ -32,7 +32,8 @@ "flMaxBrightness": "Brillo de luz de la pantalla", "flAlwaysOn": "Luz de la pantalla siempre encendida", "flEffectDelay": "Velocidad del efecto de luz de la pantalla", - "flFlashOnUpd": "Luz de la pantalla parpadea con un nuevo bloque" + "flFlashOnUpd": "Luz de la pantalla parpadea con un nuevo bloque", + "mempoolInstanceHelpText": "Solo es efectivo cuando la fuente de datos BTClock está deshabilitada. \nEs necesario reiniciar para aplicar." }, "control": { "turnOff": "Apagar", @@ -52,7 +53,7 @@ "status": { "memoryFree": "Memoria RAM libre", "wsPriceConnection": "Conexión WebSocket Precio", - "wsMempoolConnection": "Conexión WebSocket Mempool.space", + "wsMempoolConnection": "Conexión WebSocket {instance}", "screenCycle": "Ciclo de pantalla", "uptime": "Tiempo de funcionamiento", "fetchEuroNote": "Si utiliza \"Obtener precio en €\", la conexión de Precio WS mostrará ❌ ya que utiliza otra fuente de datos.", diff --git a/src/lib/locales/nl.json b/src/lib/locales/nl.json index a46bf4f..4c83b56 100644 --- a/src/lib/locales/nl.json +++ b/src/lib/locales/nl.json @@ -33,7 +33,8 @@ "flMaxBrightness": "Displaylicht helderheid", "flAlwaysOn": "Displaylicht altijd aan", "flEffectDelay": "Displaylicht effect snelheid", - "flFlashOnUpd": "Knipper displaylicht bij nieuw blok" + "flFlashOnUpd": "Knipper displaylicht bij nieuw blok", + "mempoolInstanceHelpText": "Alleen effectief als de BTClock-gegevensbron is uitgeschakeld. \nOm toe te passen is een herstart nodig." }, "control": { "systemInfo": "Systeeminformatie", @@ -54,7 +55,7 @@ "memoryFree": "Geheugen vrij", "screenCycle": "Scherm cyclus", "wsPriceConnection": "WS Prijs verbinding", - "wsMempoolConnection": "WS Mempool.space verbinding", + "wsMempoolConnection": "WS {instance} verbinding", "fetchEuroNote": "Wanneer je \"Toon € prijs\" aanzet, zal de prijsverbinding als ❌ verbroken getoond worden vanwege het gebruik van een andere bron.", "uptime": "Uptime", "wifiSignalStrength": "WiFi signaalsterkte", diff --git a/src/routes/Settings.svelte b/src/routes/Settings.svelte index 8a61fdb..da301ba 100644 --- a/src/routes/Settings.svelte +++ b/src/routes/Settings.svelte @@ -255,6 +255,34 @@ {/if} + + + + + + + + HTTPS + + + {$_('section.settings.mempoolInstanceHelpText')} + + - - {$_('section.status.wsMempoolConnection')}: + {$_('section.status.wsMempoolConnection', { + values: { instance: $settings.mempoolInstance } + })}: {#if $status.connectionStatus && $status.connectionStatus.blocks} ✅