summaryrefslogtreecommitdiff
path: root/sphinx/registry.py
diff options
context:
space:
mode:
authorZejun Wu <watashi@watashi.ws>2018-09-19 05:58:11 -0700
committerTakeshi KOMIYA <i.tkomiya@gmail.com>2018-09-21 01:24:04 +0900
commit84f6d9f16ebb970ba81a03eaac374494aabbf78b (patch)
tree6701657119cba047ed0cc1e4d2107cc14217d830 /sphinx/registry.py
parentbbb4593bfaa65611b6bd600c5e37c4c54af87f1a (diff)
downloadsphinx-git-84f6d9f16ebb970ba81a03eaac374494aabbf78b.tar.gz
Fix TypeError in error message when override is prohibited
Diffstat (limited to 'sphinx/registry.py')
-rw-r--r--sphinx/registry.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/sphinx/registry.py b/sphinx/registry.py
index 416edb2bc..0b17950b8 100644
--- a/sphinx/registry.py
+++ b/sphinx/registry.py
@@ -199,7 +199,7 @@ class SphinxComponentRegistry(object):
directives = self.domain_directives.setdefault(domain, {})
if name in directives and not override:
- raise ExtensionError(__('The %r directive is already registered to %d domain') %
+ raise ExtensionError(__('The %r directive is already registered to domain %s') %
(name, domain))
if not isclass(obj) or not issubclass(obj, Directive):
directives[name] = directive_helper(obj, has_content, argument_spec, **option_spec)
@@ -213,7 +213,7 @@ class SphinxComponentRegistry(object):
raise ExtensionError(__('domain %s not yet registered') % domain)
roles = self.domain_roles.setdefault(domain, {})
if name in roles and not override:
- raise ExtensionError(__('The %r role is already registered to %d domain') %
+ raise ExtensionError(__('The %r role is already registered to domain %s') %
(name, domain))
roles[name] = role
@@ -224,7 +224,7 @@ class SphinxComponentRegistry(object):
raise ExtensionError(__('domain %s not yet registered') % domain)
indices = self.domain_indices.setdefault(domain, [])
if index in indices and not override:
- raise ExtensionError(__('The %r index is already registered to %d domain') %
+ raise ExtensionError(__('The %r index is already registered to domain %s') %
(index.name, domain))
indices.append(index)