From 19c5ec76464568252f8ca0eae28849b2797111c3 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Wed, 25 May 2016 13:12:12 +0900 Subject: [PATCH] Drop neutron/i18n.py in favor of neutron/_i18n.py The hacking rule already ensures everyone uses neutron._i18n. Now we can drop neutron.i18n. Closes-Bug: #1520094 Change-Id: I1a415c23fd1db103742e8f3a92a3dd26c7252233 --- doc/source/devref/i18n.rst | 6 ++---- neutron/i18n.py | 29 ----------------------------- 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 neutron/i18n.py diff --git a/doc/source/devref/i18n.rst b/doc/source/devref/i18n.rst index 15788dcad9c..8bc6856abce 100644 --- a/doc/source/devref/i18n.rst +++ b/doc/source/devref/i18n.rst @@ -27,11 +27,9 @@ Neutron Stadium i18n * Refer to oslo_i18n documentation for the general mechanisms that should be used: http://docs.openstack.org/developer/oslo.i18n/usage.html -* Do NOT use the _i18n module in neutron-lib or neutron. +* Each stadium project should NOT consume _i18n module from neutron-lib + or neutron. * It is recommended that you create a {package_name}/_i18n.py file in your repo, and use that. Your localization strings will also live in your repo. - -* The neutron.i18n module will be around for a release or two, with - shared localization strings, but migration is encouraged. diff --git a/neutron/i18n.py b/neutron/i18n.py deleted file mode 100644 index 7c93336c8be..00000000000 --- a/neutron/i18n.py +++ /dev/null @@ -1,29 +0,0 @@ -# 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. - -# TODO(dougwig) - remove this file at the beginning of N. - -from debtcollector import moves - -import neutron._i18n - -message = "moved to neutron._i18n; please migrate to local oslo_i18n " \ - "usage, as defined in the devref and at " \ - "http://docs.openstack.org/developer/oslo.i18n/usage.html" - -_ = moves.moved_function(neutron._i18n._, '_', __name__, message=message) -_LI = moves.moved_function(neutron._i18n._LI, '_LI', __name__, message=message) -_LW = moves.moved_function(neutron._i18n._LW, '_LW', __name__, message=message) -_LE = moves.moved_function(neutron._i18n._LE, '_LE', __name__, message=message) -_LC = moves.moved_function(neutron._i18n._LC, '_LC', __name__, message=message)