diff options
| author | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-01-08 01:37:53 +0900 |
|---|---|---|
| committer | Takeshi KOMIYA <i.tkomiya@gmail.com> | 2020-01-08 01:37:53 +0900 |
| commit | af2a3c0ddeb2f81c8f685e4d266adefc749a2642 (patch) | |
| tree | f4b5f634fcc3e2315bf5eedaceed11a16ba0ff14 /sphinx/transforms | |
| parent | 92a204284b98510b3bfdd2a6391e9855c564a6a0 (diff) | |
| parent | 8e1cbd24c61934df7eb426aad0dc48830789b096 (diff) | |
| download | sphinx-git-af2a3c0ddeb2f81c8f685e4d266adefc749a2642.tar.gz | |
Merge branch '2.0'
Diffstat (limited to 'sphinx/transforms')
| -rw-r--r-- | sphinx/transforms/i18n.py | 11 | ||||
| -rw-r--r-- | sphinx/transforms/post_transforms/__init__.py | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/sphinx/transforms/i18n.py b/sphinx/transforms/i18n.py index e61905830..34d5b1368 100644 --- a/sphinx/transforms/i18n.py +++ b/sphinx/transforms/i18n.py @@ -202,18 +202,13 @@ class Locale(SphinxTransform): # glossary terms update refid if isinstance(node, nodes.term): - gloss_entries = self.env.temp_data.setdefault('gloss_entries', set()) - for _id in node['names']: - if _id in gloss_entries: - gloss_entries.remove(_id) - + for _id in node['ids']: parts = split_term_classifiers(msgstr) patch = publish_msgstr(self.app, parts[0], source, node.line, self.config, settings) patch = make_glossary_term(self.env, patch, parts[1], - source, node.line, _id) - node['ids'] = patch['ids'] - node['names'] = patch['names'] + source, node.line, _id, + self.document) processed = True # update leaves with processed nodes diff --git a/sphinx/transforms/post_transforms/__init__.py b/sphinx/transforms/post_transforms/__init__.py index a16427dad..ee459cc56 100644 --- a/sphinx/transforms/post_transforms/__init__.py +++ b/sphinx/transforms/post_transforms/__init__.py @@ -82,7 +82,7 @@ class ReferencesResolver(SphinxPostTransform): try: domain = self.env.domains[node['refdomain']] except KeyError: - raise NoUri + raise NoUri(target, typ) newnode = domain.resolve_xref(self.env, refdoc, self.app.builder, typ, target, node, contnode) # really hardwired reference types |