From 7905e6cc3b9933153e5dc73c2d1b9d24c51308a3 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Tue, 26 Nov 2019 14:31:11 -0600 Subject: [PATCH 1/3] Add a link to the labs feature documentation Signed-off-by: Aaron Raimist --- .../views/settings/tabs/user/LabsUserSettingsTab.js | 9 +++++++++ src/i18n/strings/en_EN.json | 1 + 2 files changed, 10 insertions(+) diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js index 07a2bf722a..71a3e5f1d2 100644 --- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js +++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js @@ -49,6 +49,15 @@ export default class LabsUserSettingsTab extends React.Component { return (
{_t("Labs")}
+
+ { + _t('These are experimental features. For more information on what ' + + 'these options do see the documentation.', {}, { + 'a': (sub) => {sub}, + }) + } +
{flags} diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 9136f432dd..9522655698 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -641,6 +641,7 @@ "Access Token:": "Access Token:", "click to reveal": "click to reveal", "Labs": "Labs", + "These are experimental features. For more information on what these options do see the documentation.": "These are experimental features. For more information on what these options do see the documentation.", "Ignored/Blocked": "Ignored/Blocked", "Error adding ignored user/server": "Error adding ignored user/server", "Something went wrong. Please try again or view your console for hints.": "Something went wrong. Please try again or view your console for hints.", From 98c47265c9d7c9f16a27946fee8dab946158fce4 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Tue, 26 Nov 2019 15:00:56 -0600 Subject: [PATCH 2/3] Fix indentation Signed-off-by: Aaron Raimist --- .../views/settings/tabs/user/LabsUserSettingsTab.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js index 71a3e5f1d2..4232cc90fb 100644 --- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js +++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js @@ -53,8 +53,10 @@ export default class LabsUserSettingsTab extends React.Component { { _t('These are experimental features. For more information on what ' + 'these options do see the documentation.', {}, { - 'a': (sub) => {sub}, + 'a': (sub) => { + return {sub}; + }, }) }
From 4c50ac0e56217e6e9dc5fd62fc3d1da98164c778 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Thu, 28 Nov 2019 22:22:38 -0600 Subject: [PATCH 3/3] Improve wording Signed-off-by: Aaron Raimist --- .../views/settings/tabs/user/LabsUserSettingsTab.js | 4 ++-- src/i18n/strings/en_EN.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js index 4232cc90fb..5f7d75c5c3 100644 --- a/src/components/views/settings/tabs/user/LabsUserSettingsTab.js +++ b/src/components/views/settings/tabs/user/LabsUserSettingsTab.js @@ -51,8 +51,8 @@ export default class LabsUserSettingsTab extends React.Component {
{_t("Labs")}
{ - _t('These are experimental features. For more information on what ' + - 'these options do see the documentation.', {}, { + _t('Customise your experience with experimental labs features. ' + + 'Learn more.', {}, { 'a': (sub) => { return {sub}; diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 9522655698..c9bc2d6f4b 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -641,7 +641,7 @@ "Access Token:": "Access Token:", "click to reveal": "click to reveal", "Labs": "Labs", - "These are experimental features. For more information on what these options do see the documentation.": "These are experimental features. For more information on what these options do see the documentation.", + "Customise your experience with experimental labs features. Learn more.": "Customise your experience with experimental labs features. Learn more.", "Ignored/Blocked": "Ignored/Blocked", "Error adding ignored user/server": "Error adding ignored user/server", "Something went wrong. Please try again or view your console for hints.": "Something went wrong. Please try again or view your console for hints.",