Replace "Over..." language with more precise "Top..." (#4509)

The API no longer returns an abstract, unreachable limit of 10k results. With this comment, we will show a precise number of actually reachable results, while still clarifying that these (may) be only the _top_ <x> results for that query (and not _all_ <x> results for that query).

frontend/src/components/VCollectionHeader/meta/VCollectionHeader.stories.js

@@ -48,7 +48,7 @@ const AllCollectionsTemplate = (args) => ({
     })
     const mediaStore = useMediaStore()
     mediaStore.$patch({
-      results: { image: { count: 10000 } },
+      results: { image: { count: 240 } },
     })
     return { args }
   },

frontend/src/composables/use-i18n-utilities.ts

@@ -76,7 +76,7 @@ const collectionKeys = {
 export function getCountKey(resultsCount: number): keyof KeyCollection {
   return resultsCount === 0
     ? "zero"
-    : resultsCount >= 10000
+    : resultsCount >= 240
       ? "countMore"
       : "count"
 }
@@ -130,7 +130,7 @@ export function useI18nResultsCount() {
   /**
    * Returns the localized text for the number of search results, using corresponding
    * pluralization rules and decimal separators.
-   * E.g. "No results", "3,567 results", "Over 10,000 results".
+   * E.g. "No results", "132 results", "Top 240 results".
    */
   const getI18nCount = (resultsCount: number) => {
     return i18n.tc(getI18nKey(resultsCount, ALL_MEDIA), resultsCount, {

frontend/src/locales/scripts/en.json5

@@ -620,17 +620,17 @@
   browsePage: {
     allNoResults: "No results",
     allResultCount: "{localeCount} result|{localeCount} results",
-    allResultCountMore: "Over {localeCount} results",
+    allResultCountMore: "Top {localeCount} results",
     contentLink: {
       image: {
         zero: "No images found for {query}.",
         count: "See {localeCount} image found for {query}.|See {localeCount} images found for {query}.",
-        countMore: "See over {localeCount} images found for {query}.",
+        countMore: "See the top {localeCount} images found for {query}.",
       },
       audio: {
         zero: "No audio tracks found for {query}.",
         count: "See {localeCount} audio tracks found for {query}.",
-        countMore: "See over {localeCount} audio tracks found for {query}.",
+        countMore: "See the top {localeCount} audio tracks found for {query}.",
       },
     },
     load: "Load more results",
@@ -711,12 +711,12 @@
         image: {
           zero: 'No image results for "{query}"',
           count: '{localeCount} image result for "{query}".|{localeCount} image results for "{query}".',
-          countMore: 'Over {localeCount} image results for "{query}".',
+          countMore: 'Top {localeCount} image results for "{query}".',
         },
         audio: {
           zero: 'No audio tracks for "{query}"',
           count: '{localeCount} audio track for "{query}".|{localeCount} audio tracks for "{query}".',
-          countMore: 'Over {localeCount} audio tracks for "{query}".',
+          countMore: 'Top {localeCount} audio tracks for "{query}".',
         },
       },
       allResultsHeadingCount: {
@@ -726,15 +726,15 @@
           /* Interpolated into browsePage.aria.results.all */
           count: "{localeCount} image|{localeCount} images",
           /* Interpolated into browsePage.aria.results.all */
-          countMore: "over {localeCount} images",
+          countMore: "top {localeCount} images",
         },
         audio: {
           /* Interpolated into browsePage.aria.results.all */
           zero: "no audio tracks",
           /* Interpolated into browsePage.aria.results.all */
           count: "{localeCount} audio track|{localeCount} audio tracks",
           /* Interpolated into browsePage.aria.results.all */
-          countMore: "over {localeCount} audio tracks",
+          countMore: "top {localeCount} audio tracks",
         },
       },
     },
@@ -1150,15 +1150,15 @@
     },
     ariaLabel: {
       creator: {
-        audio: "Audio files by {creator} in {source}",
+        audio: "Audio tracks by {creator} in {source}",
         image: "Images by {creator} in {source}",
       },
       source: {
-        audio: "Audio files from {source}",
+        audio: "Audio tracks from {source}",
         image: "Images from {source}",
       },
       tag: {
-        audio: "Audio files with the tag {tag}",
+        audio: "Audio tracks with the tag {tag}",
         image: "Images with the tag {tag}",
       },
     },
@@ -1167,36 +1167,36 @@
         audio: {
           zero: "No audio tracks by this creator.",
           count: "{count} audio track by this creator.|{count} audio tracks by this creator.",
-          countMore: "Over {count} audio files by this creator.",
+          countMore: "Top {count} audio tracks by this creator.",
         },
         image: {
           zero: "No images by this creator.",
           count: "{count} image by this creator.|{count} images by this creator.",
-          countMore: "Over {count} images by this creator.",
+          countMore: "Top {count} images by this creator.",
         },
       },
       source: {
         audio: {
-          zero: "No audio files provided by this source",
+          zero: "No audio tracks provided by this source",
           count: "{count} audio track provided by this source|{count} audio tracks provided by this source",
-          countMore: "Over {count} audio files provided by this source",
+          countMore: "Top {count} audio tracks provided by this source",
         },
         image: {
           zero: "No images provided by this source",
           count: "{count} image provided by this source|{count} images provided by this source",
-          countMore: "Over {count} images provided by this source",
+          countMore: "Top {count} images provided by this source",
         },
       },
       tag: {
         audio: {
-          zero: "No audio files with the selected tag",
+          zero: "No audio tracks with the selected tag",
           count: "{count} audio track with the selected tag|{count} audio tracks with the selected tag",
-          countMore: "Over {count} audio files with the selected tag",
+          countMore: "Top {count} audio tracks with the selected tag",
         },
         image: {
           zero: "No images with the selected tag",
           count: "{count} image with the selected tag|{count} images with the selected tag",
-          countMore: "Over {count} images with the selected tag",
+          countMore: "Top {count} images with the selected tag",
         },
       },
     },

