Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-02-17 13:02:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Load default settings before parsing for any alternate config. Reload strings if an alternate config was passed in after

Browse Source
This commit is contained in:
Miguel Jacq 2018-10-01 15:32:53 +10:00
parent 9aa9dc39a1
commit 7e8a76be8a
No known key found for this signature in database
GPG Key ID: EEA4341C6D97A0B6
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
onionshare/__init__.py
View File

@ -33,8 +33,12 @@ def main(cwd=None):
"""
common = Common()
# Load settings right away, in order to get locale setting for strings
common.load_settings(config)
# Load the default settings and strings early, for the sake of being able to parse options.
# These won't be in the user's chosen locale necessarily, but we need to parse them
# early in order to even display the option to pass alternate settings (which might
# contain a preferred locale).
# If an alternate --config is passed, we'll reload strings later.
common.load_settings()
strings.load_strings(common)
# Display OnionShare banner
@ -95,6 +99,8 @@ def main(cwd=None):
# Re-load settings, if a custom config was passed in
if config:
common.load_settings(config)
# Re-load the strings, in case the provided config has changed locale
strings.load_strings(common)
# Debug mode?
common.debug = debug

10
onionshare_gui/__init__.py
View File

@ -59,7 +59,11 @@ def main():
common = Common()
common.define_css()
# Load settings right away, in order to get locale setting for strings
# Load the default settings and strings early, for the sake of being able to parse options.
# These won't be in the user's chosen locale necessarily, but we need to parse them
# early in order to even display the option to pass alternate settings (which might
# contain a preferred locale).
# If an alternate --config is passed, we'll reload strings later.
common.load_settings()
strings.load_strings(common)
@ -88,6 +92,10 @@ def main():
filenames[i] = os.path.abspath(filenames[i])
config = args.config
if config:
# Re-load the strings, in case the provided config has changed locale
common.load_settings(config)
strings.load_strings(common)
local_only = bool(args.local_only)
debug = bool(args.debug)