Rezzect/deluge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Continue starting Deluge if the gettext/locale initialization doesn't

Browse Source 
work.. It will now just print an Error message.
This commit is contained in:
Andrew Resch 2008-12-14 17:53:42 +00:00
parent 43e28ec9d5
commit 19b7369786
3 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
deluge/core/core.py
View File

@ -114,14 +114,17 @@ class Core(
self.register_introspection_functions() self.register_introspection_functions()
# Initialize gettext # Initialize gettext
locale.setlocale(locale.LC_ALL, '') try:
if hasattr(locale, "bindtextdomain"): locale.setlocale(locale.LC_ALL, '')
locale.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n")) if hasattr(locale, "bindtextdomain"):
if hasattr(locale, "textdomain"): locale.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n"))
locale.textdomain("deluge") if hasattr(locale, "textdomain"):
gettext.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n")) locale.textdomain("deluge")
gettext.textdomain("deluge") gettext.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n"))
gettext.install("deluge", pkg_resources.resource_filename("deluge", "i18n")) gettext.textdomain("deluge")
gettext.install("deluge", pkg_resources.resource_filename("deluge", "i18n"))
except Exception, e:
log.error("Unable to initialize gettext/locale: %s", e)
# Setup signals # Setup signals
signal.signal(signal.SIGINT, self._shutdown) signal.signal(signal.SIGINT, self._shutdown)

19
deluge/ui/gtkui/gtkui.py
View File

@ -118,14 +118,17 @@ class GtkUI:
gobject.threads_init() gobject.threads_init()
# Initialize gettext # Initialize gettext
locale.setlocale(locale.LC_ALL, '') try:
if hasattr(locale, "bindtextdomain"): locale.setlocale(locale.LC_ALL, '')
locale.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n")) if hasattr(locale, "bindtextdomain"):
if hasattr(locale, "textdomain"): locale.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n"))
locale.textdomain("deluge") if hasattr(locale, "textdomain"):
gettext.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n")) locale.textdomain("deluge")
gettext.textdomain("deluge") gettext.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n"))
gettext.install("deluge", pkg_resources.resource_filename("deluge", "i18n")) gettext.textdomain("deluge")
gettext.install("deluge", pkg_resources.resource_filename("deluge", "i18n"))
except Exception, e:
log.error("Unable to initialize gettext/locale: %s", e)
# Setup signals # Setup signals
try: try:

25
deluge/ui/webui/deluge_webserver.py
View File

@ -34,22 +34,17 @@ from webserver_common import CONFIG_DEFAULTS
config = ConfigManager("webui06.conf", CONFIG_DEFAULTS) config = ConfigManager("webui06.conf", CONFIG_DEFAULTS)
# Initialize gettext # Initialize gettext
if deluge.common.windows_check() or deluge.common.osx_check(): try:
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( locale.textdomain("deluge")
"deluge", "i18n")) gettext.bindtextdomain("deluge", pkg_resources.resource_filename("deluge", "i18n"))
locale.textdomain("deluge") gettext.textdomain("deluge")
gettext.install("deluge", pkg_resources.resource_filename("deluge", "i18n"))
gettext.bindtextdomain("deluge", except Exception, e:
pkg_resources.resource_filename( log.error("Unable to initialize gettext/locale: %s", e)
"deluge", "i18n"))
gettext.textdomain("deluge")
gettext.install("deluge",
pkg_resources.resource_filename(
"deluge", "i18n"))
components.register() #after gettext!! components.register() #after gettext!!