summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorCerberus <matt.dietz@rackspace.com>2010-12-23 12:06:00 -0600
committerCerberus <matt.dietz@rackspace.com>2010-12-23 12:06:00 -0600
commitf6c616cb883ee6439ac0c1fa99816aede24a84e3 (patch)
treefa76564c46637c7895889cf7675a4fd04b60d67f /bin
parentba6a99f926180d47870dcb18e4387d18cddad9b0 (diff)
parenta0ab2ffca9a4a578115f36319bbd8640b0521cb0 (diff)
Merge from trunk
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-combined3
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/nova-combined b/bin/nova-combined
index c6a04f7e9..53322f1a0 100755
--- a/bin/nova-combined
+++ b/bin/nova-combined
@@ -22,6 +22,7 @@
import eventlet
eventlet.monkey_patch()
+import gettext
import os
import sys
@@ -33,6 +34,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
sys.path.insert(0, possible_topdir)
+gettext.install('nova', unicode=1)
+
from nova import api
from nova import flags
from nova import service