From dcab45a323f53a10ff5f419daa5ba6442817eebc Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Tue, 14 Nov 2017 21:04:41 +0100 Subject: feat(App): Add option to enable/disable spell checker --- src/i18n/languages.js | 45 ++++++++++++++++++++++++++++++++++++++++++++- src/i18n/locales/en-US.json | 3 +++ src/i18n/translations.js | 4 ++-- 3 files changed, 49 insertions(+), 3 deletions(-) (limited to 'src/i18n') diff --git a/src/i18n/languages.js b/src/i18n/languages.js index 72d7b26c1..77bb5deae 100644 --- a/src/i18n/languages.js +++ b/src/i18n/languages.js @@ -1,4 +1,4 @@ -module.exports = { +export const APP_LOCALES = { 'en-US': 'English', 'pt-BR': 'Portuguese (Brazil)', 'el-GR': 'Ελληνικά (Greece)', @@ -15,3 +15,46 @@ module.exports = { 'zh-Hant': 'Chinese (Traditional)', 'nb-NO': 'Norsk', }; + +export default APP_LOCALES; + +// export const SPELLCHECKER_LOCALES = { +// af: 'Afrikaans', +// sq: 'Albanian', +// ar: 'Arabic', +// bg: 'Bulgarian', +// zh: 'Chinese', +// hr: 'Croatian', +// cs: 'Czech', +// da: 'Danish', +// nl: 'Dutch', +// en: 'English', +// 'en-AU': 'English (AU)', +// 'en-CA': 'English (CA)', +// 'en-GB': 'English (GB)', +// fi: 'Finnish', +// fr: 'French', +// ka: 'Georgian', +// de: 'German', +// el: 'Greek, Modern', +// hi: 'Hindi', +// hu: 'Hungarian', +// id: 'Indonesian', +// it: 'Italian', +// ja: 'Japanese', +// jv: 'Javanese', +// ko: 'Korean', +// lt: 'Lithuanian', +// lv: 'Latvian', +// ms: 'Malay', +// no: 'Norwegian', +// pl: 'Polish', +// pt: 'Portuguese', +// ro: 'Romanian, Moldavian, Moldovan', +// ru: 'Russian', +// sk: 'Slovak', +// es: 'Spanish', +// sv: 'Swedish', +// uk: 'Ukrainian', +// vi: 'Vietnamese', +// }; diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index fd8ba0fef..e50386e79 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -132,6 +132,7 @@ "settings.app.headlineLanguage": "Language", "settings.app.headlineUpdates": "Updates", "settings.app.headlineAppearance": "Appearance", + "settings.app.headlineAdvanced": "Advanced", "settings.app.buttonSearchForUpdate": "Check for updates", "settings.app.buttonInstallUpdate": "Restart & install update", "settings.app.updateStatusSearching": "Is searching for update", @@ -143,9 +144,11 @@ "settings.app.form.minimizeToSystemTray": "Minimize Franz to system tray", "settings.app.form.runInBackground": "Keep Franz in background when closing the window", "settings.app.form.language": "Language", + "settings.app.form.enableSpellchecking": "Enable spell checking", "settings.app.form.showDisabledServices": "Display disabled services tabs", "settings.app.form.beta": "Include beta versions", "settings.app.currentVersion": "Current version:", + "settings.app.restartRequired": "Changes require restart", "settings.user.form.firstname": "Firstname", "settings.user.form.lastname": "Lastname", "settings.user.form.email": "Email", diff --git a/src/i18n/translations.js b/src/i18n/translations.js index 492a6cc4e..161a172ba 100644 --- a/src/i18n/translations.js +++ b/src/i18n/translations.js @@ -1,7 +1,7 @@ -import languages from './languages'; +import { APP_LOCALES } from './languages'; const translations = []; -Object.keys(languages).forEach((key) => { +Object.keys(APP_LOCALES).forEach((key) => { try { const translation = require(`./locales/${key}.json`); // eslint-disable-line translations[key] = translation; -- cgit v1.2.3-70-g09d2 From f98f17c01ee23f4414d09ae671d91452ea2ce635 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Tue, 14 Nov 2017 22:14:33 +0100 Subject: Add missing EU tax info --- src/components/ui/Subscription.js | 9 +++++++++ src/i18n/locales/en-US.json | 1 + 2 files changed, 10 insertions(+) (limited to 'src/i18n') diff --git a/src/components/ui/Subscription.js b/src/components/ui/Subscription.js index fe0925a26..35a1105d2 100644 --- a/src/components/ui/Subscription.js +++ b/src/components/ui/Subscription.js @@ -93,6 +93,10 @@ const messages = defineMessages({ id: 'subscription.mining.moreInformation', defaultMessage: '!!!Get more information about this plan', }, + euTaxInfo: { + id: 'subscription.euTaxInfo', + defaultMessage: '!!!EU residents: local sales tax may apply', + }, }); @observer @@ -259,6 +263,11 @@ export default class SubscriptionForm extends Component { onClick={() => handlePayment(this.form.$('paymentTier').value)} /> )} + {this.form.$('paymentTier').value !== 'skip' && this.form.$('paymentTier').value !== 'mining' && ( +

+ {intl.formatMessage(messages.euTaxInfo)} +

+ )} ); } diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index fd8ba0fef..56daa9163 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -165,6 +165,7 @@ "subscription.mining.line2": "We will adapt the CPU usage based to your work behaviour to not drain your battery and slow you and your machine down.", "subscription.mining.line3": "As long as the miner is active, you will have unlimited access to all the Franz Premium Supporter Features.", "subscription.mining.moreInformation": "Get more information about this plan.", + "subscription.euTaxInfo": "EU residents: local sales tax may apply", "subscriptionPopup.buttonCancel": "Cancel", "subscriptionPopup.buttonDone": "Done", "tabs.item.reload": "Reload", -- cgit v1.2.3-70-g09d2 From 8736c151b5db7bc39165ace384f174d2fc2ba31f Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Fri, 17 Nov 2017 20:28:16 +0100 Subject: Fix typos Closes #297 --- src/i18n/locales/en-US.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/i18n') diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index ed1f4a722..c2ff295b2 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json @@ -21,8 +21,8 @@ "password.link.signup": "Create a free account", "password.link.login": "Sign in to your account", "signup.headline": "Sign up", - "signup.firstname.label": "Firstname", - "signup.lastname.label": "Lastname", + "signup.firstname.label": "First Name", + "signup.lastname.label": "Last Name", "signup.email.label": "Email address", "signup.company.label": "Company", "signup.password.label": "Password", @@ -149,8 +149,8 @@ "settings.app.form.beta": "Include beta versions", "settings.app.currentVersion": "Current version:", "settings.app.restartRequired": "Changes require restart", - "settings.user.form.firstname": "Firstname", - "settings.user.form.lastname": "Lastname", + "settings.user.form.firstname": "First Name", + "settings.user.form.lastname": "Last Name", "settings.user.form.email": "Email", "settings.user.form.currentPassword": "Current password", "settings.user.form.newPassword": "New password", -- cgit v1.2.3-70-g09d2 From 2cbd938dce5901c2656c9aa128d600fba4ef209c Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Mon, 20 Nov 2017 23:50:22 +0100 Subject: feat(App): Add link to changelog in app update notification --- src/components/layout/AppLayout.js | 8 +++++++- src/components/ui/InfoBar.js | 7 +++++-- src/i18n/locales/en-US.json | 1 + src/styles/info-bar.scss | 4 ++++ 4 files changed, 17 insertions(+), 3 deletions(-) (limited to 'src/i18n') diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index f60c170a8..20dc2f764 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js @@ -23,6 +23,10 @@ const messages = defineMessages({ id: 'infobar.buttonReloadServices', defaultMessage: '!!!Reload services', }, + changelog: { + id: 'infobar.buttonChangelog', + defaultMessage: '!!!Changelog', + }, buttonInstallUpdate: { id: 'infobar.buttonInstallUpdate', defaultMessage: '!!!Restart & install update', @@ -135,7 +139,9 @@ export default class AppLayout extends Component { sticky > - {intl.formatMessage(messages.updateAvailable)} + {intl.formatMessage(messages.updateAvailable)} + {intl.formatMessage(messages.changelog)} + )} {services} diff --git a/src/components/ui/InfoBar.js b/src/components/ui/InfoBar.js index aea2bd888..84a5f1446 100644 --- a/src/components/ui/InfoBar.js +++ b/src/components/ui/InfoBar.js @@ -61,10 +61,13 @@ export default class InfoBar extends Component { [`${className}`]: true, })} > -
+
{children} {ctaLabel && ( -