Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix singular and plural search results text #12639

Merged
merged 10 commits into from
Aug 11, 2024
Merged

Fix singular and plural search results text #12639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c52c10e
Fix singular and plural search results text
hugovk Jul 21, 2024
cefac28
Use ngettext to handle singular and plural
hugovk Jul 22, 2024
b4ab6bc
Run: python babel_runner.py extract
hugovk Jul 22, 2024
34d7ccd
Run: python babel_runner.py update
hugovk Jul 22, 2024
5028aaf
Revert unrelated change
hugovk Jul 22, 2024
edfc2d5
Add changelog entry
hugovk Jul 22, 2024
b8a72ca
Revert "Run: python babel_runner.py update"
AA-Turner Aug 11, 2024
343d994
Revert "Run: python babel_runner.py extract"
AA-Turner Aug 11, 2024
fa78f72
Merge branch 'master' into singular-plural-search-results
AA-Turner Aug 11, 2024
6ad3bb1
whitespace
AA-Turner Aug 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ Bugs fixed
* #12587: Do not warn when potential ambiguity detected during Intersphinx
resolution occurs due to duplicate targets that differ case-insensitively.
Patch by James Addison.
* #12639: Fix singular and plural search results text.
Patch by Hugo van Kemenade.

Testing
-------
Expand Down
6 changes: 4 additions & 2 deletions sphinx/themes/basic/static/searchtools.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,10 @@ const _finishSearch = (resultCount) => {
"Your search did not match any documents. Please make sure that all words are spelled correctly and that you've selected enough categories."
);
else
Search.status.innerText = _(
"Search finished, found ${resultCount} page(s) matching the search query."
Search.status.innerText = Documentation.ngettext(
"Search finished, found one page matching the search query.",
"Search finished, found ${resultCount} pages matching the search query.",
resultCount,
).replace('${resultCount}', resultCount);
};
const _displayNextItem = (
Expand Down