ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 6591-chat-room-list-search-bar-placeholder

Browse Source
This commit is contained in:
Wolfgang Huß 2023-07-18 14:13:51 +02:00 committed by GitHub
commit 96f8f7efda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 679 additions and 749 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1417
backend/src/db/seed.ts
View File

File diff suppressed because it is too large Load Diff

3
webapp/locales/de.json
View File

@ -86,6 +86,9 @@
"messageDeleted": "Diese Nachricht wuerde gelöscht",
"messagesEmpty": "Keine Nachrichten",
"newMessages": "Neue Nachrichten",
"page": {
"headline": "Chat"
},
"roomEmpty": "Keinen Raum selektiert",
"roomsEmpty": "Keine Räume",
"search": "Chat-Räume filtern",

3
webapp/locales/en.json
View File

@ -86,6 +86,9 @@
"messageDeleted": "This message was deleted",
"messagesEmpty": "No messages",
"newMessages": "New Messages",
"page": {
"headline": "Chat"
},
"roomEmpty": "No room selected",
"roomsEmpty": "No rooms",
"search": "Filter chat rooms",

5
webapp/pages/chat.vue
View File

@ -1,5 +1,8 @@
<template>
<chat />
<div>
<ds-heading tag="h1">{{ $t('chat.page.headline') }}</ds-heading>
<chat />
</div>
</template>
<script>