Change the show/hide strings about, remove subjected status toggle when 'collapse' option not used

This commit is contained in:
Shpuld Shpuldson 2020-06-26 18:20:32 +03:00
parent 44edb730c1
commit 8c3106c588
3 changed files with 13 additions and 7 deletions

View file

@ -48,10 +48,10 @@ const StatusContent = {
}, },
// When a status has a subject and is also tall, we should only have one show more/less button. If the default is to collapse statuses with subjects, we just treat it like a status with a subject; otherwise, we just treat it like a tall status. // When a status has a subject and is also tall, we should only have one show more/less button. If the default is to collapse statuses with subjects, we just treat it like a status with a subject; otherwise, we just treat it like a tall status.
mightHideBecauseSubject () { mightHideBecauseSubject () {
return this.status.summary && (!this.tallStatus || this.localCollapseSubjectDefault) return !!this.status.summary && this.localCollapseSubjectDefault
}, },
mightHideBecauseTall () { mightHideBecauseTall () {
return this.tallStatus && (!this.status.summary || !this.localCollapseSubjectDefault) return this.tallStatus && !(this.status.summary && this.localCollapseSubjectDefault)
}, },
hideSubjectStatus () { hideSubjectStatus () {
return this.mightHideBecauseSubject && !this.expandingSubject return this.mightHideBecauseSubject && !this.expandingSubject

View file

@ -17,7 +17,7 @@
href="#" href="#"
class="tall-subject-hider" class="tall-subject-hider"
@click.prevent="showingLongSubject=false" @click.prevent="showingLongSubject=false"
>{{ $t("general.show_less") }}</a> >{{ $t("status.hide_full_subject") }}</a>
<a <a
v-else-if="longSubject" v-else-if="longSubject"
class="tall-subject-hider" class="tall-subject-hider"
@ -25,7 +25,7 @@
href="#" href="#"
@click.prevent="showingLongSubject=true" @click.prevent="showingLongSubject=true"
> >
{{ $t("general.show_more") }} {{ $t("status.show_full_subject") }}
</a> </a>
</div> </div>
<div <div
@ -53,7 +53,7 @@
class="cw-status-hider" class="cw-status-hider"
@click.prevent="toggleShowMore" @click.prevent="toggleShowMore"
> >
{{ $t("general.show_more") }} {{ $t("status.show_content") }}
<span <span
v-if="hasImageAttachments" v-if="hasImageAttachments"
class="icon-picture" class="icon-picture"
@ -72,7 +72,9 @@
href="#" href="#"
class="status-unhider" class="status-unhider"
@click.prevent="toggleShowMore" @click.prevent="toggleShowMore"
>{{ $t("general.show_less") }}</a> >
{{ tallStatus ? $t("general.show_less") : $t("status.hide_content") }}
</a>
</div> </div>
<div v-if="status.poll && status.poll.options"> <div v-if="status.poll && status.poll.options">

View file

@ -629,7 +629,11 @@
"status_unavailable": "Status unavailable", "status_unavailable": "Status unavailable",
"copy_link": "Copy link to status", "copy_link": "Copy link to status",
"thread_muted": "Thread muted", "thread_muted": "Thread muted",
"thread_muted_and_words": ", has words:" "thread_muted_and_words": ", has words:",
"show_full_subject": "Show full subject",
"hide_full_subject": "Hide full subject",
"show_content": "Show content",
"hide_content": "Hide content"
}, },
"user_card": { "user_card": {
"approve": "Approve", "approve": "Approve",