From a79bad5cdb896fd965e544df3ba8d0a87b3db458 Mon Sep 17 00:00:00 2001 From: lain Date: Fri, 19 Jun 2020 12:46:48 +0200 Subject: [PATCH 1/5] StatusContent: Better separate subject from status content. --- .../status_content/status_content.js | 6 ----- .../status_content/status_content.vue | 22 +++++++++++-------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js index c0a71e8f..cfee77a3 100644 --- a/src/components/status_content/status_content.js +++ b/src/components/status_content/status_content.js @@ -142,12 +142,6 @@ const StatusContent = { return html } }, - contentHtml () { - if (!this.status.summary_html) { - return this.postBodyHtml - } - return this.status.summary_html + '
' + this.postBodyHtml - }, ...mapGetters(['mergedConfig']), ...mapState({ betterShadow: state => state.interface.browserSupport.cssFilter, diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue index efc2485e..df980a71 100644 --- a/src/components/status_content/status_content.vue +++ b/src/components/status_content/status_content.vue @@ -31,7 +31,7 @@
{{ $t("general.show_more") }} +
-
{ From 4da0a0c0bfcfaccd58def8d2170b952c1d15106a Mon Sep 17 00:00:00 2001 From: lain Date: Fri, 19 Jun 2020 12:49:42 +0200 Subject: [PATCH 2/5] StatusContent: Fix greentext. --- src/components/status_content/status_content.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue index df980a71..431661eb 100644 --- a/src/components/status_content/status_content.vue +++ b/src/components/status_content/status_content.vue @@ -230,7 +230,7 @@ $status-margin: 0.75em; .greentext { color: $fallback--cGreen; - color: var(--cGreen, $fallback--cGreen); + color: var(--postGreentext, $fallback--cGreen); } .timeline :not(.panel-disabled) > { From 44edb730c1e2298a00be0c1a139f80a1335ad7cf Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Fri, 26 Jun 2020 14:07:39 +0300 Subject: [PATCH 3/5] rip restyle subject, fix some issues with long subject --- .../status_content/status_content.js | 2 +- .../status_content/status_content.vue | 133 +++++++++++------- 2 files changed, 83 insertions(+), 52 deletions(-) diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js index cfee77a3..66501b3e 100644 --- a/src/components/status_content/status_content.js +++ b/src/components/status_content/status_content.js @@ -44,7 +44,7 @@ const StatusContent = { return lengthScore > 20 }, longSubject () { - return this.status.summary.length > 900 + return this.status.summary.length > 240 }, // 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 () { diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue index 431661eb..5698b4c0 100644 --- a/src/components/status_content/status_content.vue +++ b/src/components/status_content/status_content.vue @@ -3,16 +3,55 @@
+ +
+ {{ $t("general.show_more") }} + +
+ {{ $t("general.show_more") }} - -
- {{ $t("general.show_more") }} -
-
- {{ $t("general.show_more") }} Date: Fri, 26 Jun 2020 18:20:32 +0300 Subject: [PATCH 4/5] Change the show/hide strings about, remove subjected status toggle when 'collapse' option not used --- src/components/status_content/status_content.js | 4 ++-- src/components/status_content/status_content.vue | 10 ++++++---- 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") }} + >{{ $t("status.hide_full_subject") }} - {{ $t("general.show_more") }} + {{ $t("status.show_full_subject") }}
- {{ $t("general.show_more") }} + {{ $t("status.show_content") }} {{ $t("general.show_less") }} + > + {{ tallStatus ? $t("general.show_less") : $t("status.hide_content") }} +
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", From 195e83d0c8ab660a1dd6b29137295c2a6a36dca9 Mon Sep 17 00:00:00 2001 From: Fristi Date: Sat, 27 Jun 2020 15:04:52 +0000 Subject: [PATCH 5/5] Translated using Weblate (Dutch) Currently translated at 100.0% (626 of 626 strings) Translation: Pleroma/Pleroma-FE Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nl/ --- src/i18n/nl.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/i18n/nl.json b/src/i18n/nl.json index 15ce5cbe..bf270f87 100644 --- a/src/i18n/nl.json +++ b/src/i18n/nl.json @@ -476,7 +476,14 @@ "backend_version": "Backend Versie", "title": "Versie" }, - "mutes_and_blocks": "Negeringen en Blokkades" + "mutes_and_blocks": "Negeringen en Blokkades", + "profile_fields": { + "value": "Inhoud", + "name": "Label", + "add_field": "Veld Toevoegen", + "label": "Profiel metadata" + }, + "bot": "Dit is een bot account" }, "timeline": { "collapse": "Inklappen",