ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-12 23:35:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: review from wolle, fix lint

Browse Source
This commit is contained in:
ogerly 2020-08-27 09:49:54 +02:00
parent 635b7e0d23
commit fde69a3b21
5 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webapp/components/ContentMenu/ContentMenu.vue
View File

@ -156,15 +156,6 @@ export default {
path: '/settings',
icon: 'edit',
})
if (this.isAdmin === true && !this.isOwner) {
routes.push({
label: this.$t(`settings.deleteUserAccount.name`),
callback: () => {
this.$emit('delete', this.resource)
},
icon: 'trash',
})
}
} else {
if (this.resource.isMuted) {
routes.push({

2
webapp/components/DeleteData/DeleteData.vue
View File

@ -11,7 +11,7 @@
<p v-show="enableDeletionValue" class="notice">
{{ $t('settings.deleteUserAccount.accountDescription') }}
</p>
<label v-if="currentUserCounts.contributionsCount" class="checkbox">
<label class="checkbox">
<input
type="checkbox"
v-model="deleteContributions"

26
webapp/components/Modal/DeleteUserModal.vue
View File

@ -13,24 +13,24 @@
</ds-flex-item>
<ds-flex-item width="20%">
<ds-text size="small">
<relative-date-time :date-time="userdata.createdAt" class="relative-date-time" />
<span class="bold">{{ $t('modals.deleteUser.created') }}</span>
<br />
{{ $t('modals.deleteUser.created') }}
<relative-date-time :date-time="userdata.createdAt" />
</ds-text>
</ds-flex-item>
<ds-flex-item width="15%">
<ds-number
size="small"
:count="userdata.contributionsCount"
:label="$t('common.post', null, userdata.contributionsCount)"
/>
<ds-text size="small">
<span class="bold">{{ $t('common.post', null, userdata.contributionsCount) }}</span>
<br />
{{ userdata.contributionsCount }}
</ds-text>
</ds-flex-item>
<ds-flex-item width="15%">
<ds-number
size="small"
:count="userdata.commentedCount"
:label="$t('common.comment', null, userdata.commentedCount)"
/>
<ds-text size="small">
<span class="bold">{{ $t('common.comment', null, userdata.commentedCount) }}</span>
<br />
{{ userdata.commentedCount }}
</ds-text>
</ds-flex-item>
</ds-flex>
</ds-section>
@ -176,7 +176,7 @@ export default {
z-index: $z-index-modal;
border-radius: $border-radius-x-large;
}
.relative-date-time {
.bold {
font-weight: 700;
}
</style>

2
webapp/locales/de.json
View File

@ -637,7 +637,7 @@
"deleteUserAccount": {
"accountDescription": "Sei dir bewusst, dass deine Beiträge und Kommentare für unsere Community wichtig sind. Wenn du sie trotzdem löschen möchtest, musst du sie unten markieren.",
"accountWarning": "Dein Konto, deine Beiträge oder Kommentare kannst du nach dem Löschen WEDER VERWALTEN NOCH WIEDERHERSTELLEN!",
"accountWarningAdmin": "Das Konto, die Beiträge oder Kommentare können nach dem Löschen WEDER VERWALTEN NOCH WIEDERHERGESTELLT WERDEN!",
"accountWarningAdmin": "Das Konto, die Beiträge oder Kommentare können nach dem Löschen WEDER VERWALTET NOCH WIEDERHERGESTELLT WERDEN!",
"accountWarningIsAdmin": "Achtung! Du löschst jetzt ein Benutzerkonto!",
"commentedCount": "Meinen {count} Kommentar löschen ::: Meine {count} Kommentare löschen",
"confirmDeleting": "Benutzerkonto jetzt löschen",

2
webapp/locales/en.json
View File

@ -642,7 +642,7 @@
"commentedCount": "Delete my {count} comment ::: Delete my {count} comments",
"confirmDeleting": "Delete user account now",
"contributionsCount": "Delete my {count} post ::: Delete my {count} posts",
"infoAdmin": "All contributions and comments of the user are additionally deleted!",
"infoAdmin": "All contributions and comments of the user will be deleted additionally!",
"name": "Delete user account",
"pleaseConfirm": "Destructive action! Type “{confirm}” to confirm.",
"success": "Account successfully deleted!"