From 6c4cca7766882d023ce1436733531a25a27947a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Fri, 30 May 2014 09:15:28 +0200 Subject: [PATCH] Do not try to localize sphinx extension MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - we do not (and can not) translate this anyway - causes problems with older Sphinx versions Signed-off-by: Michal Čihař --- doc/_ext/configext.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/doc/_ext/configext.py b/doc/_ext/configext.py index fdf33149ce..097f8768a8 100644 --- a/doc/_ext/configext.py +++ b/doc/_ext/configext.py @@ -1,4 +1,3 @@ -from sphinx.locale import l_, _ from sphinx.domains import Domain, ObjType from sphinx.roles import XRefRole from sphinx.domains.std import GenericObject, StandardDomain @@ -23,15 +22,15 @@ def get_id_from_cfg(text): class ConfigOption(ObjectDescription): - indextemplate = l_('configuration option; %s') + indextemplate = 'configuration option; %s' parse_node = None has_arguments = True doc_field_types = [ - Field('default', label=l_('Default value'), has_arg=False, + Field('default', label='Default value', has_arg=False, names=('default', )), - Field('type', label=l_('Type'), has_arg=False, + Field('type', label='Type', has_arg=False, names=('type',)), ] @@ -60,7 +59,7 @@ class ConfigOption(ObjectDescription): # Server section if targetparts[0] == 'Servers' and len(targetparts) > 1: indexname = ', '.join(targetparts[1:]) - self.indexnode['entries'].append((indextype, l_('server configuration; %s') % indexname, + self.indexnode['entries'].append((indextype, 'server configuration; %s' % indexname, targetname, targetname)) self.indexnode['entries'].append((indextype, indexname, targetname, targetname)) @@ -86,14 +85,14 @@ class ConfigSectionXRefRole(XRefRole): indexnode = addnodes.index() indexnode['entries'] = [ ('single', varname, tgtid, varname), - ('single', _('configuration section; %s') % varname, tgtid, varname) + ('single', 'configuration section; %s' % varname, tgtid, varname) ] targetnode = nodes.target('', '', ids=[tgtid]) document.note_explicit_target(targetnode) return [indexnode, targetnode, node], [] class ConfigSection(ObjectDescription): - indextemplate = l_('configuration section; %s') + indextemplate = 'configuration section; %s' parse_node = None def handle_signature(self, sig, signode): @@ -137,7 +136,7 @@ class ConfigOptionXRefRole(XRefRole): indexnode = addnodes.index() indexnode['entries'] = [ ('single', varname, tgtid, varname), - ('single', _('configuration option; %s') % varname, tgtid, varname) + ('single', 'configuration option; %s' % varname, tgtid, varname) ] targetnode = nodes.target('', '', ids=[tgtid]) document.note_explicit_target(targetnode) @@ -149,8 +148,8 @@ class ConfigFileDomain(Domain): label = 'Config' object_types = { - 'option': ObjType(l_('config option'), 'option'), - 'section': ObjType(l_('config section'), 'section'), + 'option': ObjType('config option', 'option'), + 'section': ObjType('config section', 'section'), } directives = { 'option': ConfigOption,