New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Addressing problems raised in sphinx_issues #10104 #10379
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -1,5 +1,5 @@ | ||||||
"""The MessageCatalogBuilder class.""" | ||||||
|
||||||
import os | ||||||
from codecs import open | ||||||
from collections import OrderedDict, defaultdict | ||||||
from datetime import datetime, timedelta, tzinfo | ||||||
|
@@ -32,13 +32,14 @@ class Message: | |||||
"""An entry of translatable message.""" | ||||||
def __init__(self, text: str, locations: List[Tuple[str, int]], uuids: List[str]): | ||||||
self.text = text | ||||||
self.locations = locations | ||||||
self.locations = list(sorted(list(set(locations)))) #make list unique and sorted alphabetically | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
self.uuids = uuids | ||||||
|
||||||
|
||||||
class Catalog: | ||||||
"""Catalog of translatable messages.""" | ||||||
|
||||||
# make a class var so any instance can share this parent class, where all building info can be found, such as srcdir etc.. | ||||||
builder = None | ||||||
def __init__(self) -> None: | ||||||
self.messages: List[str] = [] # retain insertion order, a la OrderedDict | ||||||
|
||||||
|
@@ -56,8 +57,9 @@ def add(self, msg: str, origin: Union[Element, "MsgOrigin"]) -> None: | |||||
self.metadata[msg].append((origin.source, origin.line, origin.uid)) # type: ignore | ||||||
|
||||||
def __iter__(self) -> Generator[Message, None, None]: | ||||||
src_dir = Catalog.builder.srcdir | ||||||
for message in self.messages: | ||||||
positions = [(source, line) for source, line, uuid in self.metadata[message]] | ||||||
positions = [(relpath(source, start=src_dir), line) for source, line, uuid in self.metadata[message]] | ||||||
uuids = [uuid for source, line, uuid in self.metadata[message]] | ||||||
yield Message(message, positions, uuids) | ||||||
|
||||||
|
@@ -213,7 +215,8 @@ class MessageCatalogBuilder(I18nBuilder): | |||||
def init(self) -> None: | ||||||
super().init() | ||||||
self.create_template_bridge() | ||||||
self.templates.init(self) | ||||||
self.templates.init(self) | ||||||
Catalog.builder = self # make the builder visible to instances of catalog | ||||||
|
||||||
def _collect_templates(self) -> Set[str]: | ||||||
template_files = set() | ||||||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Keep a blank line here