diff --git a/src/assets/css/chat.scss b/src/assets/css/chat.scss index 2751361..653c22c 100644 --- a/src/assets/css/chat.scss +++ b/src/assets/css/chat.scss @@ -487,6 +487,8 @@ $admin-fg: white; text-align: center; margin: 20px; user-select: text; + overflow-wrap: break-word; + word-break: break-word; } .notice { diff --git a/src/assets/translations/bo.json b/src/assets/translations/bo.json index 0fa658c..91bafdf 100644 --- a/src/assets/translations/bo.json +++ b/src/assets/translations/bo.json @@ -47,7 +47,8 @@ "password_required": "གསང་ཚིག་དགོས་ཀྱི་ཡོད།", "username_required": "སྤྱོད་མིང་དགོས་ཀྱི་ཡོད།", "create_room": "ཐོ་འགོད་དང་ཁ་བརྡ་ཁང་གསར་སྐྲུན།", - "or": "ཡང་ན།" + "or": "ཡང་ན།", + "invalid_message": "" }, "new_room": { "next": "རྗེས་མ།", diff --git a/src/assets/translations/de.json b/src/assets/translations/de.json index b182c64..f0ec7fd 100644 --- a/src/assets/translations/de.json +++ b/src/assets/translations/de.json @@ -110,7 +110,8 @@ "password_required": "Das Passwort ist erforderlich", "login": "Anmelden", "create_room": "Registrieren und Raum erstellen", - "or": "ODER" + "or": "ODER", + "invalid_message": "" }, "profile": { "title": "Mein Profil", diff --git a/src/assets/translations/en.json b/src/assets/translations/en.json index e9f60d1..a58777f 100644 --- a/src/assets/translations/en.json +++ b/src/assets/translations/en.json @@ -115,7 +115,8 @@ "password_required": "Password is required", "login": "Login", "create_room": "Register & Create Room", - "or": "OR" + "or": "OR", + "invalid_message": "Invalid username or password" }, "profile": { "title": "My Profile", diff --git a/src/assets/translations/es.json b/src/assets/translations/es.json index 31278b9..8e7d9de 100644 --- a/src/assets/translations/es.json +++ b/src/assets/translations/es.json @@ -76,7 +76,8 @@ "username": "Nombre de Usuario", "title": "Iniciar sesión", "create_room": "", - "or": "" + "or": "", + "invalid_message": "" }, "device_list": { "not_verified": "No ha sido Verificado", diff --git a/src/assets/translations/fi.json b/src/assets/translations/fi.json index 1e4b4f0..79691d9 100644 --- a/src/assets/translations/fi.json +++ b/src/assets/translations/fi.json @@ -60,7 +60,8 @@ "login": "Kirjaudu sisään", "password": "Anna salasana", "password_required": "Salasana vaaditaan", - "create_room": "Rekisteröidy ja luo huone" + "create_room": "Rekisteröidy ja luo huone", + "invalid_message": "" }, "join": { "joining_as": "Liityt jäsenenä:", diff --git a/src/assets/translations/fr.json b/src/assets/translations/fr.json index e19a604..4349670 100644 --- a/src/assets/translations/fr.json +++ b/src/assets/translations/fr.json @@ -110,7 +110,8 @@ "password_required": "Le mot de passe est obligatoire", "create_room": "S’inscrire et créer un salon", "or": "OU", - "login": "Se connecter" + "login": "Se connecter", + "invalid_message": "" }, "profile": { "temporary_identity": "Cette identité est temporaire. Définissez un mot de passe pour l’utiliser à nouveau", diff --git a/src/assets/translations/it.json b/src/assets/translations/it.json index 4470c8b..9c53650 100644 --- a/src/assets/translations/it.json +++ b/src/assets/translations/it.json @@ -109,7 +109,8 @@ "login": "Accedi", "create_room": "Registrati e crea una stanza", "or": "O", - "username_required": "Il nome utente è richiesto" + "username_required": "Il nome utente è richiesto", + "invalid_message": "" }, "profile": { "title": "Il mio profilo", diff --git a/src/assets/translations/nb_NO.json b/src/assets/translations/nb_NO.json index 0921857..afddc9b 100644 --- a/src/assets/translations/nb_NO.json +++ b/src/assets/translations/nb_NO.json @@ -102,7 +102,8 @@ "password": "Passord", "username": "Brukernavn", "create_room": "", - "or": "" + "or": "", + "invalid_message": "" }, "new_room": { "add_people": "Legg til folk", diff --git a/src/assets/translations/pt_BR.json b/src/assets/translations/pt_BR.json index c2530dd..0077600 100644 --- a/src/assets/translations/pt_BR.json +++ b/src/assets/translations/pt_BR.json @@ -128,7 +128,8 @@ "password_required": "A senha é obrigatória", "login": "Entrar", "create_room": "Cadastre-se e crie uma sala", - "or": "OU" + "or": "OU", + "invalid_message": "" }, "profile": { "title": "Meu perfil", diff --git a/src/assets/translations/ro.json b/src/assets/translations/ro.json index d167c07..4ab741e 100644 --- a/src/assets/translations/ro.json +++ b/src/assets/translations/ro.json @@ -135,7 +135,8 @@ "username": "Nume utilizator (ex: marta)", "title": "Autentificare", "create_room": "", - "or": "" + "or": "", + "invalid_message": "" }, "device_list": { "not_verified": "Nu a fost verificat", diff --git a/src/assets/translations/si.json b/src/assets/translations/si.json index deca16d..817bbdc 100644 --- a/src/assets/translations/si.json +++ b/src/assets/translations/si.json @@ -23,5 +23,8 @@ "download_progress": "{percentage}% බාගත වී ඇත", "file_prefix": "ගොනුව: ", "you": "ඔබ" + }, + "login": { + "invalid_message": "" } } \ No newline at end of file diff --git a/src/assets/translations/ug.json b/src/assets/translations/ug.json index c444844..7c78103 100644 --- a/src/assets/translations/ug.json +++ b/src/assets/translations/ug.json @@ -221,7 +221,8 @@ "username": "قوللانغۇچى ئىسمى (مەسىلەن: marta)", "title": "كىرىش", "create_room": "", - "or": "" + "or": "", + "invalid_message": "" }, "device_list": { "not_verified": "دەلىللەنمىدى", diff --git a/src/assets/translations/zh_Hans.json b/src/assets/translations/zh_Hans.json index fb4d61c..e7f5dbe 100644 --- a/src/assets/translations/zh_Hans.json +++ b/src/assets/translations/zh_Hans.json @@ -50,7 +50,8 @@ "username_required": "需要用户名", "username": "用户名 (如: marta)", "create_room": "", - "or": "" + "or": "", + "invalid_message": "" }, "device_list": { "title": "设备", diff --git a/src/components/Chat.vue b/src/components/Chat.vue index 80744d3..4b06a3f 100644 --- a/src/components/Chat.vue +++ b/src/components/Chat.vue @@ -122,6 +122,7 @@ add_circle_outline - {{ + {{ $t("menu.cancel") }} - + @@ -24,7 +24,7 @@
{{ $tc("room.members", memberCount) }}
- {{ + {{ $t("room.leave") }} @@ -88,8 +88,27 @@ export default { room() { return this.$matrix.currentRoom; }, + memberAvatar() { + let roomMember; + if (this.room) { + this.room.getMembers().forEach(member => { + if(this.room.name === member.name) { + roomMember = member; + } + }); + if (roomMember) { + return roomMember.getAvatarUrl( + this.$matrix.matrixClient.getHomeserverUrl(), + 40, + 40, + "scale", + true + ); + } + } + return null; + } }, - watch: { room: { handler(newVal, ignoredOldVal) { diff --git a/src/components/CreateRoom.vue b/src/components/CreateRoom.vue index e408693..d745d02 100644 --- a/src/components/CreateRoom.vue +++ b/src/components/CreateRoom.vue @@ -4,6 +4,7 @@
{{ $t("new_room.new_room") }}
--> @@ -19,7 +19,7 @@ {{ roomHistoryDescription }}
- {{ + {{ $t("room_welcome.got_it") }}
diff --git a/src/components/Invite.vue b/src/components/Invite.vue index 2a23f36..2a035f8 100644 --- a/src/components/Invite.vue +++ b/src/components/Invite.vue @@ -3,6 +3,7 @@
{{$t('invite.title')}}
- + @@ -51,6 +51,7 @@ {{ $t("join.enter_room") }} diff --git a/src/components/LeaveRoomDialog.vue b/src/components/LeaveRoomDialog.vue index e7ff897..18cfe15 100644 --- a/src/components/LeaveRoomDialog.vue +++ b/src/components/LeaveRoomDialog.vue @@ -43,6 +43,7 @@ {{ $t("login.title") }}
- + close @@ -37,6 +37,7 @@ :error-messages="userErrorMessage" required v-on:keyup.enter="$refs.password.focus()" + v-on:keydown="hasError=false" > +
{{ this.message }}
{{ $t("login.or") }}
{{ $t("profile.title") }}
{{ userAvatarLetter }} {{ $t("profile.temporary_identity") }} --> - {{ + {{ $t("menu.logout") }} @@ -101,10 +103,11 @@ - {{ + {{ $t("menu.cancel") }} - {{ + {{ $t("menu.cancel") }} @@ -31,7 +30,7 @@ class="avatar-32" size="32" color="#e0e0e0" - @click.stop="showProfileInfo = true" + @click.stop="viewProfile" > {{ userAvatarLetter }} @@ -67,7 +66,7 @@ style="position: relative; width: 100%; height: 40px" class="text-end" > - {{ + {{ $t("profile_info_popup.new_room") }} @@ -149,6 +148,8 @@ export default { left: 10px; } border-radius: 40px; + width: 95%; + &::before { content: "▲"; position: fixed; @@ -183,12 +184,18 @@ export default { font-size: 13 * $chat-text-size !important; } } + + @media #{map-get($display-breakpoints, 'sm-and-up')} { + width: 70%; + } + @media #{map-get($display-breakpoints, 'lg-and-up')} { overflow: unset; width: $main-desktop-width;; position: absolute; top: 70px; right: unset; + width: $dialog-desktop-width; &::before { position: absolute; diff --git a/src/components/PurgeRoomDialog.vue b/src/components/PurgeRoomDialog.vue index 14f036d..6f89b6e 100644 --- a/src/components/PurgeRoomDialog.vue +++ b/src/components/PurgeRoomDialog.vue @@ -1,10 +1,14 @@