diff options
| author | Shpuld Shpuldson <shp@cock.li> | 2020-06-26 18:20:32 +0300 |
|---|---|---|
| committer | Shpuld Shpuldson <shp@cock.li> | 2020-06-26 18:20:32 +0300 |
| commit | 8c3106c588f964a8e26c69784d5808ad1f72625c (patch) | |
| tree | 3b3973fb2c25f518726a819222902e9c1728552e | |
| parent | 44edb730c1e2298a00be0c1a139f80a1335ad7cf (diff) | |
Change the show/hide strings about, remove subjected status toggle when 'collapse' option not used
| -rw-r--r-- | src/components/status_content/status_content.js | 4 | ||||
| -rw-r--r-- | src/components/status_content/status_content.vue | 10 | ||||
| -rw-r--r-- | src/i18n/en.json | 6 |
3 files changed, 13 insertions, 7 deletions
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js index 66501b3e..09ea3a20 100644 --- a/src/components/status_content/status_content.js +++ b/src/components/status_content/status_content.js @@ -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. mightHideBecauseSubject () { - return this.status.summary && (!this.tallStatus || this.localCollapseSubjectDefault) + return !!this.status.summary && this.localCollapseSubjectDefault }, mightHideBecauseTall () { - return this.tallStatus && (!this.status.summary || !this.localCollapseSubjectDefault) + return this.tallStatus && !(this.status.summary && this.localCollapseSubjectDefault) }, hideSubjectStatus () { return this.mightHideBecauseSubject && !this.expandingSubject diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue index 5698b4c0..3460c2fa 100644 --- a/src/components/status_content/status_content.vue +++ b/src/components/status_content/status_content.vue @@ -17,7 +17,7 @@ href="#" class="tall-subject-hider" @click.prevent="showingLongSubject=false" - >{{ $t("general.show_less") }}</a> + >{{ $t("status.hide_full_subject") }}</a> <a v-else-if="longSubject" class="tall-subject-hider" @@ -25,7 +25,7 @@ href="#" @click.prevent="showingLongSubject=true" > - {{ $t("general.show_more") }} + {{ $t("status.show_full_subject") }} </a> </div> <div @@ -53,7 +53,7 @@ class="cw-status-hider" @click.prevent="toggleShowMore" > - {{ $t("general.show_more") }} + {{ $t("status.show_content") }} <span v-if="hasImageAttachments" class="icon-picture" @@ -72,7 +72,9 @@ href="#" class="status-unhider" @click.prevent="toggleShowMore" - >{{ $t("general.show_less") }}</a> + > + {{ tallStatus ? $t("general.show_less") : $t("status.hide_content") }} + </a> </div> <div v-if="status.poll && status.poll.options"> diff --git a/src/i18n/en.json b/src/i18n/en.json index eefe10e5..ede8c3d8 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -629,7 +629,11 @@ "status_unavailable": "Status unavailable", "copy_link": "Copy link to status", "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": { "approve": "Approve", |