Merge pull request #3536 from LiteFarmOrg/LF-4417-change-breed-and-ty…

…pe-placeholders LF-4417 change breed and type fields placeholders
LiteFarmOrg · Nov 21, 2024 · e1d2293 · e1d2293
2 parents f894c8c + df48db6
commit e1d2293
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 15 deletions.
diff --git a/packages/webapp/public/locales/en/common.json b/packages/webapp/public/locales/en/common.json
@@ -85,6 +85,7 @@
   "SELECTED_COUNT_one": "{{count}} selected",
   "SELECTED_COUNT_many": "{{count}} selected",
   "SELECTED_COUNT_other": "{{count}} selected",
+  "SELECT_OR_ADD_YOUR_OWN": "Select or add your own",
   "SET": "Set",
   "SHOWING_ALL": "Showing all",
   "SKIP": "Skip",

diff --git a/packages/webapp/public/locales/en/translation.json b/packages/webapp/public/locales/en/translation.json
@@ -14,7 +14,6 @@
     "BATCH_NAME": "Batch name",
     "BATCH_NAME_PLACEHOLDER": "Type in batch name",
     "BREED": "Breed",
-    "BREED_PLACEHOLDER": "Add your animal breed",
     "BREED_PLACEHOLDER_DISABLED": "Please select a type first",
     "CREATE_INDIVIDUAL_PROFILES": "Create individual animal profiles",
     "CREATE_INDIVIDUAL_PROFILES_TOOLTIP": "Select this option if you want to track and manage each animal separately",
@@ -62,7 +61,6 @@
       "MAIN": "You successfully added {{animalCount}} {{and}} {{batchCount}} to your inventory."
     },
     "TYPE": "Type",
-    "TYPE_PLACEHOLDER": "Select the animal type",
     "UNIQUE_DETAILS": "Unique details"
   },
   "ADD_FARM": {

diff --git a/packages/webapp/public/locales/es/translation.json b/packages/webapp/public/locales/es/translation.json
@@ -16,7 +16,6 @@
     "BATCH_NAME": "MISSING",
     "BATCH_NAME_PLACEHOLDER": "MISSING",
     "BREED": "MISSING",
-    "BREED_PLACEHOLDER": "MISSING",
     "BREED_PLACEHOLDER_DISABLED": "MISSING",
     "CREATE_INDIVIDUAL_PROFILES": "MISSING",
     "CREATE_INDIVIDUAL_PROFILES_TOOLTIP": "MISSING",
@@ -67,7 +66,6 @@
       "MAIN": "MISSING"
     },
     "TYPE": "MISSING",
-    "TYPE_PLACEHOLDER": "MISSING",
     "UNIQUE_DETAILS": "MISSING"
   },
   "ADD_FARM": {

diff --git a/packages/webapp/public/locales/fr/translation.json b/packages/webapp/public/locales/fr/translation.json
@@ -16,7 +16,6 @@
     "BATCH_NAME": "MISSING",
     "BATCH_NAME_PLACEHOLDER": "MISSING",
     "BREED": "MISSING",
-    "BREED_PLACEHOLDER": "MISSING",
     "BREED_PLACEHOLDER_DISABLED": "MISSING",
     "CREATE_INDIVIDUAL_PROFILES": "MISSING",
     "CREATE_INDIVIDUAL_PROFILES_TOOLTIP": "MISSING",
@@ -67,7 +66,6 @@
       "MAIN": "MISSING"
     },
     "TYPE": "MISSING",
-    "TYPE_PLACEHOLDER": "MISSING",
     "UNIQUE_DETAILS": "MISSING"
   },
   "ADD_FARM": {

diff --git a/packages/webapp/public/locales/pt/translation.json b/packages/webapp/public/locales/pt/translation.json
@@ -16,7 +16,6 @@
     "BATCH_NAME": "MISSING",
     "BATCH_NAME_PLACEHOLDER": "MISSING",
     "BREED": "MISSING",
-    "BREED_PLACEHOLDER": "MISSING",
     "BREED_PLACEHOLDER_DISABLED": "MISSING",
     "CREATE_INDIVIDUAL_PROFILES": "MISSING",
     "CREATE_INDIVIDUAL_PROFILES_TOOLTIP": "MISSING",
@@ -67,7 +66,6 @@
       "MAIN": "MISSING"
     },
     "TYPE": "MISSING",
-    "TYPE_PLACEHOLDER": "MISSING",
     "UNIQUE_DETAILS": "MISSING"
   },
   "ADD_FARM": {

diff --git a/packages/webapp/src/components/Animals/AddAnimalsFormCard/AnimalSelect.tsx b/packages/webapp/src/components/Animals/AddAnimalsFormCard/AnimalSelect.tsx
@@ -51,7 +51,6 @@ export function AnimalTypeSelect<T extends FieldValues>({
         render={({ field: { onChange, value } }) => (
           <CreatableSelect
             label={t('ADD_ANIMAL.TYPE')}
-            placeholder={t('ADD_ANIMAL.TYPE_PLACEHOLDER')}
             options={typeOptions}
             onChange={(option) => {
               onChange(option);
@@ -94,11 +93,7 @@ export function AnimalBreedSelect<T extends FieldValues>({
           label={t('ADD_ANIMAL.BREED')}
           optional
           controlShouldRenderValue={isTypeSelected}
-          placeholder={
-            isTypeSelected
-              ? t('ADD_ANIMAL.BREED_PLACEHOLDER')
-              : t('ADD_ANIMAL.BREED_PLACEHOLDER_DISABLED')
-          }
+          placeholder={isTypeSelected ? undefined : t('ADD_ANIMAL.BREED_PLACEHOLDER_DISABLED')}
           isDisabled={!isTypeSelected || isDisabled}
           onChange={(option) => onChange(option)}
           value={value}

diff --git a/packages/webapp/src/components/Form/ReactSelect/CreatableSelect.tsx b/packages/webapp/src/components/Form/ReactSelect/CreatableSelect.tsx
@@ -54,7 +54,7 @@ const CreatableSelect = React.forwardRef((props, ref) => {
     optional,
     components,
     createPromptText = t('common:CREATE'),
-    placeholder = t('common:SELECT') + '...',
+    placeholder = t('common:SELECT_OR_ADD_YOUR_OWN'),
     ...restProps
   } = props;