From: Russell Bryant <rbryant@redhat.com>
Date: Mon, 2 Jul 2012 15:30:10 +0000 (-0400)
Subject: Add missing gettextutils from openstack-common.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=84b7025547455d1f83d0fc20c7b9de0a3291f9e6;p=openstack-build%2Fcinder-build.git

Add missing gettextutils from openstack-common.

This patch adds gettextutils from openstack-common to cinder.  It is used
by rpc, so some parts of rpc are broken without this patch.

Change-Id: I0830319f4e2011b87180abcc24354c935bea8d16
---

diff --git a/cinder/openstack/common/gettextutils.py b/cinder/openstack/common/gettextutils.py
new file mode 100644
index 000000000..235350cc4
--- /dev/null
+++ b/cinder/openstack/common/gettextutils.py
@@ -0,0 +1,33 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2012 Red Hat, Inc.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+"""
+gettext for openstack-common modules.
+
+Usual usage in an openstack.common module:
+
+    from openstack.common.gettextutils import _
+"""
+
+import gettext
+
+
+t = gettext.translation('openstack-common', 'locale', fallback=True)
+
+
+def _(msg):
+    return t.ugettext(msg)
diff --git a/openstack-common.conf b/openstack-common.conf
index febc2366e..89073e70d 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
 
 # The list of modules to copy from openstack-common
-modules=cfg,exception,excutils,importutils,iniparser,jsonutils,local,timeutils
+modules=cfg,exception,excutils,gettextutils,importutils,iniparser,jsonutils,local,timeutils
 
 # The base module to hold the copy of openstack.common
 base=cinder