Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-10-16 13:08:21 +02:00
commit 39ba61bdbd
1 changed files with 2 additions and 3 deletions

View File

@ -41,8 +41,8 @@ from gi.repository import GLib
gi.require_version('Gdk', '3.0') gi.require_version('Gdk', '3.0')
BIN_DIRECTORY = os.path.dirname(os.path.realpath(__file__)) BIN_DIRECTORY = os.path.dirname(os.path.realpath(__file__))
HOME_DIRECTORY = os.path.expanduser('~') HOME_DIRECTORY = os.environ.get('HOME') or os.path.expanduser('~')
CONFIG_DIRECTORY = os.path.join(HOME_DIRECTORY, '.config/safeeyes') CONFIG_DIRECTORY = os.path.join(os.environ.get('XDG_CONFIG_HOME') or os.path.join(HOME_DIRECTORY, '.config'), 'safeeyes')
CONFIG_FILE_PATH = os.path.join(CONFIG_DIRECTORY, 'safeeyes.json') CONFIG_FILE_PATH = os.path.join(CONFIG_DIRECTORY, 'safeeyes.json')
CONFIG_RESOURCE = os.path.join(CONFIG_DIRECTORY, 'resource') CONFIG_RESOURCE = os.path.join(CONFIG_DIRECTORY, 'resource')
SESSION_FILE_PATH = os.path.join(CONFIG_DIRECTORY, 'session.json') SESSION_FILE_PATH = os.path.join(CONFIG_DIRECTORY, 'session.json')
@ -55,7 +55,6 @@ USER_PLUGINS_DIR = os.path.join(CONFIG_DIRECTORY, 'plugins')
LOCALE_PATH = os.path.join(BIN_DIRECTORY, 'config/locale') LOCALE_PATH = os.path.join(BIN_DIRECTORY, 'config/locale')
DESKTOP_ENVIRONMENT = None DESKTOP_ENVIRONMENT = None
def get_resource_path(resource_name): def get_resource_path(resource_name):
""" """
Return the user-defined resource if a system resource is overridden by the user. Return the user-defined resource if a system resource is overridden by the user.