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

- "m18n.n"

Browse source
This commit is contained in:
Irina LAMBLA 2018-11-17 14:45:24 +01:00 • committed by Alexandre Aubin
parent fab662f4ef
commit 9eec09da81
2 changed files with 13 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/yunohost/backup.py
View file

@ -1083,15 +1083,9 @@ class RestoreManager():
return True return True
elif free_space > needed_space: elif free_space > needed_space:
# TODO Add --force options to avoid the error raising # TODO Add --force options to avoid the error raising
raise MoulinetteError(m18n.n('restore_may_be_not_enough_disk_space', raise MoulinetteError('restore_may_be_not_enough_disk_space', free_space=free_space, needed_space=needed_space, margin=margin)
free_space=free_space,
needed_space=needed_space,
margin=margin))
else: else:
raise MoulinetteError(m18n.n('restore_not_enough_disk_space', raise MoulinetteError('restore_not_enough_disk_space', free_space=free_space, needed_space=needed_space, margin=margin)
free_space=free_space,
needed_space=needed_space,
margin=margin))
########################################################################### ###########################################################################
# "Actual restore" (reverse step of the backup collect part) # # "Actual restore" (reverse step of the backup collect part) #
@ -1141,9 +1135,7 @@ class RestoreManager():
newlines.append(row) newlines.append(row)
except (IOError, OSError, csv.Error) as e: except (IOError, OSError, csv.Error) as e:
raise MoulinetteError(m18n.n('error_reading_file', raise MoulinetteError('error_reading_file', file=backup_csv, error=str(e))
file=backup_csv,
error=str(e)))
if not contains_php5: if not contains_php5:
return return

25
src/yunohost/settings.py
View file

@ -54,8 +54,7 @@ def settings_get(key, full=False):
settings = _get_settings() settings = _get_settings()
if key not in settings: if key not in settings:
raise MoulinetteError(m18n.n( raise MoulinetteError('global_settings_key_doesnt_exists', settings_key=key)
'global_settings_key_doesnt_exists', settings_key=key))
if full: if full:
return settings[key] return settings[key]
@ -101,18 +100,17 @@ def settings_set(key, value):
'global_settings_bad_type_for_setting', setting=key, 'global_settings_bad_type_for_setting', setting=key,
received_type=type(value).__name__, expected_type=key_type)) received_type=type(value).__name__, expected_type=key_type))
else: else:
raise MoulinetteError(m18n.n('global_settings_bad_type_for_setting', setting=key, raise MoulinetteError('global_settings_bad_type_for_setting', setting=key,
received_type=type(value).__name__, expected_type=key_type)) received_type=type(value).__name__, expected_type=key_type)
elif key_type == "string": elif key_type == "string":
if not isinstance(value, basestring): if not isinstance(value, basestring):
raise MoulinetteError(m18n.n('global_settings_bad_type_for_setting', setting=key, raise MoulinetteError('global_settings_bad_type_for_setting', setting=key,
received_type=type(value).__name__, expected_type=key_type)) received_type=type(value).__name__, expected_type=key_type)
elif key_type == "enum": elif key_type == "enum":
if value not in settings[key]["choices"]: if value not in settings[key]["choices"]:
raise MoulinetteError(m18n.n( raise MoulinetteError('global_settings_bad_choice_for_enum', setting=key,
'global_settings_bad_choice_for_enum', setting=key,
received_type=type(value).__name__, received_type=type(value).__name__,
expected_type=", ".join(settings[key]["choices"]))) expected_type=", ".join(settings[key]["choices"]))
else: else:
raise MoulinetteError('global_settings_unknown_type', setting=key, raise MoulinetteError('global_settings_unknown_type', setting=key,
unknown_type=key_type) unknown_type=key_type)
@ -209,8 +207,7 @@ def _get_settings():
setting_key=key)) setting_key=key))
unknown_settings[key] = value unknown_settings[key] = value
except Exception as e: except Exception as e:
raise MoulinetteError(m18n.n('global_settings_cant_open_settings', reason=e), raise MoulinetteError('global_settings_cant_open_settings', reason=e, exc_info=1)
exc_info=1)
if unknown_settings: if unknown_settings:
try: try:
@ -231,12 +228,10 @@ def _save_settings(settings, location=SETTINGS_PATH):
try: try:
result = json.dumps(settings_without_description, indent=4) result = json.dumps(settings_without_description, indent=4)
except Exception as e: except Exception as e:
raise MoulinetteError(m18n.n('global_settings_cant_serialize_settings', reason=e), raise MoulinetteError('global_settings_cant_serialize_settings', reason=e, exc_info=1)
exc_info=1)
try: try:
with open(location, "w") as settings_fd: with open(location, "w") as settings_fd:
settings_fd.write(result) settings_fd.write(result)
except Exception as e: except Exception as e:
raise MoulinetteError(m18n.n('global_settings_cant_write_settings', reason=e), raise MoulinetteError('global_settings_cant_write_settings', reason=e, exc_info=1)
exc_info=1)