mirror of https://github.com/vector-im/riot-web
provide default for missing device labels
parent
2eef3d610e
commit
a35c9ea585
|
@ -26,8 +26,6 @@ export default {
|
||||||
const audioinput = [];
|
const audioinput = [];
|
||||||
const videoinput = [];
|
const videoinput = [];
|
||||||
|
|
||||||
if (devices.some((device) => !device.label)) return false;
|
|
||||||
|
|
||||||
devices.forEach((device) => {
|
devices.forEach((device) => {
|
||||||
switch (device.kind) {
|
switch (device.kind) {
|
||||||
case 'audiooutput': audiooutput.push(device); break;
|
case 'audiooutput': audiooutput.push(device); break;
|
||||||
|
|
|
@ -100,7 +100,17 @@ export default class VoiceUserSettingsTab extends React.Component {
|
||||||
};
|
};
|
||||||
|
|
||||||
_renderDeviceOptions(devices, category) {
|
_renderDeviceOptions(devices, category) {
|
||||||
return devices.map((d) => <option key={`${category}-${d.deviceId}`} value={d.deviceId}>{d.label}</option>);
|
return devices.map((d) => {
|
||||||
|
let label = d.label;
|
||||||
|
if (!label) {
|
||||||
|
switch (d.kind) {
|
||||||
|
case "audioinput": label = _t("Unnamed microphone"); break;
|
||||||
|
case "audiooutput": label = _t("Unnamed audio output"); break;
|
||||||
|
case "videoinput": label = _t("Unnamed camera"); break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return (<option key={`${category}-${d.deviceId}`} value={d.deviceId}>{label}</option>);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
|
|
|
@ -610,6 +610,9 @@
|
||||||
"Learn more about how we use analytics.": "Learn more about how we use analytics.",
|
"Learn more about how we use analytics.": "Learn more about how we use analytics.",
|
||||||
"No media permissions": "No media permissions",
|
"No media permissions": "No media permissions",
|
||||||
"You may need to manually permit Riot to access your microphone/webcam": "You may need to manually permit Riot to access your microphone/webcam",
|
"You may need to manually permit Riot to access your microphone/webcam": "You may need to manually permit Riot to access your microphone/webcam",
|
||||||
|
"Unnamed microphone": "Unnamed microphone",
|
||||||
|
"Unnamed audio output": "Unnamed audio output",
|
||||||
|
"Unnamed camera": "Unnamed camera",
|
||||||
"Missing media permissions, click the button below to request.": "Missing media permissions, click the button below to request.",
|
"Missing media permissions, click the button below to request.": "Missing media permissions, click the button below to request.",
|
||||||
"Request media permissions": "Request media permissions",
|
"Request media permissions": "Request media permissions",
|
||||||
"No Audio Outputs detected": "No Audio Outputs detected",
|
"No Audio Outputs detected": "No Audio Outputs detected",
|
||||||
|
|
Loading…
Reference in New Issue