From db98f1e5fb7b17caae976f91c1d7e119144f3d0f Mon Sep 17 00:00:00 2001 From: Bogdan Date: Tue, 1 Aug 2023 09:19:04 +0300 Subject: [PATCH] Improve messaging for Interactive Search (cherry picked from commit 7893fdde104959c4f3c32d9e1000e2479f7a5b12) Closes #3951 --- .../src/InteractiveSearch/InteractiveSearch.js | 17 +++++++++-------- src/NzbDrone.Core/Localization/Core/en.json | 6 +++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/frontend/src/InteractiveSearch/InteractiveSearch.js b/frontend/src/InteractiveSearch/InteractiveSearch.js index 61168f93f..560234131 100644 --- a/frontend/src/InteractiveSearch/InteractiveSearch.js +++ b/frontend/src/InteractiveSearch/InteractiveSearch.js @@ -1,12 +1,13 @@ import PropTypes from 'prop-types'; import React from 'react'; +import Alert from 'Components/Alert'; import Icon from 'Components/Icon'; import LoadingIndicator from 'Components/Loading/LoadingIndicator'; import FilterMenu from 'Components/Menu/FilterMenu'; import PageMenuButton from 'Components/Menu/PageMenuButton'; import Table from 'Components/Table/Table'; import TableBody from 'Components/Table/TableBody'; -import { align, icons, sortDirections } from 'Helpers/Props'; +import { align, icons, kinds, sortDirections } from 'Helpers/Props'; import translate from 'Utilities/String/translate'; import InteractiveSearchFilterModalConnector from './InteractiveSearchFilterModalConnector'; import InteractiveSearchRow from './InteractiveSearchRow'; @@ -132,17 +133,17 @@ function InteractiveSearch(props) { { !isFetching && isPopulated && !totalReleasesCount ? -
- {translate('NoResults')} -
: + + {translate('NoResultsFound')} + : null } { !!totalReleasesCount && isPopulated && !items.length ? -
- {translate('AllResultsFiltered')} -
: + + {translate('AllResultsAreHiddenByTheAppliedFilter')} + : null } @@ -177,7 +178,7 @@ function InteractiveSearch(props) { { totalReleasesCount !== items.length && !!items.length ?
- {translate('SomeResultsFiltered')} + {translate('SomeResultsAreHiddenByTheAppliedFilter')}
: null } diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json index cc1793c25..eb96990d4 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -51,7 +51,7 @@ "AllExpandedExpandAll": "Expand All", "AllFiles": "All Files", "AllMonitoringOptionHelpText": "Monitor artists and all albums for each artist included on the import list", - "AllResultsFiltered": "All results are hidden by the applied filter", + "AllResultsAreHiddenByTheAppliedFilter": "All results are hidden by the applied filter", "AllowArtistChangeClickToChangeArtist": "Click to change artist", "AllowFingerprinting": "Allow Fingerprinting", "AllowFingerprintingHelpText": "Use fingerprinting to improve accuracy of track matching", @@ -602,7 +602,7 @@ "NoLogFiles": "No log files", "NoMinimumForAnyRuntime": "No minimum for any runtime", "NoMissingItems": "No missing items", - "NoResults": "No Results Found", + "NoResultsFound": "No results found", "NoTagsHaveBeenAddedYet": "No tags have been added yet", "NoUpdatesAreAvailable": "No updates are available", "None": "None", @@ -891,7 +891,7 @@ "SkipRedownload": "Skip Redownload", "SkipRedownloadHelpText": "Prevents Lidarr from trying download alternative releases for the removed items", "SmartReplace": "Smart Replace", - "SomeResultsFiltered": "Some results are hidden by the applied filter", + "SomeResultsAreHiddenByTheAppliedFilter": "Some results are hidden by the applied filter", "SorryThatAlbumCannotBeFound": "Sorry, that album cannot be found.", "SorryThatArtistCannotBeFound": "Sorry, that artist cannot be found.", "Source": "Source",