logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: 4361e15377bff93b9f5454264a2b2c7e21e81a8c
parent 3e4a8186a8368be1bc84053d6a6f494eda236739
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date:   Mon,  2 Jan 2023 16:27:01 +0000

Merge branch 'tusooa/backup-state' into 'develop'

Display detailed backup state

See merge request pleroma/pleroma-fe!1715

Diffstat:

Msrc/components/settings_modal/tabs/data_import_export_tab.vue10++++++++++
Msrc/i18n/en.json2++
2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/components/settings_modal/tabs/data_import_export_tab.vue b/src/components/settings_modal/tabs/data_import_export_tab.vue @@ -78,6 +78,16 @@ {{ $t('settings.download_backup') }} </a> <span + v-else-if="backup.state === 'running'" + > + {{ $tc('settings.backup_running', backup.processed_number, { number: backup.processed_number }) }} + </span> + <span + v-else-if="backup.state === 'failed'" + > + {{ $t('settings.backup_failed') }} + </span> + <span v-else > {{ $t('settings.backup_not_ready') }} diff --git a/src/i18n/en.json b/src/i18n/en.json @@ -391,6 +391,8 @@ "account_backup_table_head": "Backup", "download_backup": "Download", "backup_not_ready": "This backup is not ready yet.", + "backup_running": "This backup is in progress, processed {number} record. | This backup is in progress, processed {number} records.", + "backup_failed": "This backup has failed.", "remove_backup": "Remove", "list_backups_error": "Error fetching backup list: {error}", "add_backup": "Create a new backup",