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

Misc typo / wording / readability

Browse source 
Co-Authored-By: decentral1se <lukewm@riseup.net>
This commit is contained in:
Alexandre Aubin 2019-09-28 16:11:44 +02:00 • committed by GitHub
parent ccc49a2b28
commit d159f7ff07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
locales/en.json
View file

@ -23,7 +23,7 @@
"app_incompatible": "The app {app} is incompatible with your YunoHost version", "app_incompatible": "The app {app} is incompatible with your YunoHost version",
"app_install_files_invalid": "These files cannot be installed", "app_install_files_invalid": "These files cannot be installed",
"app_install_failed": "Could not install {app}", "app_install_failed": "Could not install {app}",
"app_install_script_failed": "An error occured inside the app installation script.", "app_install_script_failed": "An error occured inside the app installation script",
"app_location_already_used": "The app '{app}' is already installed in ({path})", "app_location_already_used": "The app '{app}' is already installed in ({path})",
"app_make_default_location_already_used": "Can't make the app '{app}' the default on the domain, {domain} is already in use by the other app '{other_app}'", "app_make_default_location_already_used": "Can't make the app '{app}' the default on the domain, {domain} is already in use by the other app '{other_app}'",
"app_location_install_failed": "Cannot install the app there because it conflicts with the app '{other_app}' already installed in '{other_path}'", "app_location_install_failed": "Cannot install the app there because it conflicts with the app '{other_app}' already installed in '{other_path}'",

6
src/yunohost/app.py
View file

@ -915,7 +915,7 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
args=args_list, env=env_dict args=args_list, env=env_dict
)[0] )[0]
# "Common" app install failure : the script failed and returned exit code != 0 # "Common" app install failure : the script failed and returned exit code != 0
install_failed = (install_retcode != 0) install_failed = True if install_retcode != 0 else False
if install_failed: if install_failed:
error = m18n.n('app_install_script_failed') error = m18n.n('app_install_script_failed')
logger.exception(error) logger.exception(error)
@ -967,7 +967,7 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu
os.path.join(extracted_app_folder, 'scripts/remove'), os.path.join(extracted_app_folder, 'scripts/remove'),
args=[app_instance_name], env=env_dict_remove args=[app_instance_name], env=env_dict_remove
)[0] )[0]
# Here again, calling hook_exec could failed miserably, or get # Here again, calling hook_exec could fail miserably, or get
# manually interrupted (by mistake or because script was stuck) # manually interrupted (by mistake or because script was stuck)
# In that case we still want to proceed with the rest of the # In that case we still want to proceed with the rest of the
# removal (permissions, /etc/yunohost/apps/{app} ...) # removal (permissions, /etc/yunohost/apps/{app} ...)
@ -1085,7 +1085,7 @@ def app_remove(operation_logger, app):
ret = hook_exec('/tmp/yunohost_remove/scripts/remove', ret = hook_exec('/tmp/yunohost_remove/scripts/remove',
args=args_list, args=args_list,
env=env_dict)[0] env=env_dict)[0]
# Here again, calling hook_exec could failed miserably, or get # Here again, calling hook_exec could fail miserably, or get
# manually interrupted (by mistake or because script was stuck) # manually interrupted (by mistake or because script was stuck)
# In that case we still want to proceed with the rest of the # In that case we still want to proceed with the rest of the
# removal (permissions, /etc/yunohost/apps/{app} ...) # removal (permissions, /etc/yunohost/apps/{app} ...)