OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Clean up setting definition to follow surrounding practices 

It's not perfect, but we're at least okay with it.
pull/21833/head
Travis Ralston 2020-04-16 11:12:47 -06:00
parent 2d395d8dd1
commit b5b4bdbf3d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/i18n/strings/en_EN.json
View File

@ -399,7 +399,7 @@
"Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)", "Try out new ways to ignore people (experimental)": "Try out new ways to ignore people (experimental)",
"Show a presence dot next to DMs in the room list": "Show a presence dot next to DMs in the room list", "Show a presence dot next to DMs in the room list": "Show a presence dot next to DMs in the room list",
"Support adding custom themes": "Support adding custom themes", "Support adding custom themes": "Support adding custom themes",
"Enable cross-signing to verify per-user instead of per-session (in development)": "Enable cross-signing to verify per-user instead of per-session (in development)", "Enable cross-signing to verify per-user instead of per-session": "Enable cross-signing to verify per-user instead of per-session",
"Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)", "Enable local event indexing and E2EE search (requires restart)": "Enable local event indexing and E2EE search (requires restart)",
"Show info about bridges in room settings": "Show info about bridges in room settings", "Show info about bridges in room settings": "Show info about bridges in room settings",
"Show padlocks on invite only rooms": "Show padlocks on invite only rooms", "Show padlocks on invite only rooms": "Show padlocks on invite only rooms",

7
src/settings/Settings.js
View File

@ -152,9 +152,10 @@ export const SETTINGS = {
default: null, default: null,
}, },
"feature_cross_signing": { "feature_cross_signing": {
//isFeature: true, // XXX: We shouldn't be using the feature prefix for non-feature settings. There is an exception
displayName: _td("Enable cross-signing to verify per-user instead of per-session (in development)"), // for this case though as we're converting a feature to a setting for a temporary safety net.
supportedLevels: LEVELS_FEATURE, displayName: _td("Enable cross-signing to verify per-user instead of per-session"),
supportedLevels: ['device', 'config'], // we shouldn't use LEVELS_FEATURE for non-features, so copy it here.
default: true, default: true,
}, },
"feature_event_indexing": { "feature_event_indexing": {