mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-11-01 08:41:48 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4056 from matrix-org/foldleft/12221-temp-remove

Browse Source 
quick fix for cross-signing reset bug
This commit is contained in:
Zoe 2020-02-11 13:44:02 +00:00 committed by GitHub
commit e54d34090a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/settings/CrossSigningPanel.js
View File

@ -157,13 +157,13 @@ export default class CrossSigningPanel extends React.PureComponent {
{_t("Bootstrap cross-signing and secret storage")} {_t("Bootstrap cross-signing and secret storage")}
</AccessibleButton> </AccessibleButton>
</div>; </div>;
} else { } /*else { // TODO https://github.com/vector-im/riot-web/issues/12221
bootstrapButton = <div className="mx_CrossSigningPanel_buttonRow"> bootstrapButton = <div className="mx_CrossSigningPanel_buttonRow">
<AccessibleButton kind="danger" onClick={this._destroySecureSecretStorage}> <AccessibleButton kind="danger" onClick={this._destroySecureSecretStorage}>
{_t("Reset cross-signing and secret storage")} {_t("Reset cross-signing and secret storage")}
</AccessibleButton> </AccessibleButton>
</div>; </div>;
} }*/
return ( return (
<div> <div>

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

@ -559,7 +559,6 @@
"Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.", "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.": "Your account has a cross-signing identity in secret storage, but it is not yet trusted by this session.",
"Cross-signing and secret storage are not yet set up.": "Cross-signing and secret storage are not yet set up.", "Cross-signing and secret storage are not yet set up.": "Cross-signing and secret storage are not yet set up.",
"Bootstrap cross-signing and secret storage": "Bootstrap cross-signing and secret storage", "Bootstrap cross-signing and secret storage": "Bootstrap cross-signing and secret storage",
"Reset cross-signing and secret storage": "Reset cross-signing and secret storage",
"Cross-signing public keys:": "Cross-signing public keys:", "Cross-signing public keys:": "Cross-signing public keys:",
"in memory": "in memory", "in memory": "in memory",
"not found": "not found", "not found": "not found",