commit: 65b0b69f109c42f07fe14c764d6a4e01bd763a83
parent e764fbe8b680d9b60fba3074de3ee2db88b3b674
Author: Sean King <seanking2919@protonmail.com>
Date: Mon, 11 Jul 2022 01:36:01 +0000
Merge branch 'from/edit-status/tusooa/indicator' into 'add/edit-status'
Edited indicator on status
See merge request seanking/pleroma-fe!4
Diffstat:
4 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/src/components/status/status.js b/src/components/status/status.js
@@ -392,6 +392,12 @@ const Status = {
},
visibilityLocalized () {
return this.$i18n.t('general.scope_in_timeline.' + this.status.visibility)
+ },
+ isEdited () {
+ return this.status.edited_at !== null
+ },
+ editingAvailable () {
+ return this.$store.state.instance.editingAvailable
}
},
methods: {
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
@@ -156,7 +156,8 @@
margin-right: 0.2em;
}
- & .heading-reply-row {
+ & .heading-reply-row,
+ & .heading-edited-row {
position: relative;
align-content: baseline;
font-size: 0.85em;
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
@@ -328,6 +328,30 @@
class="mentions-line"
/>
</div>
+ <div
+ v-if="isEdited && editingAvailable && !isPreview"
+ class="heading-edited-row"
+ >
+ <i18n-t
+ keypath="status.edited_at"
+ tag="span"
+ >
+ <template #time>
+ <i18n-t
+ keypath="time.in_past"
+ tag="span"
+ >
+ <template>
+ <Timeago
+ :time="status.edited_at"
+ :auto-update="60"
+ :long-format="true"
+ />
+ </template>
+ </i18n-t>
+ </template>
+ </i18n-t>
+ </div>
</div>
<StatusContent
diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -748,6 +748,7 @@
"repeats": "Repeats",
"delete": "Delete status",
"edit": "Edit status",
+ "edited_at": "(last edited {time})",
"pin": "Pin on profile",
"unpin": "Unpin from profile",
"pinned": "Pinned",