From 9eec09da81e6927e03f459b8c9b7f58f07a182f5 Mon Sep 17 00:00:00 2001 From: Irina LAMBLA Date: Sat, 17 Nov 2018 14:45:24 +0100 Subject: [PATCH] - "m18n.n" --- src/yunohost/backup.py | 14 +++----------- src/yunohost/settings.py | 25 ++++++++++--------------- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py index 84d89dbca..08544a1a6 100644 --- a/src/yunohost/backup.py +++ b/src/yunohost/backup.py @@ -1083,15 +1083,9 @@ class RestoreManager(): return True elif free_space > needed_space: # TODO Add --force options to avoid the error raising - raise MoulinetteError(m18n.n('restore_may_be_not_enough_disk_space', - free_space=free_space, - needed_space=needed_space, - margin=margin)) + raise MoulinetteError('restore_may_be_not_enough_disk_space', free_space=free_space, needed_space=needed_space, margin=margin) else: - raise MoulinetteError(m18n.n('restore_not_enough_disk_space', - free_space=free_space, - needed_space=needed_space, - margin=margin)) + raise MoulinetteError('restore_not_enough_disk_space', free_space=free_space, needed_space=needed_space, margin=margin) ########################################################################### # "Actual restore" (reverse step of the backup collect part) # @@ -1141,9 +1135,7 @@ class RestoreManager(): newlines.append(row) except (IOError, OSError, csv.Error) as e: - raise MoulinetteError(m18n.n('error_reading_file', - file=backup_csv, - error=str(e))) + raise MoulinetteError('error_reading_file', file=backup_csv, error=str(e)) if not contains_php5: return diff --git a/src/yunohost/settings.py b/src/yunohost/settings.py index ca9a98561..5d875afb9 100644 --- a/src/yunohost/settings.py +++ b/src/yunohost/settings.py @@ -54,8 +54,7 @@ def settings_get(key, full=False): settings = _get_settings() if key not in settings: - raise MoulinetteError(m18n.n( - 'global_settings_key_doesnt_exists', settings_key=key)) + raise MoulinetteError('global_settings_key_doesnt_exists', settings_key=key) if full: return settings[key] @@ -101,18 +100,17 @@ def settings_set(key, value): 'global_settings_bad_type_for_setting', setting=key, received_type=type(value).__name__, expected_type=key_type)) else: - raise MoulinetteError(m18n.n('global_settings_bad_type_for_setting', setting=key, - received_type=type(value).__name__, expected_type=key_type)) + raise MoulinetteError('global_settings_bad_type_for_setting', setting=key, + received_type=type(value).__name__, expected_type=key_type) elif key_type == "string": if not isinstance(value, basestring): - raise MoulinetteError(m18n.n('global_settings_bad_type_for_setting', setting=key, - received_type=type(value).__name__, expected_type=key_type)) + raise MoulinetteError('global_settings_bad_type_for_setting', setting=key, + received_type=type(value).__name__, expected_type=key_type) elif key_type == "enum": if value not in settings[key]["choices"]: - raise MoulinetteError(m18n.n( - 'global_settings_bad_choice_for_enum', setting=key, + raise MoulinetteError('global_settings_bad_choice_for_enum', setting=key, received_type=type(value).__name__, - expected_type=", ".join(settings[key]["choices"]))) + expected_type=", ".join(settings[key]["choices"])) else: raise MoulinetteError('global_settings_unknown_type', setting=key, unknown_type=key_type) @@ -209,8 +207,7 @@ def _get_settings(): setting_key=key)) unknown_settings[key] = value except Exception as e: - raise MoulinetteError(m18n.n('global_settings_cant_open_settings', reason=e), - exc_info=1) + raise MoulinetteError('global_settings_cant_open_settings', reason=e, exc_info=1) if unknown_settings: try: @@ -231,12 +228,10 @@ def _save_settings(settings, location=SETTINGS_PATH): try: result = json.dumps(settings_without_description, indent=4) except Exception as e: - raise MoulinetteError(m18n.n('global_settings_cant_serialize_settings', reason=e), - exc_info=1) + raise MoulinetteError('global_settings_cant_serialize_settings', reason=e, exc_info=1) try: with open(location, "w") as settings_fd: settings_fd.write(result) except Exception as e: - raise MoulinetteError(m18n.n('global_settings_cant_write_settings', reason=e), - exc_info=1) + raise MoulinetteError('global_settings_cant_write_settings', reason=e, exc_info=1)