mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-07 17:08:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean-up gettext code and make it more portable

Browse source
This commit is contained in:
Andrew Resch 2008-11-29 21:21:05 +00:00
commit 0fe3d4d1af
2 changed files with 13 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

19
deluge/core/core.py
View file

@ -150,22 +150,15 @@ class Core(
self.register_introspection_functions() self.register_introspection_functions()
# Initialize gettext # Initialize gettext
if deluge.common.windows_check() or deluge.common.osx_check():
locale.setlocale(locale.LC_ALL, '') locale.setlocale(locale.LC_ALL, '')
else: if hasattr(locale, "bindtextdomain"):
locale.setlocale(locale.LC_MESSAGES, '') locale.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n"))
locale.bindtextdomain("deluge", if hasattr(locale, "textdomain"):
pkg_resources.resource_filename(
"deluge", "i18n"))
locale.textdomain("deluge") 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.textdomain("deluge")
gettext.install("deluge", gettext.install("deluge", pkg_resources.resource_filename("deluge", "i18n"))
pkg_resources.resource_filename(
"deluge", "i18n"))
# Setup signals # Setup signals
signal.signal(signal.SIGINT, self._shutdown) signal.signal(signal.SIGINT, self._shutdown)
signal.signal(signal.SIGTERM, self._shutdown) signal.signal(signal.SIGTERM, self._shutdown)

18
deluge/ui/gtkui/gtkui.py
View file

@ -102,22 +102,14 @@ class GtkUI:
gobject.threads_init() gobject.threads_init()
# Initialize gettext # Initialize gettext
if deluge.common.windows_check() or deluge.common.osx_check():
locale.setlocale(locale.LC_ALL, '') locale.setlocale(locale.LC_ALL, '')
else: if hasattr(locale, "bindtextdomain"):
locale.setlocale(locale.LC_MESSAGES, '') locale.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n"))
locale.bindtextdomain("deluge", if hasattr(locale, "textdomain"):
pkg_resources.resource_filename(
"deluge", "i18n"))
locale.textdomain("deluge") 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.textdomain("deluge")
gettext.install("deluge", gettext.install("deluge", pkg_resources.resource_filename("deluge", "i18n"))
pkg_resources.resource_filename(
"deluge", "i18n"))
# Setup signals # Setup signals
try: try: