From ea723c7595c56c621f33a6b9c2988c178809efed Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Sun, 12 Sep 2021 21:35:37 +0200 Subject: [PATCH 1/2] Separate import and export. Fix ESLint --- src/pages/Settings.vue | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue index 84c3f8b75..8b013c5f9 100644 --- a/src/pages/Settings.vue +++ b/src/pages/Settings.vue @@ -128,46 +128,54 @@ -

{{ $t("Import/Export Backup") }}

+

{{ $t("Export Backup") }}

{{ $t("backupDescription") }}
({{ $t("backupDescription2") }})

-
- - - +
+
+

{{ $t("backupDescription3") }}

+ +

{{ $t("Import Backup") }}

+
- +
- +
- +
{{ $t("importHandleDescription") }}
+
+ +
+ +
+ +
+
{{ importAlert }}
-

{{ $t("backupDescription3") }}

-

{{ $t("Advanced") }}

From 7199bb5ead275307f3443980472df069ed6a1e40 Mon Sep 17 00:00:00 2001 From: Adam Stachowicz Date: Sun, 12 Sep 2021 23:11:07 +0200 Subject: [PATCH 2/2] Remove unused i18n key --- src/languages/da-DK.js | 1 - src/languages/de-DE.js | 3 +-- src/languages/en.js | 6 +++--- src/languages/es-ES.js | 1 - src/languages/et-EE.js | 1 - src/languages/fr-FR.js | 1 - src/languages/it-IT.js | 1 - src/languages/ja.js | 1 - src/languages/ko-KR.js | 1 - src/languages/nl-NL.js | 1 - src/languages/pl.js | 1 - src/languages/ru-RU.js | 1 - src/languages/sr-latn.js | 1 - src/languages/sr.js | 1 - src/languages/sv-SE.js | 1 - src/languages/zh-CN.js | 1 - src/languages/zh-HK.js | 1 - src/pages/Settings.vue | 2 +- 18 files changed, 5 insertions(+), 21 deletions(-) diff --git a/src/languages/da-DK.js b/src/languages/da-DK.js index 6e8069aa1..eefe7467b 100644 --- a/src/languages/da-DK.js +++ b/src/languages/da-DK.js @@ -120,7 +120,6 @@ export default { enableDefaultNotificationDescription: "For hver ny overvåger aktiveres denne underretning som standard. Du kan stadig deaktivere underretningen separat for hver skærm.", "Default enabled": "Standard aktiveret", "Also apply to existing monitors": "Anvend også på eksisterende overvågere", - "Import/Export Backup": " Importér/Eksportér sikkerhedskopi", Export: "Eksport", Import: "Import", backupDescription: "Du kan sikkerhedskopiere alle Overvågere og alle underretninger til en JSON-fil.", diff --git a/src/languages/de-DE.js b/src/languages/de-DE.js index e401f2bf8..95cc3d69a 100644 --- a/src/languages/de-DE.js +++ b/src/languages/de-DE.js @@ -113,7 +113,6 @@ export default { "Create your admin account": "Erstelle dein Admin Konto", "Repeat Password": "Wiederhole das Passwort", "Resource Record Type": "Resource Record Type", - "Import/Export Backup": "Import/Export Backup", "Export": "Export", "Import": "Import", respTime: "Antw. Zeit (ms)", @@ -132,7 +131,7 @@ export default { importHandleDescription: "Wähle 'Vorhandene überspringen' aus, wenn jeder Monitor oder Benachrichtigung mit demselben Namen übersprungen werden soll. 'Überschreiben' löscht jeden vorhandenen Monitor sowie Benachrichtigungen.", "Skip existing": "Vorhandene überspringen", "Overwrite": "Überschreiben", - "Import Options": "Import Optionen", + "Options": "Optionen", confirmImportMsg: "Möchtest du das Backup wirklich importieren? Bitte stelle sicher, dass die richtige Import Option ausgewählt ist.", "Keep both": "Beide behalten", twoFAVerifyLabel: "Bitte trage deinen Token ein um zu verifizieren das 2FA funktioniert", diff --git a/src/languages/en.js b/src/languages/en.js index c81db3105..fc9b60011 100644 --- a/src/languages/en.js +++ b/src/languages/en.js @@ -117,7 +117,8 @@ export default { "Last Result": "Last Result", "Create your admin account": "Create your admin account", "Repeat Password": "Repeat Password", - "Import/Export Backup": "Import/Export Backup", + "Import Backup": "Import Backup", + "Export Backup": "Export Backup", Export: "Export", Import: "Import", respTime: "Resp. Time (ms)", @@ -137,7 +138,7 @@ export default { "Clear all statistics": "Clear all Statistics", "Skip existing": "Skip existing", "Overwrite": "Overwrite", - "Import Options": "Import Options", + "Options": "Options", "Keep both": "Keep both", "Verify Token": "Verify Token", "Setup 2FA": "Setup 2FA", @@ -149,5 +150,4 @@ export default { Inactive: "Inactive", Token: "Token", "Show URI": "Show URI", - "Clear all statistics": "Clear all Statistics" } diff --git a/src/languages/es-ES.js b/src/languages/es-ES.js index b52c1654f..cef00568f 100644 --- a/src/languages/es-ES.js +++ b/src/languages/es-ES.js @@ -120,7 +120,6 @@ export default { enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.", "Default enabled": "Default enabled", "Also apply to existing monitors": "Also apply to existing monitors", - "Import/Export Backup": "Import/Export Backup", Export: "Export", Import: "Import", backupDescription: "You can backup all monitors and all notifications into a JSON file.", diff --git a/src/languages/et-EE.js b/src/languages/et-EE.js index fca24a33d..9c28730df 100644 --- a/src/languages/et-EE.js +++ b/src/languages/et-EE.js @@ -113,7 +113,6 @@ export default { clearEventsMsg: "Kas soovid seire kõik sündmused kustutada?", clearHeartbeatsMsg: "Kas soovid seire kõik tuksed kustutada?", confirmClearStatisticsMsg: "Kas soovid KÕIK statistika kustutada?", - "Import/Export Backup": "Impordi/Ekspordi varukoopia", Export: "Eksport", Import: "Import", "Default enabled": "Kasuta vaikimisi", diff --git a/src/languages/fr-FR.js b/src/languages/fr-FR.js index 4821b818c..44f20e9ce 100644 --- a/src/languages/fr-FR.js +++ b/src/languages/fr-FR.js @@ -120,7 +120,6 @@ export default { enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.", "Default enabled": "Default enabled", "Also apply to existing monitors": "Also apply to existing monitors", - "Import/Export Backup": "Import/Export Backup", Export: "Export", Import: "Import", backupDescription: "You can backup all monitors and all notifications into a JSON file.", diff --git a/src/languages/it-IT.js b/src/languages/it-IT.js index 1d337810c..5cad910d9 100644 --- a/src/languages/it-IT.js +++ b/src/languages/it-IT.js @@ -118,7 +118,6 @@ export default { Heartbeats: "Controlli", "Auto Get": "Auto Get", enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.", - "Import/Export Backup": "Import/Export Backup", Export: "Export", Import: "Import", "Default enabled": "Default enabled", diff --git a/src/languages/ja.js b/src/languages/ja.js index 6d0693d5a..11f4ab2d5 100644 --- a/src/languages/ja.js +++ b/src/languages/ja.js @@ -120,7 +120,6 @@ export default { enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.", "Default enabled": "Default enabled", "Also apply to existing monitors": "Also apply to existing monitors", - "Import/Export Backup": "Import/Export Backup", Export: "Export", Import: "Import", backupDescription: "You can backup all monitors and all notifications into a JSON file.", diff --git a/src/languages/ko-KR.js b/src/languages/ko-KR.js index 68479ade1..2bf6cd5d3 100644 --- a/src/languages/ko-KR.js +++ b/src/languages/ko-KR.js @@ -120,7 +120,6 @@ export default { enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.", "Default enabled": "Default enabled", "Also apply to existing monitors": "Also apply to existing monitors", - "Import/Export Backup": "Import/Export Backup", Export: "Export", Import: "Import", backupDescription: "You can backup all monitors and all notifications into a JSON file.", diff --git a/src/languages/nl-NL.js b/src/languages/nl-NL.js index 48e3b3a29..624a4ec68 100644 --- a/src/languages/nl-NL.js +++ b/src/languages/nl-NL.js @@ -120,7 +120,6 @@ export default { enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.", "Default enabled": "Default enabled", "Also apply to existing monitors": "Also apply to existing monitors", - "Import/Export Backup": "Import/Export Backup", Export: "Export", Import: "Import", backupDescription: "You can backup all monitors and all notifications into a JSON file.", diff --git a/src/languages/pl.js b/src/languages/pl.js index 3029b3497..dbaed36ab 100644 --- a/src/languages/pl.js +++ b/src/languages/pl.js @@ -120,7 +120,6 @@ export default { enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.", "Default enabled": "Default enabled", "Also apply to existing monitors": "Also apply to existing monitors", - "Import/Export Backup": "Import/Export Backup", Export: "Export", Import: "Import", backupDescription: "You can backup all monitors and all notifications into a JSON file.", diff --git a/src/languages/ru-RU.js b/src/languages/ru-RU.js index 7f5eae760..5b81f6fcd 100644 --- a/src/languages/ru-RU.js +++ b/src/languages/ru-RU.js @@ -120,7 +120,6 @@ export default { enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.", "Default enabled": "Default enabled", "Also apply to existing monitors": "Also apply to existing monitors", - "Import/Export Backup": "Import/Export Backup", Export: "Export", Import: "Import", backupDescription: "You can backup all monitors and all notifications into a JSON file.", diff --git a/src/languages/sr-latn.js b/src/languages/sr-latn.js index 3dd73d2cc..b8e19e3e6 100644 --- a/src/languages/sr-latn.js +++ b/src/languages/sr-latn.js @@ -120,7 +120,6 @@ export default { enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.", "Default enabled": "Default enabled", "Also apply to existing monitors": "Also apply to existing monitors", - "Import/Export Backup": "Import/Export Backup", Export: "Export", Import: "Import", backupDescription: "You can backup all monitors and all notifications into a JSON file.", diff --git a/src/languages/sr.js b/src/languages/sr.js index 6931d272e..b00de38aa 100644 --- a/src/languages/sr.js +++ b/src/languages/sr.js @@ -120,7 +120,6 @@ export default { enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.", "Default enabled": "Default enabled", "Also apply to existing monitors": "Also apply to existing monitors", - "Import/Export Backup": "Import/Export Backup", Export: "Export", Import: "Import", backupDescription: "You can backup all monitors and all notifications into a JSON file.", diff --git a/src/languages/sv-SE.js b/src/languages/sv-SE.js index f8749e289..f735dbbfe 100644 --- a/src/languages/sv-SE.js +++ b/src/languages/sv-SE.js @@ -120,7 +120,6 @@ export default { enableDefaultNotificationDescription: "For every new monitor this notification will be enabled by default. You can still disable the notification separately for each monitor.", "Default enabled": "Default enabled", "Also apply to existing monitors": "Also apply to existing monitors", - "Import/Export Backup": "Import/Export Backup", Export: "Export", Import: "Import", backupDescription: "You can backup all monitors and all notifications into a JSON file.", diff --git a/src/languages/zh-CN.js b/src/languages/zh-CN.js index 1d15c3d95..085b64e31 100644 --- a/src/languages/zh-CN.js +++ b/src/languages/zh-CN.js @@ -120,7 +120,6 @@ export default { enableDefaultNotificationDescription: "新的监控项将默认启用，你也可以在每个监控项中分别设置", "Default enabled": "默认开启", "Also apply to existing monitors": "应用到所有监控项", - "Import/Export Backup": "导入/导出备份", Export: "导出", Import: "导入", backupDescription: "你可以将所有的监控项和消息通知备份到一个 JSON 文件中", diff --git a/src/languages/zh-HK.js b/src/languages/zh-HK.js index 314b6e696..0a108be04 100644 --- a/src/languages/zh-HK.js +++ b/src/languages/zh-HK.js @@ -120,7 +120,6 @@ export default { enableDefaultNotificationDescription: "新增監測器時這個通知會預設啟用，當然每個監測器亦可分別控制開關。", "Default enabled": "預設通知", "Also apply to existing monitors": "同時取用至目前所有監測器", - "Import/Export Backup": "匯入/匯出 備份", Export: "匯出", Import: "匯入", backupDescription: "您可以備份所有監測器及所有通知。", diff --git a/src/pages/Settings.vue b/src/pages/Settings.vue index 8b013c5f9..aefdd4468 100644 --- a/src/pages/Settings.vue +++ b/src/pages/Settings.vue @@ -143,7 +143,7 @@

{{ $t("Import Backup") }}

- +