From b21d39b2eb2a3922a059c573d61566c836762a6f Mon Sep 17 00:00:00 2001 From: th33xitus Date: Mon, 3 Jan 2022 22:08:24 +0100 Subject: [PATCH 1/3] chore: improve confirmation service host control visuals Signed-off-by: Dominik Willner --- src/components/TheTopCornerMenu.vue | 4 ++-- src/locales/en.json | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/TheTopCornerMenu.vue b/src/components/TheTopCornerMenu.vue index 8f60e62c1..b54b67597 100644 --- a/src/components/TheTopCornerMenu.vue +++ b/src/components/TheTopCornerMenu.vue @@ -85,7 +85,7 @@ - + @@ -101,7 +101,7 @@ {{ $t('App.TopCornerMenu.Cancel') }} - + {{ dialogConfirmation.actionButtonText }} diff --git a/src/locales/en.json b/src/locales/en.json index db209263f..dd0f49440 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -25,13 +25,13 @@ "Cancel": "Cancel", "ConfirmationDialog": { "Title": { - "KlipperRestart": "Klipper restart", - "KlipperFirmwareRestart": "Klipper firmware restart", - "ServiceStart": "Service start", - "ServiceRestart": "Service restart", - "ServiceStop": "Service stop", - "HostReboot": "Host reboot", - "HostShutdown": "Host shutdown" + "KlipperRestart": "Klipper Restart", + "KlipperFirmwareRestart": "Klipper Firmware Restart", + "ServiceStart": "Service Start", + "ServiceRestart": "Service Restart", + "ServiceStop": "Service Stop", + "HostReboot": "Host Reboot", + "HostShutdown": "Host Shutdown" }, "Description": { "KlipperStop": "If you stop Klipper now, the current print will fail.", From 855c3b471f6341d197e75578f9fde2c46a9ad230 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Tue, 4 Jan 2022 15:53:06 +0100 Subject: [PATCH 2/3] fix: add missing klipper restart condition Signed-off-by: Dominik Willner --- src/components/TheTopCornerMenu.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/TheTopCornerMenu.vue b/src/components/TheTopCornerMenu.vue index b54b67597..85f13005f 100644 --- a/src/components/TheTopCornerMenu.vue +++ b/src/components/TheTopCornerMenu.vue @@ -197,6 +197,7 @@ export default class TheTopCornerMenu extends Mixins(BaseMixin) { this.dialogConfirmation.title = this.$t('App.TopCornerMenu.ConfirmationDialog.Title.' + functionNameUppercase)+'' if (serviceName === 'klipper' && action === 'Stop') this.dialogConfirmation.description = this.$t('App.TopCornerMenu.ConfirmationDialog.Description.KlipperStop')+'' + else if (serviceName === 'klipper' && action === 'Restart') this.dialogConfirmation.description = this.$t('App.TopCornerMenu.ConfirmationDialog.Description.KlipperRestart')+'' else this.dialogConfirmation.description = this.$t('App.TopCornerMenu.ConfirmationDialog.Description.' + functionNameUppercase)+'' this.dialogConfirmation.actionButtonText = this.$t('App.TopCornerMenu.' + action.charAt(0).toUpperCase() + action.slice(1))+'' From b82604e0ffd180615a6a8bc7d7bd2000c640ec05 Mon Sep 17 00:00:00 2001 From: th33xitus Date: Tue, 4 Jan 2022 15:54:12 +0100 Subject: [PATCH 3/3] i18n: improve wording of english and german translation Signed-off-by: Dominik Willner --- src/locales/de.json | 22 +++++++++++----------- src/locales/en.json | 16 ++++++++-------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/locales/de.json b/src/locales/de.json index abc1b87f4..568ded048 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -27,21 +27,21 @@ "Title": { "KlipperRestart": "Klipper Neustart", "KlipperFirmwareRestart": "Klipper Firmware Neustart", - "ServiceStart": "Service Start", - "ServiceRestart": "Service Neustart", - "ServiceStop": "Service Stop", + "ServiceStart": "Dienst Start", + "ServiceRestart": "Dienst Neustart", + "ServiceStop": "Dienst Stop", "HostReboot": "Host Neustart", "HostShutdown": "Host Herunterfahren" }, "Description": { - "KlipperStop": "Wenn du Klipper jetzt stoppst, wird der momentane Druck fehlschlagen.", - "KlipperRestart": "Wenn du Klipper jetzt neustartest, wird der momentane Druck fehlschlagen.", - "KlipperFirmwareRestart": "Wenn du die Klipper Firmware jetzt neustartest, wird der momentane Druck fehlschlagen.", - "ServiceStart": "Wenn du diesen Service jetzt startest, riskierst du höchstwahrscheinlich einen Fehlschlag des momentanen Druckauftrags.", - "ServiceRestart": "Wenn du diesen Service jetzt neustartest, riskierst du höchstwahrscheinlich einen Fehlschlag des momentanen Druckauftrags.", - "ServiceStop": "Wenn du diesen Service jetzt stoppst, riskierst du höchstwahrscheinlich einen Fehlschlag des momentanen Druckauftrags.", - "HostReboot": "Wenn du den Host jetzt neustartest, wird der momentane Druck fehlschlagen.", - "HostShutdown": "Wenn du den Host jetzt herunterfährst, wird der momentane Druck fehlschlagen." + "KlipperStop": "Ein Stopp von Klipper wird zum Abbruch des aktuellen Druckauftrags führen!", + "KlipperRestart": "Ein Neustart von Klipper wird zum Abbruch des aktuellen Druckauftrags führen!", + "KlipperFirmwareRestart": "Ein Neustart der Klipper Firmware wird zum Abbruch des aktuellen Druckauftrags führen!", + "ServiceStart": "Ein Start dieses Dienstes kann zum Abbruch des aktuellen Druckauftrags führen!", + "ServiceRestart": "Ein Neustart dieses Dienstes kann zum Abbruch des aktuellen Druckauftrags führen!", + "ServiceStop": "Ein Stopp dieses Dienstes kann zum Abbruch des aktuellen Druckauftrags führen!", + "HostReboot": "Ein Neustart des Hosts wird zum Abbruch des aktuellen Druckauftrags führen!", + "HostShutdown": "Ein Herunterfahren des Hosts wird zum Abbruch des aktuellen Druckauftrags führen!" } } }, diff --git a/src/locales/en.json b/src/locales/en.json index dd0f49440..bff5958d8 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -34,14 +34,14 @@ "HostShutdown": "Host Shutdown" }, "Description": { - "KlipperStop": "If you stop Klipper now, the current print will fail.", - "KlipperRestart": "If you restart Klipper now, the current print will fail.", - "KlipperFirmwareRestart": "If you restart the Klipper firmware now, the current print will fail.", - "ServiceStart": "If you start this service now, you are very likely risking a failure of your ongoing print job.", - "ServiceRestart": "If you restart this service now, you are very likely risking a failure of your ongoing print job.", - "ServiceStop": "If you stop this service now, you are very likely risking a failure of your ongoing print job.", - "HostReboot": "If you reboot the host now, the current print will fail.", - "HostShutdown": "If you shutdown the host now, the current print will fail." + "KlipperStop": "Stopping Klipper will cause the current print to fail!", + "KlipperRestart": "Restarting Klipper will cause the current print to fail!", + "KlipperFirmwareRestart": "Restarting the Klipper Firmware will cause the current print to fail!", + "ServiceStart": "Starting this service may cause the current print to fail!", + "ServiceRestart": "Restarting this service may cause the current print to fail!", + "ServiceStop": "Stopping this service may cause the current print to fail!", + "HostReboot": "Rebooting the Host will cause the current print to fail!", + "HostShutdown": "Shutting down the Host will cause the current print to fail!" } } },