sjw/pleroma-fe
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma-fe.git synced 2024-12-24 14:05:06 +01:00
Code Issues Releases Wiki Activity

Merge branch 'fix/use-shoutbox-name-in-sidedrawer' into 'develop'

Browse Source 
change side drawer to use shoutbox name - fix #956

Closes #956

See merge request pleroma/pleroma-fe!1235
This commit is contained in:
lain 2020-09-16 09:22:05 +00:00
commit ee620f6028
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/chat_panel/chat_panel.vue
View File

@ -63,7 +63,7 @@
@click.stop.prevent="togglePanel" @click.stop.prevent="togglePanel"
> >
<div class="title"> <div class="title">
<i class="icon-comment-empty" /> <i class="icon-megaphone" />
{{ $t('shoutbox.title') }} {{ $t('shoutbox.title') }}
</div> </div>
</div> </div>

2
src/components/side_drawer/side_drawer.vue
View File

@ -90,7 +90,7 @@
@click="toggleDrawer" @click="toggleDrawer"
> >
<router-link :to="{ name: 'chat' }"> <router-link :to="{ name: 'chat' }">
<i class="button-icon icon-chat" /> {{ $t("nav.chat") }} <i class="button-icon icon-megaphone" /> {{ $t("shoutbox.title") }}
</router-link> </router-link>
</li> </li>
</ul> </ul>

1
src/i18n/en.json
View File

@ -113,7 +113,6 @@
"about": "About", "about": "About",
"administration": "Administration", "administration": "Administration",
"back": "Back", "back": "Back",
"chat": "Local Chat",
"friend_requests": "Follow Requests", "friend_requests": "Follow Requests",
"mentions": "Mentions", "mentions": "Mentions",
"interactions": "Interactions", "interactions": "Interactions",

6
static/fontello.json
View File

@ -405,6 +405,12 @@
"css": "block", "css": "block",
"code": 59434, "code": 59434,
"src": "fontawesome" "src": "fontawesome"
},
{
"uid": "3e674995cacc2b09692c096ea7eb6165",
"css": "megaphone",
"code": 59435,
"src": "fontawesome"
} }
] ]
} }