Skip to content
Snippets Groups Projects
Commit ee620f60 authored by lain's avatar lain
Browse files

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

change side drawer to use shoutbox name - fix #956

Closes #956

See merge request !1235
parents d6fe4f6a 20d33c2f
No related branches found
No related tags found
2 merge requests!1236Merge 2.1.2 to MASTER,!1235change side drawer to use shoutbox name - fix #956
Pipeline #31049 passed
......@@ -63,7 +63,7 @@
@click.stop.prevent="togglePanel"
>
<div class="title">
<i class="icon-comment-empty" />
<i class="icon-megaphone" />
{{ $t('shoutbox.title') }}
</div>
</div>
......
......@@ -90,7 +90,7 @@
@click="toggleDrawer"
>
<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>
</li>
</ul>
......
......@@ -113,7 +113,6 @@
"about": "About",
"administration": "Administration",
"back": "Back",
"chat": "Local Chat",
"friend_requests": "Follow Requests",
"mentions": "Mentions",
"interactions": "Interactions",
......
......@@ -405,6 +405,12 @@
"css": "block",
"code": 59434,
"src": "fontawesome"
},
{
"uid": "3e674995cacc2b09692c096ea7eb6165",
"css": "megaphone",
"code": 59435,
"src": "fontawesome"
}
]
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment