- The values ``bfg_localizer`` and ``bfg_locale_name`` kept on the request

  during internationalization were never APIs.  These however have changed to
  ``localizer`` and ``locale_name``, respectively.

4 files changed, 17 insertions, 16 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 478b9c08b..9e52aaab5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -138,3 +138,8 @@ Backwards Incompatibilities (with BFG 1.3.X)
   an exception occurs is now deprecated.  Instead, code which relies on this
   environ value should use the ``exception`` attribute of the request
   (e.g. ``request.exception[0]``) to retrieve the message.
+
+- The values ``bfg_localizer`` and ``bfg_locale_name`` kept on the request
+  during internationalization for caching purposes were never APIs.  These
+  however have changed to ``localizer`` and ``locale_name``, respectively.
+
diff --git a/TODO.txt b/TODO.txt
index 76af553e8..654a6c38a 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -78,10 +78,6 @@
 
 - repoze.bfg.auth_tkt
 
-- bfg_locale_name
-
-- bfg_localizer
-
 - "BFG" in environ variables.
 
 - request.link (route_url)
diff --git a/pyramid/i18n.py b/pyramid/i18n.py
index 718ffca79..d71a27205 100644
--- a/pyramid/i18n.py
+++ b/pyramid/i18n.py
@@ -140,16 +140,16 @@ def negotiate_locale_name(request):
 def get_locale_name(request):
     """ Return the :term:`locale name` associated with the current
     request (possibly cached)."""
-    locale_name = getattr(request, 'bfg_locale_name', None)
+    locale_name = getattr(request, 'locale_name', None)
     if locale_name is None:
         locale_name = negotiate_locale_name(request)
-        request.bfg_locale_name = locale_name
+        request.locale_name = locale_name
     return locale_name
 
 def get_localizer(request):
     """ Retrieve a :class:`pyramid.i18n.Localizer` object
     corresponding to the current request's locale name. """
-    localizer =  getattr(request, 'bfg_localizer', None)
+    localizer =  getattr(request, 'localizer', None)
 
     if localizer is None:
         # no locale object cached on request
@@ -188,7 +188,7 @@ def get_localizer(request):
                               translations=translations)
         registry.registerUtility(localizer, ILocalizer,
                                  name=current_locale_name)
-        request.bfg_localizer = localizer
+        request.localizer = localizer
 
     return localizer
                 
diff --git a/pyramid/tests/test_i18n.py b/pyramid/tests/test_i18n.py
index e65f29bc8..e975013b7 100644
--- a/pyramid/tests/test_i18n.py
+++ b/pyramid/tests/test_i18n.py
@@ -127,7 +127,7 @@ class Test_get_locale_name(unittest.TestCase):
 
     def test_name_on_request(self):
         request = DummyRequest()
-        request.bfg_locale_name = 'ie'
+        request.locale_name = 'ie'
         result = self._callFUT(request)
         self.assertEqual(result, 'ie')
 
@@ -136,7 +136,7 @@ class Test_get_locale_name(unittest.TestCase):
         request = DummyRequest()
         result = self._callFUT(request)
         self.assertEqual(result, 'bogus')
-        self.assertEqual(request.bfg_locale_name, 'bogus')
+        self.assertEqual(request.locale_name, 'bogus')
 
 class Test_get_localizer(unittest.TestCase):
     def setUp(self):
@@ -151,7 +151,7 @@ class Test_get_localizer(unittest.TestCase):
 
     def test_no_registry_on_request(self):
         request = DummyRequest()
-        request.bfg_localizer = '123'
+        request.localizer = '123'
         result = self._callFUT(request)
         self.assertEqual(result, '123')
 
@@ -159,14 +159,14 @@ class Test_get_localizer(unittest.TestCase):
         from pyramid.threadlocal import get_current_registry
         registry = get_current_registry()
         request = DummyRequest()
-        request.bfg_localizer = '123'
+        request.localizer = '123'
         request.registry = registry
         result = self._callFUT(request)
         self.assertEqual(result, '123')
 
     def test_locale_on_request(self):
         request = DummyRequest()
-        request.bfg_localizer = 'abc'
+        request.localizer = 'abc'
         result = self._callFUT(request)
         self.assertEqual(result, 'abc')
 
@@ -177,7 +177,7 @@ class Test_get_localizer(unittest.TestCase):
         locale = 'abc'
         registry.registerUtility(locale, ILocalizer, name='en')
         request = DummyRequest()
-        request.bfg_locale_name = 'en'
+        request.locale_name = 'en'
         result = self._callFUT(request)
         self.assertEqual(result, 'abc')
 
@@ -192,7 +192,7 @@ class Test_get_localizer(unittest.TestCase):
         localedirs = [localedir]
         registry.registerUtility(localedirs, ITranslationDirectories)
         request = DummyRequest()
-        request.bfg_locale_name = 'de'
+        request.locale_name = 'de'
         result = self._callFUT(request)
         self.assertEqual(result.__class__, Localizer)
         self.assertEqual(result.translate('Approve', 'deformsite'),
@@ -211,7 +211,7 @@ class Test_get_localizer(unittest.TestCase):
         localedirs = [localedir]
         registry.registerUtility(localedirs, ITranslationDirectories)
         request = DummyRequest()
-        request.bfg_locale_name = 'be'
+        request.locale_name = 'be'
         result = self._callFUT(request)
         self.assertEqual(result.__class__, Localizer)
         self.assertEqual(result.translate('Approve', 'deformsite'),