diff --git a/deluge/core/core.py b/deluge/core/core.py index 277178466..e9117b1fd 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -150,22 +150,15 @@ class Core( self.register_introspection_functions() # Initialize gettext - 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.setlocale(locale.LC_ALL, '') + if hasattr(locale, "bindtextdomain"): + locale.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n")) + if hasattr(locale, "textdomain"): locale.textdomain("deluge") - - gettext.bindtextdomain("deluge", - pkg_resources.resource_filename( - "deluge", "i18n")) + gettext.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n")) gettext.textdomain("deluge") - gettext.install("deluge", - pkg_resources.resource_filename( - "deluge", "i18n")) + gettext.install("deluge", pkg_resources.resource_filename("deluge", "i18n")) + # Setup signals signal.signal(signal.SIGINT, self._shutdown) signal.signal(signal.SIGTERM, self._shutdown) diff --git a/deluge/ui/gtkui/gtkui.py b/deluge/ui/gtkui/gtkui.py index ced07edb2..3b0c9cd8f 100644 --- a/deluge/ui/gtkui/gtkui.py +++ b/deluge/ui/gtkui/gtkui.py @@ -102,22 +102,14 @@ class GtkUI: gobject.threads_init() # Initialize gettext - 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.setlocale(locale.LC_ALL, '') + if hasattr(locale, "bindtextdomain"): + locale.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n")) + if hasattr(locale, "textdomain"): locale.textdomain("deluge") - - gettext.bindtextdomain("deluge", - pkg_resources.resource_filename( - "deluge", "i18n")) + gettext.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n")) gettext.textdomain("deluge") - gettext.install("deluge", - pkg_resources.resource_filename( - "deluge", "i18n")) + gettext.install("deluge", pkg_resources.resource_filename("deluge", "i18n")) # Setup signals try: