R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[utils] Check .mo files instead of directories in root dirs

Browse Source 
For example, nosetests imports yuotube_dl, get_root_dir() returns /usr
and the current directory. /usr/share/locale is picked in the original
implementation.
This commit is contained in:
Yen Chi Hsuan 2015-12-26 05:05:19 +08:00
parent 163f0a511c
commit a5f07800dd
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
youtube_dl/utils.py
View File

@ -2538,10 +2538,13 @@ class I18N(object):
else: else:
lang, _ = locale.getdefaultlocale() lang, _ = locale.getdefaultlocale()
try: for root in get_root_dirs():
t = gettext.translation(self.domain, find_file_in_root('share/locale/'), [lang]) try:
except (OSError, IOError): # OSError for 3.3+ and IOError otherwise t = gettext.translation(self.domain, os.path.join(root, 'share', 'locale'), [lang])
t = None if t is not None:
break
except (OSError, IOError): # OSError for 3.3+ and IOError otherwise
t = None
if t is None and sys.platform == 'win32' and hasattr(sys, 'frozen'): if t is None and sys.platform == 'win32' and hasattr(sys, 'frozen'):
locale_data_zip = _load_exe_resource('LOCALE_DATA', 'LOCALE_DATA.ZIP') locale_data_zip = _load_exe_resource('LOCALE_DATA', 'LOCALE_DATA.ZIP')
@ -2585,13 +2588,6 @@ def get_root_dirs():
return map(decodeFilename, ret) return map(decodeFilename, ret)
def find_file_in_root(file_path):
for root in get_root_dirs():
full_path = os.path.join(root, file_path)
if os.path.exists(full_path):
return full_path
class PerRequestProxyHandler(compat_urllib_request.ProxyHandler): class PerRequestProxyHandler(compat_urllib_request.ProxyHandler):
def __init__(self, proxies=None): def __init__(self, proxies=None):
# Set default handlers # Set default handlers