IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable' into fix/referenced_todo

Browse Source
This commit is contained in:
Takeshi KOMIYA 2017-10-18 21:32:32 +09:00 committed by GitHub
commit 5cc94fb9de
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -17,6 +17,7 @@ Features added
* #4112: Don't override the smart_quotes setting if it was already set * #4112: Don't override the smart_quotes setting if it was already set
* #4125: Display reference texts of original and translated passages on * #4125: Display reference texts of original and translated passages on
i18n warning message i18n warning message
* #4147: Include the exception when logging PO/MO file read/write
Bugs fixed Bugs fixed
---------- ----------
@ -28,6 +29,7 @@ Bugs fixed
* #4070, #4111: crashes when the warning message contains format strings (again) * #4070, #4111: crashes when the warning message contains format strings (again)
* #4108: Search word highlighting breaks SVG images * #4108: Search word highlighting breaks SVG images
* #3692: Unable to build HTML if writing .buildinfo failed * #3692: Unable to build HTML if writing .buildinfo failed
* #4152: HTML writer crashes if a field list is placed on top of the document
* #4063: Sphinx crashes when labelling directive '.. todolist::' * #4063: Sphinx crashes when labelling directive '.. todolist::'
Testing Testing

8
sphinx/util/i18n.py
View File

@ -67,15 +67,15 @@ class CatalogInfo(LocaleFileInfoBase):
with io.open(self.po_path, 'rt', encoding=self.charset) as file_po: with io.open(self.po_path, 'rt', encoding=self.charset) as file_po:
try: try:
po = read_po(file_po, locale) po = read_po(file_po, locale)
except Exception: except Exception as exc:
logger.warning('reading error: %s', self.po_path) logger.warning('reading error: %s, %s', self.po_path, exc)
return return
with io.open(self.mo_path, 'wb') as file_mo: with io.open(self.mo_path, 'wb') as file_mo:
try: try:
write_mo(file_mo, po) write_mo(file_mo, po)
except Exception: except Exception as exc:
logger.warning('writing error: %s', self.mo_path) logger.warning('writing error: %s, %s', self.mo_path, exc)
def find_catalog(docname, compaction): def find_catalog(docname, compaction):

1
sphinx/writers/html.py
View File

@ -89,6 +89,7 @@ class HTMLTranslator(BaseTranslator):
self.param_separator = '' self.param_separator = ''
self.optional_param_level = 0 self.optional_param_level = 0
self._table_row_index = 0 self._table_row_index = 0
self._fieldlist_row_index = 0
self.required_params_left = 0 self.required_params_left = 0
def visit_start_of_file(self, node): def visit_start_of_file(self, node):