Merge branch 'i18n-fixes' into 'develop'

Pass the "Collapse" label throught the translation function

Closes #105

See merge request pleroma/pleroma-fe!266
This commit is contained in:
lambda 2018-05-20 11:08:28 +00:00
commit 28c60832c7

View file

@ -3,7 +3,7 @@
<div class="panel-heading conversation-heading">
{{ $t('timeline.conversation') }}
<span v-if="collapsable" style="float:right;">
<small><a href="#" @click.prevent="$emit('toggleExpanded')">Collapse</a></small>
<small><a href="#" @click.prevent="$emit('toggleExpanded')">{{ $t('timeline.collapse') }}</a></small>
</span>
</div>
<div class="panel-body">