Updating Translate to Manage Pluralization

.github/libs/sanitizeStringForJSONParse.ts

@@ -8,7 +8,7 @@ const replacer = (str: string): string =>
         '\r': '\\r',
         '\f': '\\f',
         '"': '\\"',
-    }[str] ?? '');
+    })[str] ?? '';
 
 /**
  * Replace any characters in the string that will break JSON.parse for our Git Log output

src/components/AttachmentModal.tsx

@@ -396,7 +396,7 @@ function AttachmentModal({
         if (canEditReceipt) {
             menuItems.push({
                 icon: Expensicons.Camera,
-                text: translate('common.replace'),
+                text: translate('common.replaceText'),
                 onSelected: () => {
                     closeModal();
                     Navigation.navigate(

src/components/AvatarWithImagePicker.tsx

@@ -415,7 +415,7 @@ function AvatarWithImagePicker({
                 <DotIndicatorMessage
                     style={[styles.mt6]}
                     // eslint-disable-next-line @typescript-eslint/naming-convention
-                    messages={{0: translate(errorData.validationError, errorData.phraseParam as never)}}
+                    messages={{0: translate(errorData.validationError)}}
                     type="error"
                 />
             )}

src/components/CategoryPicker.tsx

@@ -78,7 +78,7 @@ function CategoryPicker({selectedCategory, policyCategories, policyRecentlyUsedC
             sections={sections}
             headerMessage={headerMessage}
             textInputValue={searchValue}
-            textInputLabel={shouldShowTextInput ? translate('common.search') : undefined}
+            textInputLabel={shouldShowTextInput ? translate('common.searchText') : undefined}
             onChangeText={setSearchValue}
             onSelectRow={onSubmit}
             ListItem={RadioListItem}

src/components/EmojiPicker/EmojiPickerMenu/index.native.tsx

@@ -119,8 +119,8 @@ function EmojiPickerMenu({onEmojiSelected, activeEmoji}: EmojiPickerMenuProps, r
         <View style={[styles.emojiPickerContainer, StyleUtils.getEmojiPickerStyle(shouldUseNarrowLayout)]}>
             <View style={[styles.ph4, styles.pb1, styles.pt2]}>
                 <TextInput
-                    label={translate('common.search')}
-                    accessibilityLabel={translate('common.search')}
+                    label={translate('common.searchText')}
+                    accessibilityLabel={translate('common.searchText')}
                     role={CONST.ROLE.PRESENTATION}
                     onChangeText={filterEmojis}
                     blurOnSubmit={filteredEmojis.length > 0}

src/components/EmojiPicker/EmojiPickerMenu/index.tsx

@@ -315,8 +315,8 @@ function EmojiPickerMenu({onEmojiSelected, activeEmoji}: EmojiPickerMenuProps, r
         >
             <View style={[styles.ph4, styles.pb3, styles.pt2]}>
                 <TextInput
-                    label={translate('common.search')}
-                    accessibilityLabel={translate('common.search')}
+                    label={translate('common.searchText')}
+                    accessibilityLabel={translate('common.searchText')}
                     role={CONST.ROLE.PRESENTATION}
                     onChangeText={filterEmojis}
                     defaultValue=""

src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx

@@ -185,7 +185,7 @@ function MoneyRequestPreviewContent({
         } else if (isScanning) {
             message = translate('common.receipt');
         } else if (isBillSplit) {
-            message = translate('iou.split');
+            message = translate('iou.splitIOU');
         }
 
         if (isSettled && !iouReport?.isCancelledIOU && !isPartialHold) {
@@ -422,7 +422,7 @@ function MoneyRequestPreviewContent({
             onPressOut={() => ControlSelection.unblock()}
             onLongPress={showContextMenu}
             shouldUseHapticsOnLongPress
-            accessibilityLabel={isBillSplit ? translate('iou.split') : showCashOrCard}
+            accessibilityLabel={isBillSplit ? translate('iou.splitIOU') : showCashOrCard}
             accessibilityHint={CurrencyUtils.convertToDisplayString(requestAmount, requestCurrency)}
             style={[
                 styles.moneyRequestPreviewBox,

src/components/ReportActionItem/ReportPreview.tsx

@@ -313,8 +313,7 @@ function ReportPreview({
             return {supportText: formattedMerchant};
         }
         return {
-            supportText: translate('iou.expenseCount', {
-                count: numberOfRequests - numberOfScanningReceipts - numberOfPendingRequests,
+            supportText: translate('iou.expenseCount', numberOfRequests - numberOfScanningReceipts - numberOfPendingRequests, {
                 scanningReceipts: numberOfScanningReceipts,
                 pendingReceipts: numberOfPendingRequests,
             }),

src/components/TagPicker/index.tsx

@@ -102,7 +102,7 @@ function TagPicker({selectedTag, tagListName, policyTags, tagListIndex, policyRe
             sections={sections}
             textInputValue={searchValue}
             headerMessage={headerMessage}
-            textInputLabel={shouldShowTextInput ? translate('common.search') : undefined}
+            textInputLabel={shouldShowTextInput ? translate('common.searchText') : undefined}
             isRowMultilineSupported
             initiallyFocusedOptionKey={selectedOptionKey}
             onChangeText={setSearchValue}

src/components/TaxPicker.tsx

@@ -112,7 +112,7 @@ function TaxPicker({selectedTaxRate = '', policy, transaction, insets, onSubmit,
             sections={sections}
             headerMessage={headerMessage}
             textInputValue={searchValue}
-            textInputLabel={shouldShowTextInput ? translate('common.search') : undefined}
+            textInputLabel={shouldShowTextInput ? translate('common.searchText') : undefined}
             onChangeText={setSearchValue}
             onSelectRow={handleSelectRow}
             ListItem={RadioListItem}

src/hooks/useStepFormSubmit.ts

@@ -24,10 +24,13 @@ export default function useStepFormSubmit<T extends keyof OnyxFormValuesMapping>
     return useCallback(
         (values: FormOnyxValues<T>) => {
             if (shouldSaveDraft) {
-                const stepValues = fieldIds.reduce((acc, key) => {
-                    acc[key] = values[key];
-                    return acc;
-                }, {} as Record<TupleToUnion<typeof fieldIds>, OnyxValues[T][Exclude<keyof OnyxValues[T], keyof BaseForm>]>);
+                const stepValues = fieldIds.reduce(
+                    (acc, key) => {
+                        acc[key] = values[key];
+                        return acc;
+                    },
+                    {} as Record<TupleToUnion<typeof fieldIds>, OnyxValues[T][Exclude<keyof OnyxValues[T], keyof BaseForm>]>,
+                );
 
                 FormActions.setDraftValues(formId, stepValues);
             }