diff --git a/deluge/core/core.py b/deluge/core/core.py index b2671f3be..b6ac437f9 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -157,7 +157,7 @@ class Core( self.register_introspection_functions() # Initialize gettext - if deluge.common.windows_check(): + if deluge.common.windows_check() or deluge.common.osx_check(): locale.setlocale(locale.LC_ALL, '') else: locale.setlocale(locale.LC_MESSAGES, '') diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index 1d4497b1f..d75765518 100644 --- a/deluge/ui/gtkui/gtkui.py +++ b/deluge/ui/gtkui/gtkui.py @@ -110,7 +110,7 @@ class GtkUI: gobject.threads_init() # Initialize gettext - if deluge.common.windows_check(): + if deluge.common.windows_check() or deluge.common.osx_check(): locale.setlocale(locale.LC_ALL, '') else: locale.setlocale(locale.LC_MESSAGES, '') diff --git a/deluge/ui/webui/deluge_webserver.py b/deluge/ui/webui/deluge_webserver.py index beb91d019..ffe5b71ce 100644 --- a/deluge/ui/webui/deluge_webserver.py +++ b/deluge/ui/webui/deluge_webserver.py @@ -31,6 +31,7 @@ import web import random import gettext import locale +import deluge.common from deluge.configmanager import ConfigManager import pkg_resources from deluge.ui.client import sclient @@ -38,11 +39,15 @@ import components from deluge.log import LOG as log # Initialize gettext -locale.setlocale(locale.LC_MESSAGES, '') -locale.bindtextdomain("deluge", +if deluge.common.windows_check() or deluge.common.osx_check(): + locale.setlocale(locale.LC_ALL, '') +else: + locale.setlocale(locale.LC_MESSAGES, '') + locale.bindtextdomain("deluge", pkg_resources.resource_filename( "deluge", "i18n")) -locale.textdomain("deluge") + locale.textdomain("deluge") + gettext.bindtextdomain("deluge", pkg_resources.resource_filename( "deluge", "i18n"))