imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace device with session in UI text

Browse source 
This replaces "device" with "session" throughout user-visible text at the React
layer. Variable names and comments are left as-is for now.
This commit is contained in:
J. Ryan Stinnett 2020-01-29 15:48:25 +00:00
parent 725ec1dda6
commit 81ee27f41e
40 changed files with 214 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/settings/ChangePassword.js
View file

@ -113,7 +113,7 @@ export default createReactClass({
description:
<div>
{ _t(
'Changing password will currently reset any end-to-end encryption keys on all devices, ' +
'Changing password will currently reset any end-to-end encryption keys on all sessions, ' +
'making encrypted chat history unreadable, unless you first export your room keys ' +
'and re-import them afterwards. ' +
'In future this will be improved.',

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

@ -127,7 +127,7 @@ export default class CrossSigningPanel extends React.PureComponent {
} else if (crossSigningPrivateKeysInStorage) {
summarisedStatus = <p>{_t(
"Your account has a cross-signing identity in secret storage, but it " +
"is not yet trusted by this device.",
"is not yet trusted by this session.",
)}</p>;
} else {
summarisedStatus = <p>{_t(
@ -152,7 +152,7 @@ export default class CrossSigningPanel extends React.PureComponent {
<table className="mx_CrossSigningPanel_statusList"><tbody>
<tr>
<td>{_t("Cross-signing public keys:")}</td>
<td>{crossSigningPublicKeysOnDevice ? _t("on device") : _t("not found")}</td>
<td>{crossSigningPublicKeysOnDevice ? _t("in memory") : _t("not found")}</td>
</tr>
<tr>
<td>{_t("Cross-signing private keys:")}</td>

10
src/components/views/settings/DevicesPanel.js
View file

@ -62,10 +62,10 @@ export default class DevicesPanel extends React.Component {
let errtxt;
if (error.httpStatus == 404) {
// 404 probably means the HS doesn't yet support the API.
errtxt = _t("Your homeserver does not support device management.");
errtxt = _t("Your homeserver does not support session management.");
} else {
console.error("Error loading devices:", error);
errtxt = _t("Unable to load device list");
console.error("Error loading sessions:", error);
errtxt = _t("Unable to load session list");
}
this.setState({deviceLoadError: errtxt});
},
@ -130,7 +130,7 @@ export default class DevicesPanel extends React.Component {
makeRequest: this._makeDeleteRequest.bind(this),
});
}).catch((e) => {
console.error("Error deleting devices", e);
console.error("Error deleting sessions", e);
if (this._unmounted) { return; }
}).finally(() => {
this.setState({
@ -188,7 +188,7 @@ export default class DevicesPanel extends React.Component {
const deleteButton = this.state.deleting ?
<Spinner w={22} h={22} /> :
<AccessibleButton onClick={this._onDeleteClick} kind="danger_sm">
{ _t("Delete %(count)s devices", {count: this.state.selectedDevices.length}) }
{ _t("Delete %(count)s sessions", {count: this.state.selectedDevices.length}) }
</AccessibleButton>;
const classes = classNames(this.props.className, "mx_DevicesPanel");

2
src/components/views/settings/DevicesPanelEntry.js
View file

@ -40,7 +40,7 @@ export default class DevicesPanelEntry extends React.Component {
return MatrixClientPeg.get().setDeviceDetails(device.device_id, {
display_name: value,
}).catch((e) => {
console.error("Error setting device display name", e);
console.error("Error setting session display name", e);
throw new Error(_t("Failed to set display name"));
});
}

32
src/components/views/settings/KeyBackupPanel.js
View file

@ -186,23 +186,23 @@ export default class KeyBackupPanel extends React.PureComponent {
if (MatrixClientPeg.get().getKeyBackupEnabled()) {
clientBackupStatus = <div>
<p>{encryptedMessageAreEncrypted}</p>
<p>✅ {_t("This device is backing up your keys. ")}</p>
<p>✅ {_t("This session is backing up your keys. ")}</p>
</div>;
} else {
clientBackupStatus = <div>
<p>{encryptedMessageAreEncrypted}</p>
<p>{_t(
"This device is <b>not backing up your keys</b>, " +
"This session is <b>not backing up your keys</b>, " +
"but you do have an existing backup you can restore from " +
"and add to going forward.", {},
{b: sub => <b>{sub}</b>},
)}</p>
<p>{_t(
"Connect this device to key backup before signing out to avoid " +
"losing any keys that may only be on this device.",
"Connect this session to key backup before signing out to avoid " +
"losing any keys that may only be on this session.",
)}</p>
</div>;
restoreButtonCaption = _t("Connect this device to Key Backup");
restoreButtonCaption = _t("Connect this session to Key Backup");
}
let keyStatus;
@ -264,42 +264,42 @@ export default class KeyBackupPanel extends React.PureComponent {
);
} else if (!sig.device) {
sigStatus = _t(
"Backup has a signature from <verify>unknown</verify> device with ID %(deviceId)s",
"Backup has a signature from <verify>unknown</verify> session with ID %(deviceId)s",
{ deviceId: sig.deviceId }, { verify },
);
} else if (sig.valid && fromThisDevice) {
sigStatus = _t(
"Backup has a <validity>valid</validity> signature from this device",
"Backup has a <validity>valid</validity> signature from this session",
{}, { validity },
);
} else if (!sig.valid && fromThisDevice) {
// it can happen...
sigStatus = _t(
"Backup has an <validity>invalid</validity> signature from this device",
"Backup has an <validity>invalid</validity> signature from this session",
{}, { validity },
);
} else if (sig.valid && sig.device.isVerified()) {
sigStatus = _t(
"Backup has a <validity>valid</validity> signature from " +
"<verify>verified</verify> device <device></device>",
"<verify>verified</verify> session <device></device>",
{}, { validity, verify, device },
);
} else if (sig.valid && !sig.device.isVerified()) {
sigStatus = _t(
"Backup has a <validity>valid</validity> signature from " +
"<verify>unverified</verify> device <device></device>",
"<verify>unverified</verify> session <device></device>",
{}, { validity, verify, device },
);
} else if (!sig.valid && sig.device.isVerified()) {
sigStatus = _t(
"Backup has an <validity>invalid</validity> signature from " +
"<verify>verified</verify> device <device></device>",
"<verify>verified</verify> session <device></device>",
{}, { validity, verify, device },
);
} else if (!sig.valid && !sig.device.isVerified()) {
sigStatus = _t(
"Backup has an <validity>invalid</validity> signature from " +
"<verify>unverified</verify> device <device></device>",
"<verify>unverified</verify> session <device></device>",
{}, { validity, verify, device },
);
}
@ -309,12 +309,12 @@ export default class KeyBackupPanel extends React.PureComponent {
</div>;
});
if (this.state.backupSigStatus.sigs.length === 0) {
backupSigStatuses = _t("Backup is not signed by any of your devices");
backupSigStatuses = _t("Backup is not signed by any of your sessions");
}
let trustedLocally;
if (this.state.backupSigStatus.trusted_locally) {
trustedLocally = _t("This backup is trusted because it has been restored on this device");
trustedLocally = _t("This backup is trusted because it has been restored on this session");
}
let buttonRow = (
@ -330,7 +330,7 @@ export default class KeyBackupPanel extends React.PureComponent {
if (this.state.backupKeyStored && !SettingsStore.isFeatureEnabled("feature_cross_signing")) {
buttonRow = <p>⚠️ {_t(
"Backup key stored in secret storage, but this feature is not " +
"enabled on this device. Please enable cross-signing in Labs to " +
"enabled on this session. Please enable cross-signing in Labs to " +
"modify key backup state.",
)}</p>;
}
@ -352,7 +352,7 @@ export default class KeyBackupPanel extends React.PureComponent {
return <div>
<div>
<p>{_t(
"Your keys are <b>not being backed up from this device</b>.", {},
"Your keys are <b>not being backed up from this session</b>.", {},
{b: sub => <b>{sub}</b>},
)}</p>
<p>{encryptedMessageAreEncrypted}</p>

4
src/components/views/settings/Notifications.js
View file

@ -864,7 +864,7 @@ export default createReactClass({
<LabelledToggleSwitch value={SettingsStore.getValue("notificationsEnabled")}
onChange={this.onEnableDesktopNotificationsChange}
label={_t('Enable desktop notifications for this device')} />
label={_t('Enable desktop notifications for this session')} />
<LabelledToggleSwitch value={SettingsStore.getValue("notificationBodyEnabled")}
onChange={this.onEnableDesktopNotificationBodyChange}
@ -872,7 +872,7 @@ export default createReactClass({
<LabelledToggleSwitch value={SettingsStore.getValue("audioNotificationsEnabled")}
onChange={this.onEnableAudioNotificationsChange}
label={_t('Enable audible notifications for this device')} />
label={_t('Enable audible notifications for this session')} />
{ emailNotificationsRows }

2
src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
View file

@ -261,7 +261,7 @@ export default class GeneralUserSettingsTab extends React.Component {
title: _t("Success"),
description: _t(
"Your password was successfully changed. You will not receive " +
"push notifications on other devices until you log back in to them",
"push notifications on other sessions until you log back in to them",
) + ".",
});
};

8
src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
View file

@ -185,11 +185,11 @@ export default class SecurityUserSettingsTab extends React.Component {
<span className='mx_SettingsTab_subheading'>{_t("Cryptography")}</span>
<ul className='mx_SettingsTab_subsectionText mx_SecurityUserSettingsTab_deviceInfo'>
<li>
<label>{_t("Device ID:")}</label>
<label>{_t("Session ID:")}</label>
<span><code>{deviceId}</code></span>
</li>
<li>
<label>{_t("Device key:")}</label>
<label>{_t("Session key:")}</label>
<span><code><b>{identityKey}</b></code></span>
</li>
</ul>
@ -285,9 +285,9 @@ export default class SecurityUserSettingsTab extends React.Component {
<div className="mx_SettingsTab mx_SecurityUserSettingsTab">
<div className="mx_SettingsTab_heading">{_t("Security & Privacy")}</div>
<div className="mx_SettingsTab_section">
<span className="mx_SettingsTab_subheading">{_t("Devices")}</span>
<span className="mx_SettingsTab_subheading">{_t("Sessions")}</span>
<div className='mx_SettingsTab_subsectionText'>
{_t("A device's public name is visible to people you communicate with")}
{_t("A session's public name is visible to people you communicate with")}
<DevicesPanel />
</div>
</div>