YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

backup: add name of the backup in create/delete message, otherwise that creates some spooky messages with 'Backup created' directly followed by 'Backup deleted' during safety-backup-before-upgrade in v2 apps

Browse source
This commit is contained in:
Alexandre Aubin 2023-02-02 23:09:58 +01:00
parent 3110460a40
commit 8090acb158
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
locales/en.json
View file

@ -102,14 +102,14 @@
"backup_copying_to_organize_the_archive": "Copying {size}MB to organize the archive", "backup_copying_to_organize_the_archive": "Copying {size}MB to organize the archive",
"backup_couldnt_bind": "Could not bind {src} to {dest}.", "backup_couldnt_bind": "Could not bind {src} to {dest}.",
"backup_create_size_estimation": "The archive will contain about {size} of data.", "backup_create_size_estimation": "The archive will contain about {size} of data.",
"backup_created": "Backup created", "backup_created": "Backup created: {name}",
"backup_creation_failed": "Could not create the backup archive", "backup_creation_failed": "Could not create the backup archive",
"backup_csv_addition_failed": "Could not add files to backup into the CSV file", "backup_csv_addition_failed": "Could not add files to backup into the CSV file",
"backup_csv_creation_failed": "Could not create the CSV file needed for restoration", "backup_csv_creation_failed": "Could not create the CSV file needed for restoration",
"backup_custom_backup_error": "Custom backup method could not get past the 'backup' step", "backup_custom_backup_error": "Custom backup method could not get past the 'backup' step",
"backup_custom_mount_error": "Custom backup method could not get past the 'mount' step", "backup_custom_mount_error": "Custom backup method could not get past the 'mount' step",
"backup_delete_error": "Could not delete '{path}'", "backup_delete_error": "Could not delete '{path}'",
"backup_deleted": "Backup deleted", "backup_deleted": "Backup deleted: {name}",
"backup_hook_unknown": "The backup hook '{hook}' is unknown", "backup_hook_unknown": "The backup hook '{hook}' is unknown",
"backup_method_copy_finished": "Backup copy finalized", "backup_method_copy_finished": "Backup copy finalized",
"backup_method_custom_finished": "Custom backup method '{method}' finished", "backup_method_custom_finished": "Custom backup method '{method}' finished",
@ -752,4 +752,4 @@
"yunohost_installing": "Installing YunoHost...", "yunohost_installing": "Installing YunoHost...",
"yunohost_not_installed": "YunoHost is not correctly installed. Please run 'yunohost tools postinstall'", "yunohost_not_installed": "YunoHost is not correctly installed. Please run 'yunohost tools postinstall'",
"yunohost_postinstall_end_tip": "The post-install completed! To finalize your setup, please consider:\n - diagnose potential issues through the 'Diagnosis' section of the webadmin (or 'yunohost diagnosis run' in command-line);\n - reading the 'Finalizing your setup' and 'Getting to know YunoHost' parts in the admin documentation: https://yunohost.org/admindoc." "yunohost_postinstall_end_tip": "The post-install completed! To finalize your setup, please consider:\n - diagnose potential issues through the 'Diagnosis' section of the webadmin (or 'yunohost diagnosis run' in command-line);\n - reading the 'Finalizing your setup' and 'Getting to know YunoHost' parts in the admin documentation: https://yunohost.org/admindoc."
} }

4
src/backup.py
View file

@ -2295,7 +2295,7 @@ def backup_create(
) )
backup_manager.backup() backup_manager.backup()
logger.success(m18n.n("backup_created")) logger.success(m18n.n("backup_created", name=name))
operation_logger.success() operation_logger.success()
return { return {
@ -2622,7 +2622,7 @@ def backup_delete(name):
hook_callback("post_backup_delete", args=[name]) hook_callback("post_backup_delete", args=[name])
logger.success(m18n.n("backup_deleted")) logger.success(m18n.n("backup_deleted", name=name))
# #