diff options
| -rw-r--r-- | sphinx/builders/__init__.py | 10 | ||||
| -rw-r--r-- | sphinx/builders/_epub_base.py | 2 | ||||
| -rw-r--r-- | sphinx/builders/changes.py | 2 | ||||
| -rw-r--r-- | sphinx/builders/html.py | 2 | ||||
| -rw-r--r-- | sphinx/builders/latex/__init__.py | 2 | ||||
| -rw-r--r-- | sphinx/ext/autosummary/__init__.py | 10 | ||||
| -rw-r--r-- | sphinx/ext/intersphinx.py | 8 | ||||
| -rw-r--r-- | sphinx/ext/viewcode.py | 4 | ||||
| -rw-r--r-- | sphinx/writers/latex.py | 4 |
9 files changed, 22 insertions, 22 deletions
diff --git a/sphinx/builders/__init__.py b/sphinx/builders/__init__.py index 67736d77b..281737755 100644 --- a/sphinx/builders/__init__.py +++ b/sphinx/builders/__init__.py @@ -403,7 +403,7 @@ class Builder: Store all environment docnames in the canonical format (ie using SEP as a separator in place of os.path.sep). """ - logger.info(bold('updating environment: '), nonl=True) + logger.info(bold(__('updating environment: ')), nonl=True) self.env.find_files(self.config, self) updated = (self.env.config_status != CONFIG_OK) @@ -422,7 +422,7 @@ class Builder: if changed: reason = CONFIG_CHANGED_REASON.get(self.env.config_status, '') logger.info('[%s] ', reason, nonl=True) - logger.info('%s added, %s changed, %s removed', + logger.info(__('%s added, %s changed, %s removed'), len(added), len(changed), len(removed)) # clear all files no longer present @@ -461,7 +461,7 @@ class Builder: def _read_serial(self, docnames): # type: (List[str]) -> None - for docname in status_iterator(docnames, 'reading sources... ', "purple", + for docname in status_iterator(docnames, __('reading sources... '), "purple", len(docnames), self.app.verbosity): # remove all inventory entries for that file self.app.emit('env-purge-doc', self.env, docname) @@ -491,12 +491,12 @@ class Builder: tasks = ParallelTasks(nproc) chunks = make_chunks(docnames, nproc) - for chunk in status_iterator(chunks, 'reading sources... ', "purple", + for chunk in status_iterator(chunks, __('reading sources... '), "purple", len(chunks), self.app.verbosity): tasks.add_task(read_process, chunk, merge) # make sure all threads have finished - logger.info(bold('waiting for workers...')) + logger.info(bold(__('waiting for workers...'))) tasks.join() def read_doc(self, docname): diff --git a/sphinx/builders/_epub_base.py b/sphinx/builders/_epub_base.py index f07fef21d..7eb1dadc1 100644 --- a/sphinx/builders/_epub_base.py +++ b/sphinx/builders/_epub_base.py @@ -403,7 +403,7 @@ class EpubBuilder(StandaloneHTMLBuilder): the format and resizing the image if necessary/possible. """ ensuredir(path.join(self.outdir, self.imagedir)) - for src in status_iterator(self.images, 'copying images... ', "brown", + for src in status_iterator(self.images, __('copying images... '), "brown", len(self.images), self.app.verbosity): dest = self.images[src] try: diff --git a/sphinx/builders/changes.py b/sphinx/builders/changes.py index de037dd8e..d5c4e6bc0 100644 --- a/sphinx/builders/changes.py +++ b/sphinx/builders/changes.py @@ -67,7 +67,7 @@ class ChangesBuilder(Builder): if not changesets: logger.info(bold(__('no changes in version %s.') % version)) return - logger.info(bold('writing summary file...')) + logger.info(bold(__('writing summary file...'))) for changeset in changesets: if isinstance(changeset.descname, tuple): descname = changeset.descname[0] diff --git a/sphinx/builders/html.py b/sphinx/builders/html.py index e395144aa..3a943b3f0 100644 --- a/sphinx/builders/html.py +++ b/sphinx/builders/html.py @@ -881,7 +881,7 @@ class StandaloneHTMLBuilder(Builder): elif not path.isfile(icontarget): copyfile(path.join(self.confdir, self.config.html_favicon), icontarget) - logger.info('done') + logger.info(__('done')) except OSError as err: logger.warning(__('cannot copy static file %r'), err) diff --git a/sphinx/builders/latex/__init__.py b/sphinx/builders/latex/__init__.py index b18fd07ee..43aea1aa2 100644 --- a/sphinx/builders/latex/__init__.py +++ b/sphinx/builders/latex/__init__.py @@ -276,7 +276,7 @@ class LaTeXBuilder(Builder): doctree.settings = docsettings docwriter.write(doctree, destination) - logger.info("done") + logger.info(__("done")) def get_contentsname(self, indexfile): # type: (str) -> str diff --git a/sphinx/ext/autosummary/__init__.py b/sphinx/ext/autosummary/__init__.py index 61b3de437..a18ce2a6d 100644 --- a/sphinx/ext/autosummary/__init__.py +++ b/sphinx/ext/autosummary/__init__.py @@ -253,9 +253,9 @@ class Autosummary(SphinxDirective): docname = posixpath.normpath(posixpath.join(dirname, docname)) if docname not in self.env.found_docs: if excluded(self.env.doc2path(docname, None)): - logger.warning('toctree references excluded document %r' % docname) + logger.warning(__('toctree references excluded document %r'), docname) else: - logger.warning('toctree references unknown document %r' % docname) + logger.warning(__('toctree references unknown document %r'), docname) docnames.append(docname) tocnode = addnodes.toctree() @@ -288,7 +288,7 @@ class Autosummary(SphinxDirective): try: real_name, obj, parent, modname = import_by_name(name, prefixes=prefixes) except ImportError: - logger.warning('failed to import %s' % name) + logger.warning(__('failed to import %s'), name) items.append((name, '', '', name)) continue @@ -303,11 +303,11 @@ class Autosummary(SphinxDirective): doccls = get_documenter(self.env.app, obj, parent) documenter = doccls(self.bridge, full_name) if not documenter.parse_name(): - logger.warning('failed to parse name %s' % real_name) + logger.warning(__('failed to parse name %s'), real_name) items.append((display_name, '', '', real_name)) continue if not documenter.import_object(): - logger.warning('failed to import object %s' % real_name) + logger.warning(__('failed to import object %s'), real_name) items.append((display_name, '', '', real_name)) continue if documenter.options.members and not documenter.check_module(): diff --git a/sphinx/ext/intersphinx.py b/sphinx/ext/intersphinx.py index 859eacf13..1258cd84e 100644 --- a/sphinx/ext/intersphinx.py +++ b/sphinx/ext/intersphinx.py @@ -179,7 +179,7 @@ def fetch_inventory(app, uri, inv): if hasattr(f, 'url'): newinv = f.url # type: ignore if inv != newinv: - logger.info('intersphinx inventory has moved: %s -> %s', inv, newinv) + logger.info(__('intersphinx inventory has moved: %s -> %s'), inv, newinv) if uri in (inv, path.dirname(inv), path.dirname(inv) + '/'): uri = path.dirname(newinv) @@ -214,7 +214,7 @@ def load_mappings(app): if '://' not in inv or uri not in inventories.cache \ or inventories.cache[uri][1] < cache_time: safe_inv_url = _get_safe_url(inv) - logger.info('loading intersphinx inventory from %s...', safe_inv_url) + logger.info(__('loading intersphinx inventory from %s...'), safe_inv_url) try: invdata = fetch_inventory(app, uri, inv) except Exception as err: @@ -229,8 +229,8 @@ def load_mappings(app): if failures == []: pass elif len(failures) < len(invs): - logger.info("encountered some issues with some of the inventories," - " but they had working alternatives:") + logger.info(__("encountered some issues with some of the inventories," + " but they had working alternatives:")) for fail in failures: logger.info(*fail) else: diff --git a/sphinx/ext/viewcode.py b/sphinx/ext/viewcode.py index a4d9e3405..61738a349 100644 --- a/sphinx/ext/viewcode.py +++ b/sphinx/ext/viewcode.py @@ -16,7 +16,7 @@ from docutils import nodes import sphinx from sphinx import addnodes from sphinx.deprecation import RemovedInSphinx30Warning -from sphinx.locale import _ +from sphinx.locale import _, __ from sphinx.pycode import ModuleAnalyzer from sphinx.util import get_full_modname, logging, status_iterator from sphinx.util.nodes import make_refnode @@ -158,7 +158,7 @@ def collect_pages(app): for modname, entry in status_iterator( sorted(env._viewcode_modules.items()), # type: ignore - 'highlighting module code... ', "blue", + __('highlighting module code... '), "blue", len(env._viewcode_modules), # type: ignore app.verbosity, lambda x: x[0]): if not entry: diff --git a/sphinx/writers/latex.py b/sphinx/writers/latex.py index cfd100138..41d83d48d 100644 --- a/sphinx/writers/latex.py +++ b/sphinx/writers/latex.py @@ -1137,8 +1137,8 @@ class LaTeXTranslator(SphinxTranslator): if self.next_table_colspec: self.table.colspec = '{%s}\n' % self.next_table_colspec if 'colwidths-given' in node.get('classes', []): - logger.info('both tabularcolumns and :widths: option are given. ' - ':widths: is ignored.', location=node) + logger.info(__('both tabularcolumns and :widths: option are given. ' + ':widths: is ignored.'), location=node) self.next_table_colspec = None def depart_table(self, node): |