summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Waltman <jonathan.waltman@gmail.com>2011-07-07 01:39:53 -0500
committerJon Waltman <jonathan.waltman@gmail.com>2011-07-07 01:39:53 -0500
commitec2ac36d5fdec3d52009bcc24b7d3336ee3a9bef (patch)
treef293a9e34729d3dd82a2604fdfffe55069c4b044
parent050f3005c47bea5c9a129a417ced9a6abd96724d (diff)
downloadsphinx-ec2ac36d5fdec3d52009bcc24b7d3336ee3a9bef.tar.gz
Follow the behavior described by :confval:`primary_domain` to display domain object names and use this as the category in Texinfo desc_signatures.
-rw-r--r--sphinx/writers/texinfo.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/sphinx/writers/texinfo.py b/sphinx/writers/texinfo.py
index 526eccba..5799e023 100644
--- a/sphinx/writers/texinfo.py
+++ b/sphinx/writers/texinfo.py
@@ -1271,13 +1271,15 @@ class TexinfoTranslator(nodes.NodeVisitor):
if objtype != 'describe':
for id in node.get('ids'):
self.add_anchor(id, node)
- # use the localized name for the category
+ # use the full name of the objtype for the category
try:
domain = self.builder.env.domains[node.parent['domain']]
- lname = domain.object_types[objtype].lname
+ primary = self.builder.config.primary_domain
+ name = domain.get_type_name(domain.object_types[objtype],
+ primary == domain.name)
except KeyError:
- lname = objtype
- category = self.escape_arg(string.capwords(lname))
+ name = objtype
+ category = self.escape_arg(string.capwords(name))
self.body.append('\n%s {%s} ' % (self.at_deffnx, category))
self.at_deffnx = '@deffnx'
def depart_desc_signature(self, node):