diff options
| author | Mohamed Elashri <muhammadelashri@gmail.com> | 2022-09-30 23:06:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-30 23:06:54 +0000 |
| commit | 8d5653e60d5299979c0de5e55b1c5ca0bee8190c (patch) | |
| tree | 8dc02b7663a5c9c91b09483e4499a612d9823698 /searx/settings_loader.py | |
| parent | 212c98c9f55dc602f57b4f01a73192450e9782b7 (diff) | |
| parent | 62324655ff0d2e6f234b3e31413877b4b4a7a9fa (diff) | |
Merge branch 'searxng:master' into master
Diffstat (limited to 'searx/settings_loader.py')
| -rw-r--r-- | searx/settings_loader.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/searx/settings_loader.py b/searx/settings_loader.py index 0a6ec9080..777b25171 100644 --- a/searx/settings_loader.py +++ b/searx/settings_loader.py @@ -121,10 +121,10 @@ def is_use_default_settings(user_settings): raise ValueError('Invalid value for use_default_settings') -def load_settings(load_user_setttings=True): +def load_settings(load_user_settings=True): default_settings_path = get_default_settings_path() user_settings_path = get_user_settings_path() - if user_settings_path is None or not load_user_setttings: + if user_settings_path is None or not load_user_settings: # no user settings return (load_yaml(default_settings_path), 'load the default settings from {}'.format(default_settings_path)) @@ -136,7 +136,7 @@ def load_settings(load_user_setttings=True): update_settings(default_settings, user_settings) return ( default_settings, - 'merge the default settings ( {} ) and the user setttings ( {} )'.format( + 'merge the default settings ( {} ) and the user settings ( {} )'.format( default_settings_path, user_settings_path ), ) |