Merge "Avoid Forcing the Translation of Translatable Variables"
This commit is contained in:
commit
33e9e35cd1
tacker
@ -511,8 +511,7 @@ class ExtensionManager(object):
|
||||
LOG.debug(_('Ext namespace: %s'), extension.get_namespace())
|
||||
LOG.debug(_('Ext updated: %s'), extension.get_updated())
|
||||
except AttributeError as ex:
|
||||
LOG.exception(_("Exception loading extension: %s"),
|
||||
six.text_type(ex))
|
||||
LOG.exception(_("Exception loading extension: %s"), ex)
|
||||
return False
|
||||
return True
|
||||
|
||||
|
@ -788,7 +788,7 @@ class Resource(Application):
|
||||
try:
|
||||
action_result = self.dispatch(request, action, args)
|
||||
except webob.exc.HTTPException as ex:
|
||||
LOG.info(_("HTTP exception thrown: %s"), six.text_type(ex))
|
||||
LOG.info(_("HTTP exception thrown: %s"), ex)
|
||||
action_result = Fault(ex,
|
||||
self._fault_body_function)
|
||||
except Exception:
|
||||
|
Loading…
x
Reference in New Issue
Block a user