Deluge
diff options
| author | Andrew Resch <andrewresch@gmail.com> | 2008-11-29 21:21:05 +0000 |
|---|---|---|
| committer | Andrew Resch <andrewresch@gmail.com> | 2008-11-29 21:21:05 +0000 |
| commit | 0fe3d4d1af1cd733d760171cf0a99348f020fcfb (patch) | |
| tree | 58624de6c10a8bef2d0f9271b86a002863516082 | |
| parent | f42564b1aae979e2fd5f763ea1298deb269a3de1 (diff) | |
| download | deluge-0fe3d4d1af1cd733d760171cf0a99348f020fcfb.tar.gz deluge-0fe3d4d1af1cd733d760171cf0a99348f020fcfb.tar.bz2 deluge-0fe3d4d1af1cd733d760171cf0a99348f020fcfb.zip | |
Clean-up gettext code and make it more portable
| -rw-r--r-- | deluge/core/core.py | 21 | ||||
| -rw-r--r-- | deluge/ui/gtkui/gtkui.py | 20 |
2 files changed, 13 insertions, 28 deletions
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: |