Merge branch 'i18n' into l10n-fr

Conflicts:
	src/i18n.py
This commit is contained in:
Valentin Lorentz 2010-11-01 19:52:56 +01:00
commit 249eace2cf

View File

@ -306,6 +306,10 @@ def internationalizeDocstring(obj):
Only useful for commands (commands' docstring is displayed on IRC)"""
if sys.modules[obj.__module__].__dict__.has_key('_'):
internationalizedCommands.update({hash(obj): obj})
obj.__doc__=sys.modules[obj.__module__]._.__call__(obj.__doc__)
# We use _.__call__() instead of _() because of a pygettext warning.
return obj
try:
obj.__doc__=sys.modules[obj.__module__]._.__call__(obj.__doc__)
# We use _.__call__() instead of _() because of a pygettext warning.
except AttributeError:
# attribute '__doc__' of 'type' objects is not writable
pass
return obj