Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GUI fixes #290

Merged
merged 20 commits into from
Jan 7, 2025
Merged
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0ef6aee
Jump from welcome dialog corrected: https://github.com/ioBroker/ioBro…
GermanBluefox Jan 6, 2025
65b314f
Replaced QR-Code scan: https://github.com/ioBroker/ioBroker.matter/is…
GermanBluefox Jan 6, 2025
93c435b
Replaced apple link: https://github.com/ioBroker/ioBroker.matter/issu…
GermanBluefox Jan 6, 2025
723c928
Do not show password: https://github.com/ioBroker/ioBroker.matter/iss…
GermanBluefox Jan 6, 2025
f712698
Added controllerFabricLabel: https://github.com/ioBroker/ioBroker.mat…
GermanBluefox Jan 6, 2025
faf163e
Corrected hint text: https://github.com/ioBroker/ioBroker.matter/issu…
GermanBluefox Jan 6, 2025
e9fe130
Correcting device edit dialog: https://github.com/ioBroker/ioBroker.m…
GermanBluefox Jan 6, 2025
d26f8ad
Correcting color of icon: https://github.com/ioBroker/ioBroker.matter…
GermanBluefox Jan 6, 2025
5369ca3
Added readme
GermanBluefox Jan 6, 2025
f732d09
Correcting naming: https://github.com/ioBroker/ioBroker.matter/issues…
GermanBluefox Jan 6, 2025
f1fbbfa
Added device name to QR-Code dialog: https://github.com/ioBroker/ioBr…
GermanBluefox Jan 6, 2025
01b96b5
Added hint: https://github.com/ioBroker/ioBroker.matter/issues/250
GermanBluefox Jan 6, 2025
b3ac11e
Added code check: https://github.com/ioBroker/ioBroker.matter/issues/260
GermanBluefox Jan 6, 2025
2b77d69
Added code check: https://github.com/ioBroker/ioBroker.matter/issues/260
GermanBluefox Jan 6, 2025
b79b1c6
Changed discovery behaviour: https://github.com/ioBroker/ioBroker.mat…
GermanBluefox Jan 6, 2025
49d5c83
Enhanced welcome dialog: https://github.com/ioBroker/ioBroker.matter/…
GermanBluefox Jan 6, 2025
50d5ef8
Trying to show the device being processed: https://github.com/ioBroke…
GermanBluefox Jan 6, 2025
4428aba
Fixing processing update
GermanBluefox Jan 7, 2025
b49563b
Update README.md
GermanBluefox Jan 7, 2025
24085d8
Update src-admin/src/App.tsx
GermanBluefox Jan 7, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added device name to QR-Code dialog: #269
  • Loading branch information
GermanBluefox committed Jan 6, 2025
commit f1fbbfada2139b28c2db64fb467ffd201b246add
6 changes: 5 additions & 1 deletion src-admin/src/Tabs/BridgesAndDevices.tsx
Original file line number Diff line number Diff line change
@@ -633,14 +633,18 @@ class BridgesAndDevices<TProps extends BridgesAndDevicesProps, TState extends Br
if (!nodeState) {
return null;
}
const name: string =
typeof this.state.showQrCode.name === 'object'
? this.state.showQrCode.name[I18n.getLanguage()] || this.state.showQrCode.name.en
: this.state.showQrCode.name;

