aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2018-12-09 22:42:18 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2018-12-09 22:42:18 +0100
commit2b538a541654e60120847210d031ee74cd86fde8 (patch)
tree4cf658a300bcb862f7599ce3ac98865fa870b8a2 /src
parentUpdate mobx (diff)
downloadferdium-app-2b538a541654e60120847210d031ee74cd86fde8.tar.gz
ferdium-app-2b538a541654e60120847210d031ee74cd86fde8.tar.zst
ferdium-app-2b538a541654e60120847210d031ee74cd86fde8.zip
Add proxy restart notice
Diffstat (limited to 'src')
-rw-r--r--src/components/settings/services/EditServiceForm.js8
-rw-r--r--src/i18n/locales/en-US.json1
2 files changed, 9 insertions, 0 deletions
diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js
index 31ada4b22..0078c040b 100644
--- a/src/components/settings/services/EditServiceForm.js
+++ b/src/components/settings/services/EditServiceForm.js
@@ -99,6 +99,10 @@ const messages = defineMessages({
99 id: 'settings.service.form.proxy.headline', 99 id: 'settings.service.form.proxy.headline',
100 defaultMessage: '!!!HTTP/HTTPS Proxy Settings', 100 defaultMessage: '!!!HTTP/HTTPS Proxy Settings',
101 }, 101 },
102 proxyRestartInfo: {
103 id: 'settings.service.form.proxy.restartInfo',
104 defaultMessage: '!!!Please restart Franz after changing proxy Settings.',
105 },
102 proxyInfo: { 106 proxyInfo: {
103 id: 'settings.service.form.proxy.info', 107 id: 'settings.service.form.proxy.info',
104 defaultMessage: '!!!Proxy settings will not be synchronized with the Franz servers.', 108 defaultMessage: '!!!Proxy settings will not be synchronized with the Franz servers.',
@@ -364,6 +368,10 @@ export default @observer class EditServiceForm extends Component {
364 /> 368 />
365 <p> 369 <p>
366 <span className="mdi mdi-information" /> 370 <span className="mdi mdi-information" />
371 {intl.formatMessage(messages.proxyRestartInfo)}
372 </p>
373 <p>
374 <span className="mdi mdi-information" />
367 {intl.formatMessage(messages.proxyInfo)} 375 {intl.formatMessage(messages.proxyInfo)}
368 </p> 376 </p>
369 </Fragment> 377 </Fragment>
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 67885661c..99df6a0ca 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -140,6 +140,7 @@
140 "settings.service.form.proxy.user": "User (optional)", 140 "settings.service.form.proxy.user": "User (optional)",
141 "settings.service.form.proxy.password": "Password (optional)", 141 "settings.service.form.proxy.password": "Password (optional)",
142 "settings.service.form.proxy.info": "Proxy settings will not synced with the Franz servers.", 142 "settings.service.form.proxy.info": "Proxy settings will not synced with the Franz servers.",
143 "settings.service.form.proxy.restartInfo": "Please restart Franz after changing proxy Settings.",
143 "settings.service.form.spellcheckerLanguage": "Spell checking Language", 144 "settings.service.form.spellcheckerLanguage": "Spell checking Language",
144 "settings.service.form.spellcheckerLanguage.default": "Use System Default ({default})", 145 "settings.service.form.spellcheckerLanguage.default": "Use System Default ({default})",
145 "settings.service.error.headline": "Error", 146 "settings.service.error.headline": "Error",