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

[enh] Add some translations and start uo

Browse source
This commit is contained in:
ljf 2018-06-04 19:18:11 +02:00
parent a20281ebfc
commit 793b4d2f88
3 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
locales/en.json
View file

@ -209,12 +209,18 @@
"log_category_404": "The log category '{category}' does not exist", "log_category_404": "The log category '{category}' does not exist",
"log_does_exists": "There is not operation log with the name '{log}', use 'yunohost log list to see all available operation logs'", "log_does_exists": "There is not operation log with the name '{log}', use 'yunohost log list to see all available operation logs'",
"log_operation_unit_unclosed_properly": "Operation unit has not been closed properly", "log_operation_unit_unclosed_properly": "Operation unit has not been closed properly",
"log_app_addaccess": "Add access to '{}'",
"log_app_removeaccess": "Remove access to '{}'",
"log_app_clearaccess": "Remove all access to '{}'",
"log_app_removelist": "Remove an application list", "log_app_removelist": "Remove an application list",
"log_app_change_url": "Change the url of '{}' application", "log_app_change_url": "Change the url of '{}' application",
"log_app_install": "Install '{}' application", "log_app_install": "Install '{}' application",
"log_app_remove": "Remove '{}' application", "log_app_remove": "Remove '{}' application",
"log_app_upgrade": "Upgrade '{}' application", "log_app_upgrade": "Upgrade '{}' application",
"log_app_makedefault": "Make '{}' as default application", "log_app_makedefault": "Make '{}' as default application",
"log_backup_restore_system": "Restore system from a backup archive",
"log_backup_restore_app": "Restore '{}' from a backup archive",
"log_remove_on_failed_restore": "Remove '{}' after a failed restore from a backup archive",
"log_domain_add": "Add '{}' domain into system configuration", "log_domain_add": "Add '{}' domain into system configuration",
"log_domain_remove": "Remove '{}' domain from system configuration", "log_domain_remove": "Remove '{}' domain from system configuration",
"log_dyndns_subscribe": "Subscribe to a YunoHost subdomain '{}'", "log_dyndns_subscribe": "Subscribe to a YunoHost subdomain '{}'",
@ -222,10 +228,13 @@
"log_letsencrypt_cert_install": "Install Let's encrypt certificate on '{}' domain", "log_letsencrypt_cert_install": "Install Let's encrypt certificate on '{}' domain",
"log_selfsigned_cert_install": "Install self signed certificate on '{}' domain", "log_selfsigned_cert_install": "Install self signed certificate on '{}' domain",
"log_letsencrypt_cert_renew": "Renew '{}' Let's encrypt certificate", "log_letsencrypt_cert_renew": "Renew '{}' Let's encrypt certificate",
"log_service_regen_conf": "Regenerate system configurations '{}'",
"log_user_create": "Add '{}' user", "log_user_create": "Add '{}' user",
"log_user_delete": "Delete '{}' user", "log_user_delete": "Delete '{}' user",
"log_user_update": "Update information of '{}' user", "log_user_update": "Update information of '{}' user",
"log_tools_maindomain": "Make '{}' as main domain", "log_tools_maindomain": "Make '{}' as main domain",
"log_tools_migrations_migrate_forward": "Migrate forward",
"log_tools_migrations_migrate_backward": "Migrate backward",
"log_tools_postinstall": "Postinstall your YunoHost server", "log_tools_postinstall": "Postinstall your YunoHost server",
"log_tools_upgrade": "Upgrade debian packages", "log_tools_upgrade": "Upgrade debian packages",
"log_tools_shutdown": "Shutdown your server", "log_tools_shutdown": "Shutdown your server",

3
src/yunohost/app.py
View file

@ -800,6 +800,7 @@ def app_install(uo, auth, app, label=None, args=None, no_remove_on_failure=False
uo_remove = UnitOperation('remove_on_failed_install', uo_remove = UnitOperation('remove_on_failed_install',
[('app', app_instance_name)], [('app', app_instance_name)],
env=env_dict_remove) env=env_dict_remove)
uo_remove.start()
remove_retcode = hook_exec( remove_retcode = hook_exec(
os.path.join(extracted_app_folder, 'scripts/remove'), os.path.join(extracted_app_folder, 'scripts/remove'),
@ -950,6 +951,7 @@ def app_addaccess(auth, apps, users=[]):
allowed_users.add(allowed_user) allowed_users.add(allowed_user)
uo.related_to.add(('user', allowed_user)) uo.related_to.add(('user', allowed_user))
uo.flush()
new_users = ','.join(allowed_users) new_users = ','.join(allowed_users)
app_setting(app, 'allowed_users', new_users) app_setting(app, 'allowed_users', new_users)
hook_callback('post_app_addaccess', args=[app, new_users]) hook_callback('post_app_addaccess', args=[app, new_users])
@ -1010,6 +1012,7 @@ def app_removeaccess(auth, apps, users=[]):
allowed_users.add(allowed_user) allowed_users.add(allowed_user)
uo.related_to += [ ('user', x) for x in allowed_users ] uo.related_to += [ ('user', x) for x in allowed_users ]
uo.flush()
new_users = ','.join(allowed_users) new_users = ','.join(allowed_users)
app_setting(app, 'allowed_users', new_users) app_setting(app, 'allowed_users', new_users)
hook_callback('post_app_removeaccess', args=[app, new_users]) hook_callback('post_app_removeaccess', args=[app, new_users])

2
src/yunohost/backup.py
View file

@ -1133,6 +1133,7 @@ class RestoreManager():
env_dict = self._get_env_var() env_dict = self._get_env_var()
uo.extra.env = env_dict uo.extra.env = env_dict
uo.flush()
ret = hook_callback('restore', ret = hook_callback('restore',
system_targets, system_targets,
args=[self.work_dir], args=[self.work_dir],
@ -1247,6 +1248,7 @@ class RestoreManager():
env_dict = self._get_env_var(app_instance_name) env_dict = self._get_env_var(app_instance_name)
uo.extra.env = env_dict uo.extra.env = env_dict
uo.flush()
# Execute app restore script # Execute app restore script
hook_exec(restore_script, hook_exec(restore_script,