return (
<Dialog
onClose={() => this.setState({ showQrCode: null })}
open={!0}
maxWidth="md"
>
<DialogTitle>{I18n.t('QR Code to connect')}</DialogTitle>
<DialogTitle>{I18n.t('QR Code to connect for %s', name)}</DialogTitle>
<DialogContent>
<InfoBox
type="info"
2 changes: 1 addition & 1 deletion src-admin/src/i18n/de.json
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@
"Provide your Thread or WiFi information or both!": "Geben Sie Ihre Thread- oder WiFi-Informationen oder beides an!",
"QR Code": "QR-Code",
"QR Code scan is not possible": "QR-Code-Scan ist nicht möglich",
"QR Code to connect": "QR-Code zum Verbinden",
"QR Code to connect for %s": "QR-Code zum Verbinden für „%s“",
"Re-Announce": "Pairing neu starten",
"Reconnect to backend": "Erneute Verbindung zum Backend herstellen",
"Required": "Erforderlich",
2 changes: 1 addition & 1 deletion src-admin/src/i18n/en.json
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@
"Provide your Thread or WiFi information or both!": "Provide your Thread or WiFi information or both!",
"QR Code": "QR Code",
"QR Code scan is not possible": "QR Code scan is not possible",
"QR Code to connect": "QR Code to connect",
"QR Code to connect for %s": "QR Code to connect for \"%s\"",
"Re-Announce": "Re-announce",
"Reconnect to backend": "Reconnect to backend",
"Required": "Required",
2 changes: 1 addition & 1 deletion src-admin/src/i18n/es.json
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@
"Provide your Thread or WiFi information or both!": "¡Proporcione su información de Thread o WiFi o ambas!",
"QR Code": "Código QR",
"QR Code scan is not possible": "No es posible escanear códigos QR",
"QR Code to connect": "Código QR para conectarse",
"QR Code to connect for %s": "Código QR para conectarse a \"%s\"",
"Re-Announce": "Re-announce",
"Reconnect to backend": "Reconectarse al backend",
"Required": "Requerido",
2 changes: 1 addition & 1 deletion src-admin/src/i18n/fr.json
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@
"Provide your Thread or WiFi information or both!": "Fournissez vos informations Thread ou WiFi, ou les deux !",
"QR Code": "Code QR",
"QR Code scan is not possible": "La numérisation du code QR n'est pas possible",
"QR Code to connect": "QR Code pour se connecter",
"QR Code to connect for %s": "Code QR pour se connecter pour « %s »",
"Re-Announce": "Re-announce",
"Reconnect to backend": "Se reconnecter au backend",
"Required": "Requis",
2 changes: 1 addition & 1 deletion src-admin/src/i18n/it.json
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@
"Provide your Thread or WiFi information or both!": "Fornisci le tue informazioni sulla discussione o sul WiFi o entrambi!",
"QR Code": "Codice QR",
"QR Code scan is not possible": "La scansione del codice QR non è possibile",
"QR Code to connect": "Codice QR per connettersi",
"QR Code to connect for %s": "Codice QR per connettersi per \"%s\"",
"Re-Announce": "Re-announce",
"Reconnect to backend": "Riconnettiti al backend",
"Required": "Necessario",
2 changes: 1 addition & 1 deletion src-admin/src/i18n/nl.json
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@
"Provide your Thread or WiFi information or both!": "Geef uw Thread- of WiFi-informatie op, of beide!",
"QR Code": "QR-code",
"QR Code scan is not possible": "QR-code scannen is niet mogelijk",
"QR Code to connect": "QR-code om verbinding te maken",
"QR Code to connect for %s": "QR-code om verbinding te maken voor \"%s\"",
"Re-Announce": "Re-announce",
"Reconnect to backend": "Opnieuw verbinden met backend",
"Required": "Vereist",
2 changes: 1 addition & 1 deletion src-admin/src/i18n/pl.json
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@
"Provide your Thread or WiFi information or both!": "Podaj informacje o swoim wątku lub Wi-Fi lub jedno i drugie!",
"QR Code": "Kod QR",
"QR Code scan is not possible": "Skanowanie kodu QR nie jest możliwe",
"QR Code to connect": "Kod QR do połączenia",
"QR Code to connect for %s": "Kod QR do połączenia dla \"%s\"",
"Re-Announce": "Re-announce",
"Reconnect to backend": "Ponowne połączenie z zapleczem",
"Required": "Wymagany",
2 changes: 1 addition & 1 deletion src-admin/src/i18n/pt.json
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@
"Provide your Thread or WiFi information or both!": "Forneça suas informações de Thread ou WiFi ou ambos!",
"QR Code": "Código QR",
"QR Code scan is not possible": "Não é possível escanear o código QR",
"QR Code to connect": "QR Code para conectar",
"QR Code to connect for %s": "Código QR para conectar \"%s\"",
"Re-Announce": "Re-announce",
"Reconnect to backend": "Reconectar ao backend",
"Required": "Obrigatório",
2 changes: 1 addition & 1 deletion src-admin/src/i18n/ru.json
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@
"Provide your Thread or WiFi information or both!": "Предоставьте информацию о своей теме или Wi-Fi, или и то, и другое!",
"QR Code": "QR-код",
"QR Code scan is not possible": "Сканирование QR-кода невозможно.",
"QR Code to connect": "QR-код для подключения",
"QR Code to connect for %s": "QR-код для подключения к \"%s\"",
"Re-Announce": "Re-announce",
"Reconnect to backend": "Повторное подключение к бэкэнду",
"Required": "Необходимый",
2 changes: 1 addition & 1 deletion src-admin/src/i18n/uk.json
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@
"Provide your Thread or WiFi information or both!": "Надайте інформацію про свій ланцюжок або Wi-Fi або те й інше!",
"QR Code": "QR-код",
"QR Code scan is not possible": "Сканування QR-коду неможливе",
"QR Code to connect": "QR-код для підключення",
"QR Code to connect for %s": "QR-код для підключення до \"%s\"",
"Re-Announce": "Re-announce",
"Reconnect to backend": "Повторно підключіться до сервера",
"Required": "Обов'язковий",
2 changes: 1 addition & 1 deletion src-admin/src/i18n/zh-cn.json
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@
"Provide your Thread or WiFi information or both!": "提供您的 Thread 或 WiFi 信息或两者!",
"QR Code": "二维码",
"QR Code scan is not possible": "无法扫描二维码",
"QR Code to connect": "二维码连接",
"QR Code to connect for %s": "用于连接“%s”的二维码",
"Re-Announce": "Re-announce",
"Reconnect to backend": "重新连接到后端",
"Required": "必需的",