Merge branch 'soru/login-no-server' into 'main'

fix: Allow fallback to previous url if there is no homeserver on the mxid domain

See merge request famedly/fluffychat!477
This commit is contained in:
Krille Fear 2021-08-08 16:38:04 +00:00
commit 543d946b2d
2 changed files with 32 additions and 1 deletions

View file

@ -1351,6 +1351,14 @@
"type": "text",
"placeholders": {}
},
"noMatrixServer": "{server1} is no matrix server, use {server2} instead?",
"@noMatrixServer": {
"type": "text",
"placeholders": {
"server1": {},
"server2": {}
}
},
"noMegolmBootstrap": "Please turn on online key backup from within Element instead.",
"@noMegolmBootstrap": {
"type": "text",