aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2017-11-21 11:46:27 +0100
committerLibravatar Stefan Malzner <stefan@adlk.io>2017-11-21 11:46:27 +0100
commite4e8958a886a86465592061562bb24031fa7cf37 (patch)
tree4801ba73ff8438f6d6aeff4d7178496f2d90900e /src
parentMerge branch 'develop' into feature/add-service-request (diff)
parentMerge pull request #313 from meetfranz/feature/translation-help (diff)
downloadferdium-app-e4e8958a886a86465592061562bb24031fa7cf37.tar.gz
ferdium-app-e4e8958a886a86465592061562bb24031fa7cf37.tar.zst
ferdium-app-e4e8958a886a86465592061562bb24031fa7cf37.zip
Merge branch 'develop' into feature/add-service-request
Diffstat (limited to 'src')
-rw-r--r--src/components/settings/settings/EditSettingsForm.js11
-rw-r--r--src/i18n/locales/en-US.json1
2 files changed, 12 insertions, 0 deletions
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 601d57c81..941f2149e 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -34,6 +34,10 @@ const messages = defineMessages({
34 id: 'settings.app.headlineAdvanced', 34 id: 'settings.app.headlineAdvanced',
35 defaultMessage: '!!!Advanced', 35 defaultMessage: '!!!Advanced',
36 }, 36 },
37 translationHelp: {
38 id: 'settings.app.translationHelp',
39 defaultMessage: '!!!Help us to translate Franz into your language.',
40 },
37 buttonSearchForUpdate: { 41 buttonSearchForUpdate: {
38 id: 'settings.app.buttonSearchForUpdate', 42 id: 'settings.app.buttonSearchForUpdate',
39 defaultMessage: '!!!Check for updates', 43 defaultMessage: '!!!Check for updates',
@@ -140,6 +144,13 @@ export default class EditSettingsForm extends Component {
140 {/* Language */} 144 {/* Language */}
141 <h2 id="language">{intl.formatMessage(messages.headlineLanguage)}</h2> 145 <h2 id="language">{intl.formatMessage(messages.headlineLanguage)}</h2>
142 <Select field={form.$('locale')} showLabel={false} /> 146 <Select field={form.$('locale')} showLabel={false} />
147 <a
148 href="http://i18n.meetfranz.com"
149 target="_blank"
150 className="link"
151 >
152 {intl.formatMessage(messages.translationHelp)} <i className="mdi mdi-open-in-new" />
153 </a>
143 154
144 {/* Advanced */} 155 {/* Advanced */}
145 <h2 id="advanced">{intl.formatMessage(messages.headlineAdvanced)}</h2> 156 <h2 id="advanced">{intl.formatMessage(messages.headlineAdvanced)}</h2>
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 67ea2034a..b062d5548 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -148,6 +148,7 @@
148 "settings.app.form.enableSpellchecking": "Enable spell checking", 148 "settings.app.form.enableSpellchecking": "Enable spell checking",
149 "settings.app.form.showDisabledServices": "Display disabled services tabs", 149 "settings.app.form.showDisabledServices": "Display disabled services tabs",
150 "settings.app.form.beta": "Include beta versions", 150 "settings.app.form.beta": "Include beta versions",
151 "settings.app.translationHelp": "Help us to translate Franz into your language.",
151 "settings.app.currentVersion": "Current version:", 152 "settings.app.currentVersion": "Current version:",
152 "settings.app.restartRequired": "Changes require restart", 153 "settings.app.restartRequired": "Changes require restart",
153 "settings.user.form.firstname": "First Name", 154 "settings.user.form.firstname": "First Name",