diff options
Diffstat (limited to 'pyload')
| -rwxr-xr-x[-rw-r--r--] | pyload/Core.py | 0 | ||||
| -rw-r--r-- | pyload/__init__.py | 2 | ||||
| -rw-r--r-- | pyload/config/Setup.py | 8 | ||||
| -rw-r--r-- | pyload/utils/__init__.py | 10 |
4 files changed, 12 insertions, 8 deletions
diff --git a/pyload/Core.py b/pyload/Core.py index 9588c9485..9588c9485 100644..100755 --- a/pyload/Core.py +++ b/pyload/Core.py diff --git a/pyload/__init__.py b/pyload/__init__.py index e29c81ad7..c89e55a3c 100644 --- a/pyload/__init__.py +++ b/pyload/__init__.py @@ -84,7 +84,7 @@ try: except IOError: if os.name == "posix": - configdir = os.path.join(homedir, ".pyload") + configdir = os.path.join(homedir, ".pyload-beta") else: configdir = os.path.join(homedir, "pyload") diff --git a/pyload/config/Setup.py b/pyload/config/Setup.py index d2bcef9e5..7f5c0b0ed 100644 --- a/pyload/config/Setup.py +++ b/pyload/config/Setup.py @@ -457,13 +457,13 @@ class SetupAssistant(object): def print_dep(self, name, value, false="MISSING", true="OK"): """ Print Status of dependency """ if value and isinstance(value, basestring): - msg = "%(dep)-12s %(bool)s (%(info)s)" + info = ", ".join(value) else: - msg = "%(dep)-12s %(bool)s" + info = "" - print msg % {'dep': name + ':', + print "%(dep)-12s %(bool)s (%(info)s)" % {'dep': name + ':', 'bool': _(true if value else false).upper(), - 'info': ", ".join(value)} + 'info': info} def check_module(self, module): diff --git a/pyload/utils/__init__.py b/pyload/utils/__init__.py index bfcc48621..46b375e7a 100644 --- a/pyload/utils/__init__.py +++ b/pyload/utils/__init__.py @@ -8,7 +8,8 @@ import re import sys import time -from gettext import gettext +#from gettext import gettext +import pylgettext as gettext from htmlentitydefs import name2codepoint from os.path import join from string import maketrans @@ -252,11 +253,14 @@ def versiontuple(v): #: By kindall (http://stackoverflow.com/a/11887825) def load_translation(name, locale, default="en"): """ Load language and return its translation object or None """ + from traceback import print_exc + from os.path import join try: - gettext.setpaths([path.join(os.sep, "usr", "share", "pyload", "locale"), None]) - translation = gettext.translation(name, self.path("locale"), + gettext.setpaths([join(os.sep, "usr", "share", "pyload", "locale"), None]) + translation = gettext.translation(name, join(pypath, "locale"), languages=[locale, default], fallback=True) except Exception: + print_exc() return None else: translation.install(True) |