From 8745cd1b8250c370b1681f0728116150c72a4279 Mon Sep 17 00:00:00 2001
From: Dominik Guzei
Date: Tue, 5 Mar 2019 16:31:48 +0100
Subject: setup react-intl translations managing script
---
src/components/subscription/SubscriptionForm.js | 60 ++++++++++++-------------
src/containers/settings/EditUserScreen.js | 44 +++++++++---------
src/features/shareFranz/Component.js | 52 ++++++++++-----------
3 files changed, 74 insertions(+), 82 deletions(-)
(limited to 'src')
diff --git a/src/components/subscription/SubscriptionForm.js b/src/components/subscription/SubscriptionForm.js
index 90da8ddc3..7a818d100 100644
--- a/src/components/subscription/SubscriptionForm.js
+++ b/src/components/subscription/SubscriptionForm.js
@@ -35,31 +35,29 @@ const messages = defineMessages({
id: 'subscription.includedFeatures',
defaultMessage: '!!!The Franz Premium Supporter Account includes',
},
- features: {
- onpremise: {
- id: 'subscription.features.onpremise.mattermost',
- defaultMessage: '!!!Add on-premise/hosted services like Mattermost',
- },
- noInterruptions: {
- id: 'subscription.features.noInterruptions',
- defaultMessage: '!!!No app delays & nagging to upgrade license',
- },
- proxy: {
- id: 'subscription.features.proxy',
- defaultMessage: '!!!Proxy support for services',
- },
- spellchecker: {
- id: 'subscription.features.spellchecker',
- defaultMessage: '!!!Support for Spellchecker',
- },
- ads: {
- id: 'subscription.features.ads',
- defaultMessage: '!!!No ads, ever!',
- },
- comingSoon: {
- id: 'subscription.features.comingSoon',
- defaultMessage: '!!!coming soon',
- },
+ onpremise: {
+ id: 'subscription.features.onpremise.mattermost',
+ defaultMessage: '!!!Add on-premise/hosted services like Mattermost',
+ },
+ noInterruptions: {
+ id: 'subscription.features.noInterruptions',
+ defaultMessage: '!!!No app delays & nagging to upgrade license',
+ },
+ proxy: {
+ id: 'subscription.features.proxy',
+ defaultMessage: '!!!Proxy support for services',
+ },
+ spellchecker: {
+ id: 'subscription.features.spellchecker',
+ defaultMessage: '!!!Support for Spellchecker',
+ },
+ ads: {
+ id: 'subscription.features.ads',
+ defaultMessage: '!!!No ads, ever!',
+ },
+ comingSoon: {
+ id: 'subscription.features.comingSoon',
+ defaultMessage: '!!!coming soon',
},
euTaxInfo: {
id: 'subscription.euTaxInfo',
@@ -85,7 +83,7 @@ export default @observer class SubscriptionForm extends Component {
showSkipOption: false,
skipAction: () => null,
skipButtonLabel: '',
- }
+ };
static contextTypes = {
intl: intlShape,
@@ -162,18 +160,18 @@ export default @observer class SubscriptionForm extends Component {
- - {intl.formatMessage(messages.features.onpremise)}
+ - {intl.formatMessage(messages.onpremise)}
-
- {intl.formatMessage(messages.features.noInterruptions)}
+ {intl.formatMessage(messages.noInterruptions)}
-
- {intl.formatMessage(messages.features.spellchecker)}
+ {intl.formatMessage(messages.spellchecker)}
-
- {intl.formatMessage(messages.features.proxy)}
+ {intl.formatMessage(messages.proxy)}
-
- {intl.formatMessage(messages.features.ads)}
+ {intl.formatMessage(messages.ads)}
diff --git a/src/containers/settings/EditUserScreen.js b/src/containers/settings/EditUserScreen.js
index bade928a0..81f689400 100644
--- a/src/containers/settings/EditUserScreen.js
+++ b/src/containers/settings/EditUserScreen.js
@@ -23,23 +23,21 @@ const messages = defineMessages({
id: 'settings.user.form.email',
defaultMessage: '!!!Email',
},
- accountType: {
- label: {
- id: 'settings.user.form.accountType.label',
- defaultMessage: '!!!Account type',
- },
- individual: {
- id: 'settings.user.form.accountType.individual',
- defaultMessage: '!!!Individual',
- },
- nonProfit: {
- id: 'settings.user.form.accountType.non-profit',
- defaultMessage: '!!!Non-Profit',
- },
- company: {
- id: 'settings.user.form.accountType.company',
- defaultMessage: '!!!Company',
- },
+ accountTypeLabel: {
+ id: 'settings.user.form.accountType.label',
+ defaultMessage: '!!!Account type',
+ },
+ accountTypeIndividual: {
+ id: 'settings.user.form.accountType.individual',
+ defaultMessage: '!!!Individual',
+ },
+ accountTypeNonProfit: {
+ id: 'settings.user.form.accountType.non-profit',
+ defaultMessage: '!!!Non-Profit',
+ },
+ accountTypeCompany: {
+ id: 'settings.user.form.accountType.company',
+ defaultMessage: '!!!Company',
},
currentPassword: {
id: 'settings.user.form.currentPassword',
@@ -94,21 +92,21 @@ export default @inject('stores', 'actions') @observer class EditUserScreen exten
accountType: {
value: user.accountType,
validators: [required],
- label: intl.formatMessage(messages.accountType.label),
+ label: intl.formatMessage(messages.accountTypeLabel),
options: [{
value: 'individual',
- label: intl.formatMessage(messages.accountType.individual),
+ label: intl.formatMessage(messages.accountTypeIndividual),
}, {
value: 'non-profit',
- label: intl.formatMessage(messages.accountType.nonProfit),
+ label: intl.formatMessage(messages.accountTypeNonProfit),
}, {
value: 'company',
- label: intl.formatMessage(messages.accountType.company),
+ label: intl.formatMessage(messages.accountTypeCompany),
}],
},
organization: {
- label: intl.formatMessage(messages.accountType.company),
- placeholder: intl.formatMessage(messages.accountType.company),
+ label: intl.formatMessage(messages.accountTypeCompany),
+ placeholder: intl.formatMessage(messages.accountTypeCompany),
value: user.organization,
},
oldPassword: {
diff --git a/src/features/shareFranz/Component.js b/src/features/shareFranz/Component.js
index d463664df..ef43a54fa 100644
--- a/src/features/shareFranz/Component.js
+++ b/src/features/shareFranz/Component.js
@@ -20,29 +20,25 @@ const messages = defineMessages({
id: 'feature.shareFranz.text',
defaultMessage: '!!!Tell your friends and colleagues how awesome Franz is and help us to spread the word.',
},
- actions: {
- email: {
- id: 'feature.shareFranz.action.email',
- defaultMessage: '!!!Share as email',
- },
- facebook: {
- id: 'feature.shareFranz.action.facebook',
- defaultMessage: '!!!Share on Facebook',
- },
- twitter: {
- id: 'feature.shareFranz.action.twitter',
- defaultMessage: '!!!Share on Twitter',
- },
+ actionsEmail: {
+ id: 'feature.shareFranz.action.email',
+ defaultMessage: '!!!Share as email',
},
- shareText: {
- email: {
- id: 'feature.shareFranz.shareText.email',
- defaultMessage: '!!! I\'ve added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com',
- },
- twitter: {
- id: 'feature.shareFranz.shareText.twitter',
- defaultMessage: '!!! I\'ve added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @MeetFranz',
- },
+ actionsFacebook: {
+ id: 'feature.shareFranz.action.facebook',
+ defaultMessage: '!!!Share on Facebook',
+ },
+ actionsTwitter: {
+ id: 'feature.shareFranz.action.twitter',
+ defaultMessage: '!!!Share on Twitter',
+ },
+ shareTextEmail: {
+ id: 'feature.shareFranz.shareText.email',
+ defaultMessage: '!!! I\'ve added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com',
+ },
+ shareTextTwitter: {
+ id: 'feature.shareFranz.shareText.twitter',
+ defaultMessage: '!!! I\'ve added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com /cc @MeetFranz',
},
});
@@ -90,7 +86,7 @@ const styles = theme => ({
export default @injectSheet(styles) @inject('stores') @observer class ShareFranzModal extends Component {
static propTypes = {
classes: PropTypes.object.isRequired,
- }
+ };
static contextTypes = {
intl: intlShape,
@@ -128,17 +124,17 @@ export default @injectSheet(styles) @inject('stores') @observer class ShareFranz
{intl.formatMessage(messages.text)}