From: John Griffith <john.griffith@solidfire.com>
Date: Wed, 16 Oct 2013 02:51:07 +0000 (-0600)
Subject: Provide gettext _ in missing locations
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d80657c2ef1658e7383a12537e55b7e1a64fafac;p=openstack-build%2Fcinder-build.git

Provide gettext _ in missing locations

A while back a change was merged that moved
our shortcut for gettext out of __init__
(change here: If4125d6bcbde63df95de129ac5c83b4a6d6f130a)

This worked out fine for the most part but broke the sphinx doc
builder for a number of files.  This patch just adds the proper
import to each of these files to get the builder working correctly
again.

Change-Id: Ifed20d309566be456c9519294714ccb45de76e00
Closes-Bug: #1209406
---

diff --git a/cinder/api/v1/limits.py b/cinder/api/v1/limits.py
index a0a89078a..aeac101ed 100644
--- a/cinder/api/v1/limits.py
+++ b/cinder/api/v1/limits.py
@@ -30,6 +30,7 @@ import webob.exc
 from cinder.api.openstack import wsgi
 from cinder.api.views import limits as limits_views
 from cinder.api import xmlutil
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import importutils
 from cinder.openstack.common import jsonutils
 from cinder import quota
diff --git a/cinder/common/config.py b/cinder/common/config.py
index 634cbc905..4583acf41 100644
--- a/cinder/common/config.py
+++ b/cinder/common/config.py
@@ -32,6 +32,8 @@ import socket
 
 from oslo.config import cfg
 
+from cinder.openstack.common.gettextutils import _
+
 
 CONF = cfg.CONF
 
diff --git a/cinder/exception.py b/cinder/exception.py
index ef6da48eb..a73ff12c9 100644
--- a/cinder/exception.py
+++ b/cinder/exception.py
@@ -29,6 +29,7 @@ import sys
 from oslo.config import cfg
 import webob.exc
 
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 
diff --git a/cinder/policy.py b/cinder/policy.py
index 2beff0f19..0d766e20b 100644
--- a/cinder/policy.py
+++ b/cinder/policy.py
@@ -21,6 +21,7 @@
 from oslo.config import cfg
 
 from cinder import exception
+from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import policy
 from cinder import utils