Merge remote-tracking branch 'origin/main'

This commit is contained in:
Andrea Vos 2023-06-26 08:34:09 +02:00
commit 8b024a917c
2 changed files with 12 additions and 3 deletions

View File

@ -205,15 +205,24 @@
banProposals: [], banProposals: [],
modMessageTemplates: { modMessageTemplates: {
termsWarning: `Hi! 'Generic content warning': `Hi!
The following content is in breach of our TOS which can be found at https://en.pronouns.page/terms The following content is in breach of our Terms of Service (https://en.pronouns.page/terms):
<insert context & more info here> <insert context & more info here>
To keep our platform safe and inclusive, please remove this content. To keep our platform safe and inclusive, please remove this content.
Thanks!`, Thanks!`,
'Suicide encouragement warning': `Hi!
<describe the suicide encouragement content here>
Suicide encouragement is prohibited by our Terms of Service (https://en.pronouns.page/terms).
To keep our platform safe and inclusive, please remove this content.
Thanks!
`
} }
} }
}, },

View File

@ -9,7 +9,7 @@
<T>admin.header</T> <T>admin.header</T>
</h2> </h2>
<p class="small"><em> <p class="small" v-if="stats.calculatedAt != null"><em>
Stats calculated at: Stats calculated at:
<span :class="stats.calculatedAt < (new Date() - 24*60*60*1000) / 1000 ? `badge bg-danger text-white` : ''"> <span :class="stats.calculatedAt < (new Date() - 24*60*60*1000) / 1000 ? `badge bg-danger text-white` : ''">
{{$datetime(stats.calculatedAt)}} {{$datetime(stats.calculatedAt)}}