diff options
author | 2019-10-18 21:08:24 +0200 | |
---|---|---|
committer | 2019-10-18 21:08:24 +0200 | |
commit | 964fdfbc1c937b9e190212c0762d2b1b93e2a38a (patch) | |
tree | d3cdd0572f514c4c8406270b27423b2eb8a4bef2 /src | |
parent | Add info about teams only being availible on Franz servers (diff) | |
download | ferdium-app-964fdfbc1c937b9e190212c0762d2b1b93e2a38a.tar.gz ferdium-app-964fdfbc1c937b9e190212c0762d2b1b93e2a38a.tar.zst ferdium-app-964fdfbc1c937b9e190212c0762d2b1b93e2a38a.zip |
Fix lint
Diffstat (limited to 'src')
-rw-r--r-- | src/containers/settings/EditSettingsScreen.js | 3 | ||||
-rw-r--r-- | src/containers/settings/TeamScreen.js | 2 | ||||
-rw-r--r-- | src/i18n/apply-branding.js | 1 | ||||
-rw-r--r-- | src/i18n/locales/defaultMessages.json | 26 | ||||
-rw-r--r-- | src/i18n/locales/en-US.json | 2 |
5 files changed, 32 insertions, 2 deletions
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js index 3898d2b99..ddee82e45 100644 --- a/src/containers/settings/EditSettingsScreen.js +++ b/src/containers/settings/EditSettingsScreen.js | |||
@@ -414,7 +414,6 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
414 | cacheSize, | 414 | cacheSize, |
415 | updateStatusTypes, | 415 | updateStatusTypes, |
416 | isClearingAllCache, | 416 | isClearingAllCache, |
417 | server, | ||
418 | lockingFeatureEnabled, | 417 | lockingFeatureEnabled, |
419 | } = app; | 418 | } = app; |
420 | const { | 419 | const { |
@@ -441,7 +440,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e | |||
441 | isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan} | 440 | isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan} |
442 | isTodosEnabled={todos.isFeatureActive} | 441 | isTodosEnabled={todos.isFeatureActive} |
443 | isWorkspaceEnabled={workspaces.isFeatureActive} | 442 | isWorkspaceEnabled={workspaces.isFeatureActive} |
444 | server={server || 'https://api.franzinfra.com'} | 443 | server={this.props.stores.settings.app.server} |
445 | lockingFeatureEnabled={lockingFeatureEnabled} | 444 | lockingFeatureEnabled={lockingFeatureEnabled} |
446 | noUpdates={this.props.stores.settings.app.noUpdates} | 445 | noUpdates={this.props.stores.settings.app.noUpdates} |
447 | hibernationEnabled={this.props.stores.settings.app.hibernate} | 446 | hibernationEnabled={this.props.stores.settings.app.hibernate} |
diff --git a/src/containers/settings/TeamScreen.js b/src/containers/settings/TeamScreen.js index 1172125fe..d0196923a 100644 --- a/src/containers/settings/TeamScreen.js +++ b/src/containers/settings/TeamScreen.js | |||
@@ -4,6 +4,7 @@ import { inject, observer } from 'mobx-react'; | |||
4 | 4 | ||
5 | import UserStore from '../../stores/UserStore'; | 5 | import UserStore from '../../stores/UserStore'; |
6 | import AppStore from '../../stores/AppStore'; | 6 | import AppStore from '../../stores/AppStore'; |
7 | import SettingsStore from '../../stores/SettingsStore'; | ||
7 | 8 | ||
8 | import TeamDashboard from '../../components/settings/team/TeamDashboard'; | 9 | import TeamDashboard from '../../components/settings/team/TeamDashboard'; |
9 | import ErrorBoundary from '../../components/util/ErrorBoundary'; | 10 | import ErrorBoundary from '../../components/util/ErrorBoundary'; |
@@ -43,6 +44,7 @@ TeamScreen.wrappedComponent.propTypes = { | |||
43 | stores: PropTypes.shape({ | 44 | stores: PropTypes.shape({ |
44 | user: PropTypes.instanceOf(UserStore).isRequired, | 45 | user: PropTypes.instanceOf(UserStore).isRequired, |
45 | app: PropTypes.instanceOf(AppStore).isRequired, | 46 | app: PropTypes.instanceOf(AppStore).isRequired, |
47 | settings: PropTypes.instanceOf(SettingsStore).isRequired, | ||
46 | }).isRequired, | 48 | }).isRequired, |
47 | actions: PropTypes.shape({ | 49 | actions: PropTypes.shape({ |
48 | payment: PropTypes.shape({ | 50 | payment: PropTypes.shape({ |
diff --git a/src/i18n/apply-branding.js b/src/i18n/apply-branding.js index 521186d08..1494ce923 100644 --- a/src/i18n/apply-branding.js +++ b/src/i18n/apply-branding.js | |||
@@ -12,6 +12,7 @@ const ignore = [ | |||
12 | 'login.customServerQuestion', | 12 | 'login.customServerQuestion', |
13 | 'settings.app.todoServerInfo', | 13 | 'settings.app.todoServerInfo', |
14 | 'settings.app.serverMoneyInfo', | 14 | 'settings.app.serverMoneyInfo', |
15 | 'settings.team.teamsUnavailibleInfo', | ||
15 | ]; | 16 | ]; |
16 | 17 | ||
17 | // Files to ignore when applying branding | 18 | // Files to ignore when applying branding |
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json index 66b41ac21..c9f5ac50c 100644 --- a/src/i18n/locales/defaultMessages.json +++ b/src/i18n/locales/defaultMessages.json | |||
@@ -3081,6 +3081,32 @@ | |||
3081 | "column": 17, | 3081 | "column": 17, |
3082 | "line": 37 | 3082 | "line": 37 |
3083 | } | 3083 | } |
3084 | }, | ||
3085 | { | ||
3086 | "defaultMessage": "!!!Teams are unavailible", | ||
3087 | "end": { | ||
3088 | "column": 3, | ||
3089 | "line": 44 | ||
3090 | }, | ||
3091 | "file": "src/components/settings/team/TeamDashboard.js", | ||
3092 | "id": "settings.team.teamsUnavailible", | ||
3093 | "start": { | ||
3094 | "column": 20, | ||
3095 | "line": 41 | ||
3096 | } | ||
3097 | }, | ||
3098 | { | ||
3099 | "defaultMessage": "!!!Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.", | ||
3100 | "end": { | ||
3101 | "column": 3, | ||
3102 | "line": 48 | ||
3103 | }, | ||
3104 | "file": "src/components/settings/team/TeamDashboard.js", | ||
3105 | "id": "settings.team.teamsUnavailibleInfo", | ||
3106 | "start": { | ||
3107 | "column": 24, | ||
3108 | "line": 45 | ||
3109 | } | ||
3084 | } | 3110 | } |
3085 | ], | 3111 | ], |
3086 | "path": "src/components/settings/team/TeamDashboard.json" | 3112 | "path": "src/components/settings/team/TeamDashboard.json" |
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json index 6f28e2bfc..10f0b7c6f 100644 --- a/src/i18n/locales/en-US.json +++ b/src/i18n/locales/en-US.json | |||
@@ -356,6 +356,8 @@ | |||
356 | "settings.team.headline": "Team", | 356 | "settings.team.headline": "Team", |
357 | "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.", | 357 | "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.", |
358 | "settings.team.manageAction": "Manage your Team on getferdi.com", | 358 | "settings.team.manageAction": "Manage your Team on getferdi.com", |
359 | "settings.team.teamsUnavailible": "Teams are unavailible", | ||
360 | "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.", | ||
359 | "settings.team.upgradeAction": "Upgrade your Account", | 361 | "settings.team.upgradeAction": "Upgrade your Account", |
360 | "settings.user.form.accountType.company": "Company", | 362 | "settings.user.form.accountType.company": "Company", |
361 | "settings.user.form.accountType.individual": "Individual", | 363 | "settings.user.form.accountType.individual": "Individual", |