diff options
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/auth/Locked.js | 7 | ||||
-rw-r--r-- | src/components/settings/settings/EditSettingsForm.js | 44 |
2 files changed, 17 insertions, 34 deletions
diff --git a/src/components/auth/Locked.js b/src/components/auth/Locked.js index 2ed429199..ac1bc4e8c 100644 --- a/src/components/auth/Locked.js +++ b/src/components/auth/Locked.js | |||
@@ -7,7 +7,6 @@ import { defineMessages, injectIntl } from 'react-intl'; | |||
7 | import Form from '../../lib/Form'; | 7 | import Form from '../../lib/Form'; |
8 | import Input from '../ui/Input'; | 8 | import Input from '../ui/Input'; |
9 | import Button from '../ui/Button'; | 9 | import Button from '../ui/Button'; |
10 | import Infobox from '../ui/Infobox'; | ||
11 | import { isMac } from '../../environment'; | 10 | import { isMac } from '../../environment'; |
12 | 11 | ||
13 | import { globalError as globalErrorPropType } from '../../prop-types'; | 12 | import { globalError as globalErrorPropType } from '../../prop-types'; |
@@ -17,11 +16,6 @@ const messages = defineMessages({ | |||
17 | id: 'locked.headline', | 16 | id: 'locked.headline', |
18 | defaultMessage: 'Locked', | 17 | defaultMessage: 'Locked', |
19 | }, | 18 | }, |
20 | info: { | ||
21 | id: 'locked.info', | ||
22 | defaultMessage: | ||
23 | 'Ferdi is currently locked. Please unlock Ferdi with your password to see your messages.', | ||
24 | }, | ||
25 | touchId: { | 19 | touchId: { |
26 | id: 'locked.touchId', | 20 | id: 'locked.touchId', |
27 | defaultMessage: 'Unlock with Touch ID', | 21 | defaultMessage: 'Unlock with Touch ID', |
@@ -107,7 +101,6 @@ class Locked extends Component { | |||
107 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> | 101 | <form className="franz-form auth__form" onSubmit={e => this.submit(e)}> |
108 | <img src="./assets/images/logo.svg" className="auth__logo" alt="" /> | 102 | <img src="./assets/images/logo.svg" className="auth__logo" alt="" /> |
109 | <h1>{intl.formatMessage(messages.headline)}</h1> | 103 | <h1>{intl.formatMessage(messages.headline)}</h1> |
110 | <Infobox type="warning">{intl.formatMessage(messages.info)}</Infobox> | ||
111 | 104 | ||
112 | {touchIdEnabled && ( | 105 | {touchIdEnabled && ( |
113 | <> | 106 | <> |
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index d9df9c41c..1757ac297 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js | |||
@@ -5,7 +5,7 @@ import { observer } from 'mobx-react'; | |||
5 | import prettyBytes from 'pretty-bytes'; | 5 | import prettyBytes from 'pretty-bytes'; |
6 | import { defineMessages, injectIntl } from 'react-intl'; | 6 | import { defineMessages, injectIntl } from 'react-intl'; |
7 | 7 | ||
8 | import { mdiGithub, mdiInformation, mdiOpenInNew } from '@mdi/js'; | 8 | import { mdiGithub, mdiOpenInNew } from '@mdi/js'; |
9 | import Form from '../../../lib/Form'; | 9 | import Form from '../../../lib/Form'; |
10 | import Button from '../../ui/Button'; | 10 | import Button from '../../ui/Button'; |
11 | import Toggle from '../../ui/Toggle'; | 11 | import Toggle from '../../ui/Toggle'; |
@@ -175,11 +175,6 @@ const messages = defineMessages({ | |||
175 | id: 'settings.app.restartRequired', | 175 | id: 'settings.app.restartRequired', |
176 | defaultMessage: 'Changes require restart', | 176 | defaultMessage: 'Changes require restart', |
177 | }, | 177 | }, |
178 | languageDisclaimer: { | ||
179 | id: 'settings.app.languageDisclaimer', | ||
180 | defaultMessage: | ||
181 | 'Official translations are English & German. All other languages are community based translations.', | ||
182 | }, | ||
183 | numberOfColumns: { | 178 | numberOfColumns: { |
184 | id: 'settings.app.form.splitColumns', | 179 | id: 'settings.app.form.splitColumns', |
185 | defaultMessage: 'Number of columns', | 180 | defaultMessage: 'Number of columns', |
@@ -815,27 +810,22 @@ class EditSettingsForm extends Component { | |||
815 | )} | 810 | )} |
816 | <p className="settings__message"> | 811 | <p className="settings__message"> |
817 | <Icon icon={mdiGithub} /> | 812 | <Icon icon={mdiGithub} /> |
818 | <span> | 813 | Ferdi is based on{' '} |
819 | Ferdi is based on{' '} | 814 | <a |
820 | <a | 815 | href={`${GITHUB_FRANZ_URL}/franz`} |
821 | href={`${GITHUB_FRANZ_URL}/franz`} | 816 | target="_blank" |
822 | target="_blank" | 817 | rel="noreferrer" |
823 | rel="noreferrer" | 818 | > |
824 | > | 819 | Franz |
825 | Franz | 820 | </a> |
826 | </a> | 821 | , a project published under the{' '} |
827 | , a project published under the{' '} | 822 | <a |
828 | <a | 823 | href={`${GITHUB_FRANZ_URL}/franz/blob/master/LICENSE`} |
829 | href={`${GITHUB_FRANZ_URL}/franz/blob/master/LICENSE`} | 824 | target="_blank" |
830 | target="_blank" | 825 | rel="noreferrer" |
831 | rel="noreferrer" | 826 | > |
832 | > | 827 | Apache-2.0 License |
833 | Apache-2.0 License | 828 | </a> |
834 | </a> | ||
835 | </span> | ||
836 | <br /> | ||
837 | <Icon icon={mdiInformation} /> | ||
838 | {intl.formatMessage(messages.languageDisclaimer)} | ||
839 | </p> | 829 | </p> |
840 | </div> | 830 | </div> |
841 | )} | 831 | )} |