From bae8fb6909b6ae3b283fd48510b3aa7b3a9726ca Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Thu, 4 Mar 2021 22:08:41 +0900 Subject: [PATCH 1/3] i18n: Fix wrong substitution message catalog for el and hr (refs: #8943) --- CHANGES | 2 ++ sphinx/locale/el/LC_MESSAGES/sphinx.po | 4 ++-- sphinx/locale/hr/LC_MESSAGES/sphinx.po | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 1542e883490..fbe134bf593 100644 --- a/CHANGES +++ b/CHANGES @@ -16,6 +16,8 @@ Features added Bugs fixed ---------- +* #8943: i18n: Crashed by broken translation messages in ES, EL and HR + Testing -------- diff --git a/sphinx/locale/el/LC_MESSAGES/sphinx.po b/sphinx/locale/el/LC_MESSAGES/sphinx.po index 03f5d01fecb..6c0fc667bab 100644 --- a/sphinx/locale/el/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/el/LC_MESSAGES/sphinx.po @@ -3301,12 +3301,12 @@ msgstr "περισσότεροι από ένας στόχοι βρέθηκαν #: sphinx/transforms/post_transforms/__init__.py:171 #, python-format msgid "%s:%s reference target not found: %%(target)s" -msgstr "Ο %s:%s στόχος αναφοράς δεν βρέθηκε: %% (στόχος)" +msgstr "Ο %s:%s στόχος αναφοράς δεν βρέθηκε: %%(target)s" #: sphinx/transforms/post_transforms/__init__.py:174 #, python-format msgid "%r reference target not found: %%(target)s" -msgstr "ο στόχος αναφοράς %r δεν βρέθηκε: %%(στόχος)" +msgstr "ο στόχος αναφοράς %r δεν βρέθηκε: %%(target)s" #: sphinx/transforms/post_transforms/images.py:86 #, python-format diff --git a/sphinx/locale/hr/LC_MESSAGES/sphinx.po b/sphinx/locale/hr/LC_MESSAGES/sphinx.po index 20e336487b8..bd809f38165 100644 --- a/sphinx/locale/hr/LC_MESSAGES/sphinx.po +++ b/sphinx/locale/hr/LC_MESSAGES/sphinx.po @@ -3305,7 +3305,7 @@ msgstr "%s:%s reference target nije pronađen: %%(target)s" #: sphinx/transforms/post_transforms/__init__.py:174 #, python-format msgid "%r reference target not found: %%(target)s" -msgstr "%r referenca target nije pronađena: %% (target)" +msgstr "%r referenca target nije pronađena: %%(target)s" #: sphinx/transforms/post_transforms/images.py:86 #, python-format From a969e90f28e0ade11b4c38d9a6e6f3264d1bf971 Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sat, 6 Mar 2021 20:59:53 +0900 Subject: [PATCH 2/3] Bump to 3.5.2 final --- CHANGES | 19 ++----------------- sphinx/__init__.py | 4 ++-- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/CHANGES b/CHANGES index e4512315457..9381744b8d8 100644 --- a/CHANGES +++ b/CHANGES @@ -1,17 +1,5 @@ -Release 3.5.2 (in development) -============================== - -Dependencies ------------- - -Incompatible changes --------------------- - -Deprecated ----------- - -Features added --------------- +Release 3.5.2 (released Mar 06, 2021) +===================================== Bugs fixed ---------- @@ -20,9 +8,6 @@ Bugs fixed * #8936: LaTeX: A custom LaTeX builder fails with unknown node error * #8952: Exceptions raised in a Directive cause parallel builds to hang -Testing --------- - Release 3.5.1 (released Feb 16, 2021) ===================================== diff --git a/sphinx/__init__.py b/sphinx/__init__.py index a5cf2206484..d7e50097ee1 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -32,7 +32,7 @@ warnings.filterwarnings('ignore', "'U' mode is deprecated", DeprecationWarning, module='docutils.io') -__version__ = '3.5.2+' +__version__ = '3.5.2' __released__ = '3.5.2' # used when Sphinx builds its own docs #: Version info for better programmatic use. @@ -43,7 +43,7 @@ #: #: .. versionadded:: 1.2 #: Before version 1.2, check the string ``sphinx.__version__``. -version_info = (3, 5, 2, 'beta', 0) +version_info = (3, 5, 2, 'final', 0) package_dir = path.abspath(path.dirname(__file__)) From 4f8cb861e3b29186b38248fe81e4944fd987fcce Mon Sep 17 00:00:00 2001 From: Takeshi KOMIYA Date: Sat, 6 Mar 2021 21:03:43 +0900 Subject: [PATCH 3/3] Bump version --- CHANGES | 21 +++++++++++++++++++++ sphinx/__init__.py | 6 +++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 9381744b8d8..8fa86a98b26 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,24 @@ +Release 3.5.3 (in development) +============================== + +Dependencies +------------ + +Incompatible changes +-------------------- + +Deprecated +---------- + +Features added +-------------- + +Bugs fixed +---------- + +Testing +-------- + Release 3.5.2 (released Mar 06, 2021) ===================================== diff --git a/sphinx/__init__.py b/sphinx/__init__.py index d7e50097ee1..7f72a3d02a4 100644 --- a/sphinx/__init__.py +++ b/sphinx/__init__.py @@ -32,8 +32,8 @@ warnings.filterwarnings('ignore', "'U' mode is deprecated", DeprecationWarning, module='docutils.io') -__version__ = '3.5.2' -__released__ = '3.5.2' # used when Sphinx builds its own docs +__version__ = '3.5.3+' +__released__ = '3.5.3' # used when Sphinx builds its own docs #: Version info for better programmatic use. #: @@ -43,7 +43,7 @@ #: #: .. versionadded:: 1.2 #: Before version 1.2, check the string ``sphinx.__version__``. -version_info = (3, 5, 2, 'final', 0) +version_info = (3, 5, 3, 'beta', 0) package_dir = path.abspath(path.dirname(__file__))