diff options
| author | Micah Lee <micah@micahflee.com> | 2018-12-18 19:21:50 -0800 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2018-12-18 19:21:50 -0800 |
| commit | 187b7887fd475ba3c1559d946bad9aa774338611 (patch) | |
| tree | c771786e7a3991176b2722e3d886857bc9969b3b | |
| parent | a06bb0878f5a7c0ebf20ceff48f278b9ae5e5e1a (diff) | |
| parent | e6f26f65459489de6c59dda8bc8e4abc213ba762 (diff) | |
| download | onionshare-187b7887fd475ba3c1559d946bad9aa774338611.tar.gz onionshare-187b7887fd475ba3c1559d946bad9aa774338611.zip | |
Merge branch '846_mac_packaging' into 406_osx_sandbox
| -rw-r--r-- | install/Info.plist | 18 | ||||
| -rw-r--r-- | install/get-tor-osx.py | 6 | ||||
| -rw-r--r-- | onionshare/settings.py | 14 |
3 files changed, 16 insertions, 22 deletions
diff --git a/install/Info.plist b/install/Info.plist deleted file mode 100644 index 0125c1d5..00000000 --- a/install/Info.plist +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> -<dict> - <key>CFBundleDevelopmentRegion</key> - <string>English</string> - <key>CFBundleExecutable</key> - <string>onionshare-gui</string> - <key>CFBundleIdentifier</key> - <string>com.micahflee.onionshare</string> - <key>NSHighResolutionCapable</key> - <true/> - <key>CFBundleShortVersionString</key> - <string>{VERSION}</string> - <key>CFBundleIconFile</key> - <string>icon.icns</string> -</dict> -</plist> diff --git a/install/get-tor-osx.py b/install/get-tor-osx.py index ae20fd74..61c2a4bf 100644 --- a/install/get-tor-osx.py +++ b/install/get-tor-osx.py @@ -35,9 +35,9 @@ import subprocess import requests def main(): - dmg_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/8.0.1/TorBrowser-8.0.1-osx64_en-US.dmg' - dmg_filename = 'TorBrowser-8.0.1-osx64_en-US.dmg' - expected_dmg_sha256 = 'fb1be2a0f850a65bae38747c3abbf9061742c5d7799e1693405078aaf38d2b08' + dmg_url = 'https://archive.torproject.org/tor-package-archive/torbrowser/8.0.4/TorBrowser-8.0.4-osx64_en-US.dmg' + dmg_filename = 'TorBrowser-8.0.4-osx64_en-US.dmg' + expected_dmg_sha256 = '44433ee2052cf3062e0dc29e640a6ae50db2775bc8939253f5f9d81614f2db07' # Build paths root_path = os.path.dirname(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) diff --git a/onionshare/settings.py b/onionshare/settings.py index 00ba7d67..a1d96d26 100644 --- a/onionshare/settings.py +++ b/onionshare/settings.py @@ -112,7 +112,19 @@ class Settings(object): # Choose the default locale based on the OS preference, and fall-back to English if self._settings['locale'] is None: - default_locale = locale.getdefaultlocale()[0][:2] + language_code, encoding = locale.getdefaultlocale() + + # Default to English + if not language_code: + language_code = 'en_US' + + if language_code == 'pt_PT' and language_code == 'pt_BR': + # Portuguese locales include country code + default_locale = language_code + else: + # All other locales cut off the country code + default_locale = language_code[:2] + if default_locale not in self.available_locales: default_locale = 'en' self._settings['locale'] = default_locale |