fix: remove extra Forms

Author: Mygod

src/components/filters/Advanced.jsx

@@ -126,7 +126,9 @@ export function AdvancedFilter() {
           category === 'pokemon' || (!id.startsWith('l') && !id.startsWith('i'))
             ? t('advanced')
             : t('set_size')
-        } - ${tId(id)}`}
+        } - ${tId(id, {
+          omitFormSuffix: true,
+        })}`}
         action={() => toggleClose(false)}
       />
       <DialogContent sx={{ mt: 3 }}>

src/components/virtual/SelectorItem.jsx

@@ -48,6 +48,7 @@ export function SelectorItem({
     alt: true,
     newLine: true,
     quest: category === 'pokestops',
+    omitFormSuffix: true,
   })
   const title = t(id)
   const url = useMemory((s) => s.Icons.getIconById(id))

src/features/drawer/components/SelectorList.jsx

@@ -45,7 +45,10 @@ function SelectorList({ category, subCategory, label, height = 400 }) {
     subCategory ? capitalize(subCategory) : ''
   }QuickSelect`
   const { available } = useGetAvailable(category)
-  const { t: tId } = useTranslateById({ quest: subCategory === 'pokemon' })
+  const { t: tId } = useTranslateById({
+    quest: subCategory === 'pokemon',
+    omitFormSuffix: true,
+  })
   const { t } = useTranslation()
   const allFilters = useMemory((s) => s.filters[category]?.filter)
 

src/hooks/useTranslateById.js

@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next'
 import { getFormDisplay } from '@utils/getFormDisplay'
 
 /**
- * @typedef {{ plural?: boolean, amount?: boolean, alt?: boolean, newLine?: boolean, quest?: boolean }} CustomTOptions
+ * @typedef {{ plural?: boolean, amount?: boolean, alt?: boolean, newLine?: boolean, quest?: boolean, omitFormSuffix?: boolean }} CustomTOptions
  * @typedef {(id: string, options?: CustomTOptions) => string} CustomT
  */
 
@@ -19,7 +19,10 @@ export function useTranslateById(options = {}) {
   return useMemo(
     () => ({
       language: i18n.i18n.language,
-      t: (id, { plural, amount, alt, newLine, quest } = options) => {
+      t: (
+        id,
+        { plural, amount, alt, newLine, quest, omitFormSuffix } = options,
+      ) => {
         if (typeof id !== 'string') {
           return ''
         }
@@ -116,6 +119,7 @@ export function useTranslateById(options = {}) {
                 ? ''
                 : getFormDisplay(pokemon, form, undefined, {
                     showDefaultForms: quest,
+                    appendFormSuffix: !omitFormSuffix,
                   })
             return formLabel
               ? `${pokemonName}${newLine ? '\n' : ' '}(${formLabel})`
@@ -124,6 +128,13 @@ export function useTranslateById(options = {}) {
         }
       },
     }),
-    [i18n, options.alt, options.amount, options.plural, options.newLine],
+    [
+      i18n,
+      options.alt,
+      options.amount,
+      options.plural,
+      options.newLine,
+      options.omitFormSuffix,
+    ],
   )
 }

src/utils/getFormDisplay.js

@@ -10,7 +10,7 @@ const ALWAYS_SHOW_FORM_POKEMON = new Set([51]) // Dugtrio (51) needs form labels
  * @param {number | string | null | undefined} pokemonId
  * @param {number | string | null | undefined} form
  * @param {number | string | null | undefined} costume
- * @param {{ showDefaultForms?: boolean }} [options]
+ * @param {{ showDefaultForms?: boolean, appendFormSuffix?: boolean }} [options]
  * @returns {string}
  */
 export function getFormDisplay(pokemonId, form, costume, options = {}) {
@@ -34,7 +34,7 @@ export function getFormDisplay(pokemonId, form, costume, options = {}) {
     return `${translate('form')} ${form}`
   }
 
-  const { showDefaultForms = false } = options
+  const { showDefaultForms = false, appendFormSuffix = true } = options
   if (!showDefaultForms) {
     const normalizedPokemonId =
       typeof pokemonId === 'number'
@@ -52,6 +52,8 @@ export function getFormDisplay(pokemonId, form, costume, options = {}) {
       return ''
   }
 
+  if (!appendFormSuffix) return formName
+
   const suffix = ` ${translate('form')}`
   return formName.endsWith(suffix) ? formName : `${formName}${suffix}`
 }