From 33123c354b79f7951423dd75097b11e7eb075f99 Mon Sep 17 00:00:00 2001 From: Markus Hatvan Date: Fri, 2 Jul 2021 19:49:55 -0600 Subject: Upgrade various dependencies to latest part 2 (#1557) * Upgrade various dependencies to latest, remove unnecessary electron-hunspell - upgrade eslint and friends to latest - remove deprecated 'node-sass' in favor of 'sass' - disable new rules from 'eslint-config-airbnb' that are conflicting with current code style - add workspace config for 'vscode' that silences 'experimentalDecorator' warning and forces 'prettier' to single quote * Run yarn lint to autofix with new ruleset and worked down lint issues to zero --- src/i18n/apply-branding.js | 1 - src/i18n/locales/defaultMessages.json | 166 +++++++++++++++------ src/i18n/locales/en-US.json | 4 + src/i18n/messages/src/components/auth/Pricing.json | 52 +++---- .../src/components/settings/SettingsLayout.json | 15 ++ src/i18n/messages/src/components/ui/InfoBar.json | 15 ++ src/i18n/messages/src/components/ui/Infobox.json | 15 ++ src/i18n/messages/src/components/ui/Input.json | 15 ++ .../src/features/publishDebugInfo/Component.json | 28 ++-- .../workspaces/components/EditWorkspaceForm.json | 14 +- 10 files changed, 230 insertions(+), 95 deletions(-) create mode 100644 src/i18n/messages/src/components/settings/SettingsLayout.json create mode 100644 src/i18n/messages/src/components/ui/InfoBar.json create mode 100644 src/i18n/messages/src/components/ui/Infobox.json create mode 100644 src/i18n/messages/src/components/ui/Input.json (limited to 'src/i18n') diff --git a/src/i18n/apply-branding.js b/src/i18n/apply-branding.js index 68ffb822a..40a07ded0 100644 --- a/src/i18n/apply-branding.js +++ b/src/i18n/apply-branding.js @@ -36,7 +36,6 @@ const replace = { '!!!': '', }; - const locales = path.join(__dirname, 'locales'); const files = fs.readdirSync(locales); diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 8401184de..4ee96822e 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json @@ -664,169 +664,169 @@ "defaultMessage": "!!!Hi {name}, welcome to Franz", "end": { "column": 3, - "line": 18 + "line": 17 }, "file": "src/components/auth/Pricing.js", "id": "pricing.trial.headline.pro", "start": { "column": 12, - "line": 15 + "line": 14 } }, { "defaultMessage": "!!!We have a special treat for you.", "end": { "column": 3, - "line": 22 + "line": 21 }, "file": "src/components/auth/Pricing.js", "id": "pricing.trial.intro.specialTreat", "start": { "column": 16, - "line": 19 + "line": 18 } }, { "defaultMessage": "!!!Enjoy the full Franz Professional experience completely free for 14 days.", "end": { "column": 3, - "line": 26 + "line": 25 }, "file": "src/components/auth/Pricing.js", "id": "pricing.trial.intro.tryPro", "start": { "column": 10, - "line": 23 + "line": 22 } }, { "defaultMessage": "!!!Happy messaging,", "end": { "column": 3, - "line": 30 + "line": 29 }, "file": "src/components/auth/Pricing.js", "id": "pricing.trial.intro.happyMessaging", "start": { "column": 18, - "line": 27 + "line": 26 } }, { "defaultMessage": "!!!No strings attached", "end": { "column": 3, - "line": 34 + "line": 33 }, "file": "src/components/auth/Pricing.js", "id": "pricing.trial.terms.headline", "start": { "column": 29, - "line": 31 + "line": 30 } }, { "defaultMessage": "!!!No credit card required", "end": { "column": 3, - "line": 38 + "line": 37 }, "file": "src/components/auth/Pricing.js", "id": "pricing.trial.terms.noCreditCard", "start": { "column": 16, - "line": 35 + "line": 34 } }, { "defaultMessage": "!!!Your free trial ends automatically after 14 days", "end": { "column": 3, - "line": 42 + "line": 41 }, "file": "src/components/auth/Pricing.js", "id": "pricing.trial.terms.automaticTrialEnd", "start": { "column": 21, - "line": 39 + "line": 38 } }, { "defaultMessage": "!!!Free trial (normally {currency}{price} per month)", "end": { "column": 3, - "line": 46 + "line": 45 }, "file": "src/components/auth/Pricing.js", "id": "pricing.trial.terms.trialWorth", "start": { "column": 14, - "line": 43 + "line": 42 } }, { "defaultMessage": "!!!Sorry, we could not activate your trial!", "end": { "column": 3, - "line": 50 + "line": 49 }, "file": "src/components/auth/Pricing.js", "id": "pricing.trial.error", "start": { "column": 19, - "line": 47 + "line": 46 } }, { "defaultMessage": "!!!Start my 14-day Franz Professional Trial", "end": { "column": 3, - "line": 54 + "line": 53 }, "file": "src/components/auth/Pricing.js", "id": "pricing.trial.cta.accept", "start": { "column": 13, - "line": 51 + "line": 50 } }, { "defaultMessage": "!!!Start using Franz", "end": { "column": 3, - "line": 58 + "line": 57 }, "file": "src/components/auth/Pricing.js", "id": "pricing.trial.cta.start", "start": { "column": 12, - "line": 55 + "line": 54 } }, { "defaultMessage": "!!!Continue to Ferdi", "end": { "column": 3, - "line": 62 + "line": 61 }, "file": "src/components/auth/Pricing.js", "id": "pricing.trial.cta.skip", "start": { "column": 11, - "line": 59 + "line": 58 } }, { "defaultMessage": "!!!Franz Professional includes:", "end": { "column": 3, - "line": 66 + "line": 65 }, "file": "src/components/auth/Pricing.js", "id": "pricing.trial.features.headline", "start": { "column": 20, - "line": 63 + "line": 62 } } ], @@ -3656,6 +3656,24 @@ ], "path": "src/components/settings/settings/EditSettingsForm.json" }, + { + "descriptors": [ + { + "defaultMessage": "!!!Close settings", + "end": { + "column": 3, + "line": 14 + }, + "file": "src/components/settings/SettingsLayout.js", + "id": "settings.app.closeSettings", + "start": { + "column": 17, + "line": 11 + } + } + ], + "path": "src/components/settings/SettingsLayout.json" + }, { "descriptors": [ { @@ -4559,6 +4577,60 @@ ], "path": "src/components/ui/FeatureList.json" }, + { + "descriptors": [ + { + "defaultMessage": "!!!Hide", + "end": { + "column": 3, + "line": 15 + }, + "file": "src/components/ui/InfoBar.js", + "id": "infobar.hide", + "start": { + "column": 8, + "line": 12 + } + } + ], + "path": "src/components/ui/InfoBar.json" + }, + { + "descriptors": [ + { + "defaultMessage": "!!!Dismiss", + "end": { + "column": 3, + "line": 12 + }, + "file": "src/components/ui/Infobox.js", + "id": "infobox.dismiss", + "start": { + "column": 11, + "line": 9 + } + } + ], + "path": "src/components/ui/Infobox.json" + }, + { + "descriptors": [ + { + "defaultMessage": "!!!Password toggle", + "end": { + "column": 3, + "line": 14 + }, + "file": "src/components/ui/Input.js", + "id": "settings.app.form.passwordToggle", + "start": { + "column": 18, + "line": 11 + } + } + ], + "path": "src/components/ui/Input.json" + }, { "descriptors": [ { @@ -6070,91 +6142,91 @@ "defaultMessage": "!!!Publish debug information", "end": { "column": 3, - "line": 21 + "line": 20 }, "file": "src/features/publishDebugInfo/Component.js", "id": "feature.publishDebugInfo.title", "start": { "column": 9, - "line": 18 + "line": 17 } }, { "defaultMessage": "!!!Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service", "end": { "column": 3, - "line": 25 + "line": 24 }, "file": "src/features/publishDebugInfo/Component.js", "id": "feature.publishDebugInfo.info", "start": { "column": 8, - "line": 22 + "line": 21 } }, { "defaultMessage": "!!!There was an error while trying to publish the debug information. Please try again later or view the console for more information.", "end": { "column": 3, - "line": 29 + "line": 28 }, "file": "src/features/publishDebugInfo/Component.js", "id": "feature.publishDebugInfo.error", "start": { "column": 9, - "line": 26 + "line": 25 } }, { "defaultMessage": "!!!Privacy policy", "end": { "column": 3, - "line": 33 + "line": 32 }, "file": "src/features/publishDebugInfo/Component.js", "id": "feature.publishDebugInfo.privacy", "start": { "column": 11, - "line": 30 + "line": 29 } }, { "defaultMessage": "!!!Terms of service", "end": { "column": 3, - "line": 37 + "line": 36 }, "file": "src/features/publishDebugInfo/Component.js", "id": "feature.publishDebugInfo.terms", "start": { "column": 9, - "line": 34 + "line": 33 } }, { "defaultMessage": "!!!Accept and publish", "end": { "column": 3, - "line": 41 + "line": 40 }, "file": "src/features/publishDebugInfo/Component.js", "id": "feature.publishDebugInfo.publish", "start": { "column": 11, - "line": 38 + "line": 37 } }, { "defaultMessage": "!!!Your debug log was published and is now availible at", "end": { "column": 3, - "line": 45 + "line": 44 }, "file": "src/features/publishDebugInfo/Component.js", "id": "feature.publishDebugInfo.published", "start": { "column": 13, - "line": 42 + "line": 41 } } ], @@ -6736,7 +6808,7 @@ "defaultMessage": "!!!*This option will be overwritten by the global \"Keep all workspaces loaded\" option.", "end": { "column": 3, - "line": 44 + "line": 45 }, "file": "src/features/workspaces/components/EditWorkspaceForm.js", "id": "settings.workspace.form.keepLoadedInfo", @@ -6749,39 +6821,39 @@ "defaultMessage": "!!!Services in this Workspace", "end": { "column": 3, - "line": 48 + "line": 49 }, "file": "src/features/workspaces/components/EditWorkspaceForm.js", "id": "settings.workspace.form.servicesInWorkspaceHeadline", "start": { "column": 31, - "line": 45 + "line": 46 } }, { "defaultMessage": "!!!Start by adding a service.", "end": { "column": 3, - "line": 52 + "line": 53 }, "file": "src/features/workspaces/components/EditWorkspaceForm.js", "id": "settings.services.noServicesAdded", "start": { "column": 19, - "line": 49 + "line": 50 } }, { "defaultMessage": "!!!Discover services", "end": { "column": 3, - "line": 56 + "line": 57 }, "file": "src/features/workspaces/components/EditWorkspaceForm.js", "id": "settings.services.discoverServices", "start": { "column": 20, - "line": 53 + "line": 54 } } ], diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index fc25795a4..05a8e7486 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -84,10 +84,12 @@ "infobar.buttonChangelog": "What is new?", "infobar.buttonInstallUpdate": "Restart & install update", "infobar.buttonReloadServices": "Reload services", + "infobar.hide": "Hide", "infobar.requiredRequestsFailed": "Could not load services and user information", "infobar.servicesUpdated": "Your services have been updated.", "infobar.trialActivated": "Your trial was successfully activated. Happy messaging!", "infobar.updateAvailable": "A new update for Ferdi is available.", + "infobox.dismiss": "Dismiss", "invite.email.label": "Email address", "invite.headline.friends": "Invite 3 of your friends or colleagues", "invite.name.label": "Name", @@ -286,6 +288,7 @@ "settings.app.buttonSearchForUpdate": "Check for updates", "settings.app.cacheInfo": "Ferdi cache is currently using {size} of disk space.", "settings.app.cacheNotCleared": "Couldn't clear all cache", + "settings.app.closeSettings": "Close settings", "settings.app.currentVersion": "Current version:", "settings.app.form.accentColor": "Accent color", "settings.app.form.adaptableDarkMode": "Synchronize dark mode with my OS's dark mode setting", @@ -315,6 +318,7 @@ "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray", "settings.app.form.navigationBarBehaviour": "Navigation bar behaviour", "settings.app.form.notifyTaskBarOnMessage": "Notify TaskBar/Dock on new message", + "settings.app.form.passwordToggle": "Password toggle", "settings.app.form.predefinedTodoServer": "Todo Server", "settings.app.form.privateNotifications": "Don't show message content in notifications", "settings.app.form.reloadAfterResume": "Reload Ferdi after system resume", diff --git a/src/i18n/messages/src/components/auth/Pricing.json b/src/i18n/messages/src/components/auth/Pricing.json index c4c94bb32..b5b7d72a8 100644 --- a/src/i18n/messages/src/components/auth/Pricing.json +++ b/src/i18n/messages/src/components/auth/Pricing.json @@ -4,11 +4,11 @@ "defaultMessage": "!!!Hi {name}, welcome to Franz", "file": "src/components/auth/Pricing.js", "start": { - "line": 15, + "line": 14, "column": 12 }, "end": { - "line": 18, + "line": 17, "column": 3 } }, @@ -17,11 +17,11 @@ "defaultMessage": "!!!We have a special treat for you.", "file": "src/components/auth/Pricing.js", "start": { - "line": 19, + "line": 18, "column": 16 }, "end": { - "line": 22, + "line": 21, "column": 3 } }, @@ -30,11 +30,11 @@ "defaultMessage": "!!!Enjoy the full Franz Professional experience completely free for 14 days.", "file": "src/components/auth/Pricing.js", "start": { - "line": 23, + "line": 22, "column": 10 }, "end": { - "line": 26, + "line": 25, "column": 3 } }, @@ -43,11 +43,11 @@ "defaultMessage": "!!!Happy messaging,", "file": "src/components/auth/Pricing.js", "start": { - "line": 27, + "line": 26, "column": 18 }, "end": { - "line": 30, + "line": 29, "column": 3 } }, @@ -56,11 +56,11 @@ "defaultMessage": "!!!No strings attached", "file": "src/components/auth/Pricing.js", "start": { - "line": 31, + "line": 30, "column": 29 }, "end": { - "line": 34, + "line": 33, "column": 3 } }, @@ -69,11 +69,11 @@ "defaultMessage": "!!!No credit card required", "file": "src/components/auth/Pricing.js", "start": { - "line": 35, + "line": 34, "column": 16 }, "end": { - "line": 38, + "line": 37, "column": 3 } }, @@ -82,11 +82,11 @@ "defaultMessage": "!!!Your free trial ends automatically after 14 days", "file": "src/components/auth/Pricing.js", "start": { - "line": 39, + "line": 38, "column": 21 }, "end": { - "line": 42, + "line": 41, "column": 3 } }, @@ -95,11 +95,11 @@ "defaultMessage": "!!!Free trial (normally {currency}{price} per month)", "file": "src/components/auth/Pricing.js", "start": { - "line": 43, + "line": 42, "column": 14 }, "end": { - "line": 46, + "line": 45, "column": 3 } }, @@ -108,11 +108,11 @@ "defaultMessage": "!!!Sorry, we could not activate your trial!", "file": "src/components/auth/Pricing.js", "start": { - "line": 47, + "line": 46, "column": 19 }, "end": { - "line": 50, + "line": 49, "column": 3 } }, @@ -121,11 +121,11 @@ "defaultMessage": "!!!Start my 14-day Franz Professional Trial", "file": "src/components/auth/Pricing.js", "start": { - "line": 51, + "line": 50, "column": 13 }, "end": { - "line": 54, + "line": 53, "column": 3 } }, @@ -134,11 +134,11 @@ "defaultMessage": "!!!Start using Franz", "file": "src/components/auth/Pricing.js", "start": { - "line": 55, + "line": 54, "column": 12 }, "end": { - "line": 58, + "line": 57, "column": 3 } }, @@ -147,11 +147,11 @@ "defaultMessage": "!!!Continue to Ferdi", "file": "src/components/auth/Pricing.js", "start": { - "line": 59, + "line": 58, "column": 11 }, "end": { - "line": 62, + "line": 61, "column": 3 } }, @@ -160,11 +160,11 @@ "defaultMessage": "!!!Franz Professional includes:", "file": "src/components/auth/Pricing.js", "start": { - "line": 63, + "line": 62, "column": 20 }, "end": { - "line": 66, + "line": 65, "column": 3 } } diff --git a/src/i18n/messages/src/components/settings/SettingsLayout.json b/src/i18n/messages/src/components/settings/SettingsLayout.json new file mode 100644 index 000000000..99337a315 --- /dev/null +++ b/src/i18n/messages/src/components/settings/SettingsLayout.json @@ -0,0 +1,15 @@ +[ + { + "id": "settings.app.closeSettings", + "defaultMessage": "!!!Close settings", + "file": "src/components/settings/SettingsLayout.js", + "start": { + "line": 11, + "column": 17 + }, + "end": { + "line": 14, + "column": 3 + } + } +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/ui/InfoBar.json b/src/i18n/messages/src/components/ui/InfoBar.json new file mode 100644 index 000000000..a6a629c71 --- /dev/null +++ b/src/i18n/messages/src/components/ui/InfoBar.json @@ -0,0 +1,15 @@ +[ + { + "id": "infobar.hide", + "defaultMessage": "!!!Hide", + "file": "src/components/ui/InfoBar.js", + "start": { + "line": 12, + "column": 8 + }, + "end": { + "line": 15, + "column": 3 + } + } +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/ui/Infobox.json b/src/i18n/messages/src/components/ui/Infobox.json new file mode 100644 index 000000000..296c2ad3e --- /dev/null +++ b/src/i18n/messages/src/components/ui/Infobox.json @@ -0,0 +1,15 @@ +[ + { + "id": "infobox.dismiss", + "defaultMessage": "!!!Dismiss", + "file": "src/components/ui/Infobox.js", + "start": { + "line": 9, + "column": 11 + }, + "end": { + "line": 12, + "column": 3 + } + } +] \ No newline at end of file diff --git a/src/i18n/messages/src/components/ui/Input.json b/src/i18n/messages/src/components/ui/Input.json new file mode 100644 index 000000000..6240badfb --- /dev/null +++ b/src/i18n/messages/src/components/ui/Input.json @@ -0,0 +1,15 @@ +[ + { + "id": "settings.app.form.passwordToggle", + "defaultMessage": "!!!Password toggle", + "file": "src/components/ui/Input.js", + "start": { + "line": 11, + "column": 18 + }, + "end": { + "line": 14, + "column": 3 + } + } +] \ No newline at end of file diff --git a/src/i18n/messages/src/features/publishDebugInfo/Component.json b/src/i18n/messages/src/features/publishDebugInfo/Component.json index 85fbe7ca6..25048ace6 100644 --- a/src/i18n/messages/src/features/publishDebugInfo/Component.json +++ b/src/i18n/messages/src/features/publishDebugInfo/Component.json @@ -4,11 +4,11 @@ "defaultMessage": "!!!Publish debug information", "file": "src/features/publishDebugInfo/Component.js", "start": { - "line": 18, + "line": 17, "column": 9 }, "end": { - "line": 21, + "line": 20, "column": 3 } }, @@ -17,11 +17,11 @@ "defaultMessage": "!!!Publishing your debug information helps us find issues and errors in Ferdi. By publishing your debug information you accept Ferdi Debugger's privacy policy and terms of service", "file": "src/features/publishDebugInfo/Component.js", "start": { - "line": 22, + "line": 21, "column": 8 }, "end": { - "line": 25, + "line": 24, "column": 3 } }, @@ -30,11 +30,11 @@ "defaultMessage": "!!!There was an error while trying to publish the debug information. Please try again later or view the console for more information.", "file": "src/features/publishDebugInfo/Component.js", "start": { - "line": 26, + "line": 25, "column": 9 }, "end": { - "line": 29, + "line": 28, "column": 3 } }, @@ -43,11 +43,11 @@ "defaultMessage": "!!!Privacy policy", "file": "src/features/publishDebugInfo/Component.js", "start": { - "line": 30, + "line": 29, "column": 11 }, "end": { - "line": 33, + "line": 32, "column": 3 } }, @@ -56,11 +56,11 @@ "defaultMessage": "!!!Terms of service", "file": "src/features/publishDebugInfo/Component.js", "start": { - "line": 34, + "line": 33, "column": 9 }, "end": { - "line": 37, + "line": 36, "column": 3 } }, @@ -69,11 +69,11 @@ "defaultMessage": "!!!Accept and publish", "file": "src/features/publishDebugInfo/Component.js", "start": { - "line": 38, + "line": 37, "column": 11 }, "end": { - "line": 41, + "line": 40, "column": 3 } }, @@ -82,11 +82,11 @@ "defaultMessage": "!!!Your debug log was published and is now availible at", "file": "src/features/publishDebugInfo/Component.js", "start": { - "line": 42, + "line": 41, "column": 13 }, "end": { - "line": 45, + "line": 44, "column": 3 } } diff --git a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json index 053751c84..804e30070 100644 --- a/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json +++ b/src/i18n/messages/src/features/workspaces/components/EditWorkspaceForm.json @@ -73,7 +73,7 @@ "column": 18 }, "end": { - "line": 44, + "line": 45, "column": 3 } }, @@ -82,11 +82,11 @@ "defaultMessage": "!!!Services in this Workspace", "file": "src/features/workspaces/components/EditWorkspaceForm.js", "start": { - "line": 45, + "line": 46, "column": 31 }, "end": { - "line": 48, + "line": 49, "column": 3 } }, @@ -95,11 +95,11 @@ "defaultMessage": "!!!Start by adding a service.", "file": "src/features/workspaces/components/EditWorkspaceForm.js", "start": { - "line": 49, + "line": 50, "column": 19 }, "end": { - "line": 52, + "line": 53, "column": 3 } }, @@ -108,11 +108,11 @@ "defaultMessage": "!!!Discover services", "file": "src/features/workspaces/components/EditWorkspaceForm.js", "start": { - "line": 53, + "line": 54, "column": 20 }, "end": { - "line": 56, + "line": 57, "column": 3 } } -- cgit v1.2.3-54-g00ecf