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

fixup: more i18n

pull/21833/head
Bruno Windels 2020-04-02 12:54:14 +02:00
parent a4f448d4ca
commit ccf6c9efdc
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
res/css/views/right_panel/_VerificationPanel.scss
View File

@ -30,11 +30,15 @@ limitations under the License.
right: 14px; right: 14px;
} }
.mx_VerificationPanel_verified_section .mx_E2EIcon { .mx_VerificationPanel_verified_section,
// Override general user info margin .mx_VerificationPanel_reciprocate_section {
margin: 0 auto !important; .mx_E2EIcon {
// Override general user info margin
margin: 20px auto !important;
}
} }
.mx_VerificationPanel_qrCode { .mx_VerificationPanel_qrCode {
padding: 4px 4px 0 4px; padding: 4px 4px 0 4px;
background: white; background: white;
@ -51,6 +55,16 @@ limitations under the License.
max-width: 240px; max-width: 240px;
} }
} }
.mx_VerificationPanel_reciprocate_section {
.mx_FormButton {
width: 100%;
box-sizing: border-box;
padding: 10px;
display: block;
margin: 10px 0;
}
}
} }
// Special case styling for EncryptionPanel in a Modal dialog // Special case styling for EncryptionPanel in a Modal dialog

6
src/components/views/right_panel/VerificationPanel.js
View File

@ -156,13 +156,13 @@ export default class VerificationPanel extends React.PureComponent {
displayName: member.displayName || member.name || member.userId, displayName: member.displayName || member.name || member.userId,
})}</p> })}</p>
<E2EIcon isUser={true} status="verified" size={128} hideTooltip={true} /> <E2EIcon isUser={true} status="verified" size={128} hideTooltip={true} />
<p><FormButton label={_t("No")} kind="danger" onClick={this.state.reciprocateQREvent.cancel} /></p> <FormButton label={_t("No")} kind="danger" onClick={this.state.reciprocateQREvent.cancel} />
<p><FormButton label={_t("Yes")} onClick={this.state.reciprocateQREvent.confirm} /></p> <FormButton label={_t("Yes")} onClick={this.state.reciprocateQREvent.confirm} />
</React.Fragment>; </React.Fragment>;
} else { } else {
body = <p><Spinner/></p>; body = <p><Spinner/></p>;
} }
return <div className="mx_UserInfo_container mx_VerificationPanel_verified_section"> return <div className="mx_UserInfo_container mx_VerificationPanel_reciprocate_section">
<h3>{_t("Verify by scanning")}</h3> <h3>{_t("Verify by scanning")}</h3>
{ body } { body }
</div>; </div>;

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

@ -1252,7 +1252,7 @@
"If you can't scan the code above, verify by comparing unique emoji.": "If you can't scan the code above, verify by comparing unique emoji.", "If you can't scan the code above, verify by comparing unique emoji.": "If you can't scan the code above, verify by comparing unique emoji.",
"Verify by comparing unique emoji.": "Verify by comparing unique emoji.", "Verify by comparing unique emoji.": "Verify by comparing unique emoji.",
"Verify by emoji": "Verify by emoji", "Verify by emoji": "Verify by emoji",
"Almost there! Is %(displayName)s show the same shield?": "Almost there! Is %(displayName)s show the same shield?", "Almost there! Is %(displayName)s showing the same shield?": "Almost there! Is %(displayName)s showing the same shield?",
"No": "No", "No": "No",
"Yes": "Yes", "Yes": "Yes",
"Verify all users in a room to ensure it's secure.": "Verify all users in a room to ensure it's secure.", "Verify all users in a room to ensure it's secure.": "Verify all users in a room to ensure it's secure.",