ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2026-01-20 20:01:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'chat-notifications2' of github.com:Ocelot-Social-Community/Ocelot-Social into chat-notifications2

Browse Source
This commit is contained in:
Moriz Wahl 2023-07-18 13:23:13 +02:00
commit 342d60d21f
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/test-e2e.yml vendored
View File

@ -113,5 +113,6 @@ jobs:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
gh extension install actions/gh-actions-cache
set +e
KEY="e2e-preparation-cache-pr${{ needs.docker_preparation.outputs.pr-number }}"
gh actions-cache delete $KEY -R Ocelot-Social-Community/Ocelot-Social --confirm

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": "Suche",

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": "Search",

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>