From ae625d78993f89947e9489dd347bad057c9c7612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?= <10796600+picnixz@users.noreply.github.com> Date: Sat, 23 Mar 2024 13:42:59 +0100 Subject: [PATCH 1/2] Change ``New in`` to ``Added in``. --- sphinx/domains/changeset.py | 2 +- sphinx/util/nodes.py | 2 +- tests/test_builders/test_build_changes.py | 2 +- tests/test_builders/test_build_html_5_output.py | 2 +- tests/test_intl/test_intl.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sphinx/domains/changeset.py b/sphinx/domains/changeset.py index 9a06287453f..1a6717d9a39 100644 --- a/sphinx/domains/changeset.py +++ b/sphinx/domains/changeset.py @@ -20,7 +20,7 @@ versionlabels = { - 'versionadded': _('New in version %s'), + 'versionadded': _('Added in version %s'), 'versionchanged': _('Changed in version %s'), 'deprecated': _('Deprecated since version %s'), 'versionremoved': _('Removed in version %s'), diff --git a/sphinx/util/nodes.py b/sphinx/util/nodes.py index 37e6108be0a..fb1175f5443 100644 --- a/sphinx/util/nodes.py +++ b/sphinx/util/nodes.py @@ -109,7 +109,7 @@ def get_full_module_name(node: Node) -> str: def repr_domxml(node: Node, length: int = 80) -> str: """ return DOM XML representation of the specified node like: - 'New in version...' + 'Added in version...' :param nodes.Node node: target node :param int length: diff --git a/tests/test_builders/test_build_changes.py b/tests/test_builders/test_build_changes.py index b340c8d54ec..b537b8751ae 100644 --- a/tests/test_builders/test_build_changes.py +++ b/tests/test_builders/test_build_changes.py @@ -9,7 +9,7 @@ def test_build(app): # TODO: Use better checking of html content htmltext = (app.outdir / 'changes.html').read_text(encoding='utf8') - assert 'New in version 0.6: Some funny stuff.' in htmltext + assert 'Added in version 0.6: Some funny stuff.' in htmltext assert 'Changed in version 0.6: Even more funny stuff.' in htmltext assert 'Deprecated since version 0.6: Boring stuff.' in htmltext diff --git a/tests/test_builders/test_build_html_5_output.py b/tests/test_builders/test_build_html_5_output.py index 9b50a106f0e..e4662e293a5 100644 --- a/tests/test_builders/test_build_html_5_output.py +++ b/tests/test_builders/test_build_html_5_output.py @@ -113,7 +113,7 @@ def checker(nodes): # abbreviations ('markup.html', ".//abbr[@title='abbreviation']", '^abbr$'), # version stuff - ('markup.html', ".//div[@class='versionadded']/p/span", 'New in version 0.6: '), + ('markup.html', ".//div[@class='versionadded']/p/span", 'Added in version 0.6: '), ('markup.html', ".//div[@class='versionadded']/p/span", tail_check('First paragraph of versionadded')), ('markup.html', ".//div[@class='versionchanged']/p/span", diff --git a/tests/test_intl/test_intl.py b/tests/test_intl/test_intl.py index 8aaf4679b24..48135510d71 100644 --- a/tests/test_intl/test_intl.py +++ b/tests/test_intl/test_intl.py @@ -966,7 +966,7 @@ def get_content(result, name): assert expect1 == matched_content expect2 = ( - """

New in version 1.0: """ + """

Added in version 1.0: """ """THIS IS THE FIRST PARAGRAPH OF VERSIONADDED.

\n""") matched_content = get_content(result, "versionadded") assert expect2 == matched_content From 357ab1df030717557e3319e9515ed887069a422c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?= <10796600+picnixz@users.noreply.github.com> Date: Sat, 23 Mar 2024 13:44:58 +0100 Subject: [PATCH 2/2] update CHANGES.rst --- CHANGES.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index 4549b9f682f..3ac9255ccb6 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -52,6 +52,11 @@ Features added .. _OSC 8: https://gist.github.com/egmontkob/eb114294efbcd5adb1944c9f3cb5feda .. _groff: https://lists.gnu.org/archive/html/groff/2021-10/msg00000.html +* #11015: :rst:dir:`versionadded` wording changes from ``New in [...]`` + to ``Added in [...]``. + Patch by Bénédikt Tran. + + Bugs fixed ----------