frontend/src/stores/media/index.ts

@@ -128,7 +128,6 @@ export const useMediaStore = defineStore("media", {
 
     /**
      * Returns the total count of results for selected search type, sums all media results for ALL_MEDIA or additional types.
-     * If the count is more than 10000, returns 10000 to match the API result.
      */
     resultCount(state) {
       const types = (
@@ -137,11 +136,10 @@ export const useMediaStore = defineStore("media", {
           ? supportedMediaTypes
           : [this._searchType]
       ) as SupportedMediaType[]
-      const count = types.reduce(
+      return types.reduce(
         (sum, mediaType) => sum + state.results[mediaType].count,
         0
       )
-      return Math.min(count, 10000)
     },
 
     /**

frontend/test/locales/ar.json

@@ -897,24 +897,24 @@
         "audio": {
           "zero": "No audio files provided by this source",
           "count": "{count} audio file provided by this source. {count}",
-          "countMore": "Over {count} audio files provided by this source"
+          "countMore": "Top {count} audio files provided by this source"
         },
         "image": {
           "zero": "No images provided by this source",
           "count": "{count} image provided by this source. {count} images provided by this source",
-          "countMore": "Over {count} images provided by this source"
+          "countMore": "Top {count} images provided by this source"
         }
       },
       "tag": {
         "audio": {
           "zero": "لا ملفات صوتية مع علامة مختارة",
           "count": "{count} {count}",
-          "countMore": "Over {count} audio files with the selected tag"
+          "countMore": "Top {count} audio files with the selected tag"
         },
         "image": {
           "zero": "لا صور مع العلامة المختارة",
           "count": "{count} {count} الصور مع علامة مختارة",
-          "countMore": "Over {count} images with the selected tag"
+          "countMore": "Top {count} images with the selected tag"
         }
       }
     }

frontend/test/playwright/e2e/resources/mock_image_data.json

@@ -1,6 +1,6 @@
 {
-  "result_count": 10000,
-  "page_count": 250,
+  "result_count": 240,
+  "page_count": 12,
   "page_size": 20,
   "results": [
     {

frontend/test/playwright/e2e/search-types.spec.ts

@@ -40,15 +40,15 @@ const imageConfig = {
   name: "Images",
   url: "/search/image?q=birds",
   canLoadMore: true,
-  results: /Over 10,000 results/,
+  results: /Top 240 results/,
 } as const
 
 const audioConfig = {
   id: "audio",
   name: "Audio",
   url: "/search/audio?q=birds",
   canLoadMore: true,
-  results: /Over 10,000 results/,
+  results: /Top 240 results/,
 } as const
 
 const searchTypes = [allContentConfig, imageConfig, audioConfig] as const

frontend/test/tapes/related/audio/2e38ac1e-830c-4e9c-b13d-2c9a1ad53f95_keep-alive.json5

@@ -78,7 +78,7 @@
             ],
         },
         body: {
-            result_count: 10000,
+            result_count: 240,
             page_count: 1,
             page_size: 10,
             page: null,

frontend/test/tapes/related/audio/2ecd5631-c48c-4a5f-89c4-83c44dbbd365_keep-alive.json5

@@ -78,7 +78,7 @@
             ],
         },
         body: {
-            result_count: 10000,
+            result_count: 240,
             page_count: 1,
             page_size: 10,
             page: null,

frontend/test/tapes/related/audio/7e063ee6-343f-48e4-a4a5-f436393730f6_close.json5

@@ -65,7 +65,7 @@
             ],
         },
         body: {
-            result_count: 10000,
+            result_count: 240,
             page_count: 1,
             page_size: 10,
             page: null,

frontend/test/tapes/related/audio/b502f915-adce-406b-ad87-9b17250331dd_keep-alive.json5

@@ -81,7 +81,7 @@
             ],
         },
         body: {
-            result_count: 10000,
+            result_count: 240,
             page_count: 1,
             page_size: 10,
             page: null,

frontend/test/tapes/related/images/53841492-9703-4892-96b4-10297dd84ed0_keep-alive.json5

@@ -90,7 +90,7 @@
             ],
         },
         body: {
-            result_count: 10000,
+            result_count: 240,
             page_count: 1,
             page_size: 10,
             page: null,

frontend/test/tapes/related/images/cfa45160-a7be-4911-9b9f-4e66678ec7f7_keep-alive.json5

@@ -81,7 +81,7 @@
             ],
         },
         body: {
-            result_count: 10000,
+            result_count: 240,
             page_count: 1,
             page_size: 10,
             page: null,

frontend/test/tapes/related/images/da5cb478-c093-4d62-b721-cda18797e3fb_close.json5

@@ -74,7 +74,7 @@
             ],
         },
         body: {
-            result_count: 10000,
+            result_count: 240,
             page_count: 1,
             page_size: 10,
             page: 1,

frontend/test/tapes/related/images/da5cb478-c093-4d62-b721-cda18797e3fb_keep-alive.json5

@@ -78,7 +78,7 @@
             ],
         },
         body: {
-            result_count: 10000,
+            result_count: 240,
             page_count: 1,
             page_size: 10,
             page: null,

frontend/test/tapes/related/images/e9d97a98-621b-4ec2-bf70-f47a74380452_close.json5

@@ -75,7 +75,7 @@
             ],
         },
         body: {
-            result_count: 10000,
+            result_count: 240,
             page_count: 1,
             page_size: 10,
             page: null,

frontend/test/tapes/related/images/e9d97a98-621b-4ec2-bf70-f47a74380452_keep-alive.json5

@@ -92,7 +92,7 @@
             ],
         },
         body: {
-            result_count: 10000,
+            result_count: 240,
             page_count: 1,
             page_size: 10,
             page: null,

frontend/test/tapes/related/images/ea7e24ee-1374-4c49-9f6f-5c4529b701d8_keep-alive.json5

@@ -92,7 +92,7 @@
             ],
         },
         body: {
-            result_count: 10000,
+            result_count: 240,
             page_count: 1,
             page_size: 10,
             page: null,

frontend/test/tapes/related/images/f9384235-b72e-4f1e-9b05-e1b116262a29_close.json5

@@ -74,7 +74,7 @@
             ],
         },
         body: {
-            result_count: 10000,
+            result_count: 240,
             page_count: 1,
             page_size: 10,
             page: null,

frontend/test/tapes/related/images/f9384235-b72e-4f1e-9b05-e1b116262a29_keep-alive.json5

@@ -78,7 +78,7 @@
             ],
         },
         body: {
-            result_count: 10000,
+            result_count: 240,
             page_count: 1,
             page_size: 10,
             page: null,

frontend/test/tapes/search/audio/q=birds&license_type=commercial&peaks=true_keep-alive.json5

@@ -81,7 +81,7 @@
             ],
         },
         body: {
-            result_count: 10000,
+            result_count: 240,
             page_count: 20,
             page_size: 20,
             page: 1,

frontend/test/tapes/search/audio/q=birds&peaks=true_close.json5

@@ -78,7 +78,7 @@
             ],
         },
         body: {
-            result_count: 10000,
+            result_count: 240,
             page_count: 20,
             page_size: 20,
             page: 1,

frontend/test/tapes/search/audio/q=birds&peaks=true_keep-alive.json5

@@ -81,7 +81,7 @@
             ],
         },
         body: {
-            result_count: 10000,
+            result_count: 240,
             page_count: 20,
             page_size: 20,
             page: 1,

frontend/test/tapes/search/audio/q=birds&source=freesound&peaks=true_keep-alive.json5

@@ -90,7 +90,7 @@
             ],
         },
         body: {
-            result_count: 10000,
+            result_count: 240,
             page_count: 20,
             page_size: 20,
             page: 1,

frontend/test/tapes/search/audio/q=cat&license_type=commercial&license=cc0&peaks=true_keep-alive.json5

@@ -90,7 +90,7 @@
             ],
         },
         body: {
-            result_count: 10000,
+            result_count: 240,
             page_count: 20,
             page_size: 20,
             page: 1,

frontend/test/tapes/search/audio/q=cat&license_type=commercial&peaks=true_keep-alive.json5

@@ -93,7 +93,7 @@
             ],
         },
         body: {
-            result_count: 10000,
+            result_count: 240,
             page_count: 20,
             page_size: 20,
             page: 1,