summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2010-01-02 00:39:55 +0100
committerGeorg Brandl <georg@python.org>2010-01-02 00:39:55 +0100
commitc8a7702905889677b41326fb87c084f5fef33ac5 (patch)
treef83f55a9460d57959400405186a10f4b9451724e
parente69271ac1c80fbd1394fec3edb8bb545b8c92efe (diff)
downloadsphinx-c8a7702905889677b41326fb87c084f5fef33ac5.tar.gz
#285: make the ``locale_dirs`` config value work again.
-rw-r--r--CHANGES2
-rw-r--r--sphinx/builders/__init__.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index e01f480f..cace9d01 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
Release 0.6.4 (in development)
==============================
+* #285: make the ``locale_dirs`` config value work again.
+
* #303: ``html_context`` values given on the command line via ``-A``
should not override other values given in conf.py.
diff --git a/sphinx/builders/__init__.py b/sphinx/builders/__init__.py
index dc4a64de..5d75a886 100644
--- a/sphinx/builders/__init__.py
+++ b/sphinx/builders/__init__.py
@@ -186,7 +186,7 @@ class Builder(object):
if self.translator is None:
self.translator = trans
else:
- self.translator._catalog.update(trans.catalog)
+ self.translator._catalog.update(trans._catalog)
except Exception:
# Language couldn't be found in the specified path
pass