Skip to content

Commit b4e1c87

Browse files
authored
Merge pull request Expensify#79162 from Expensify/arosiclair-revert-78268
Revert "Merge pull request Expensify#78268 from software-mansion-labs/mrejdak/…
2 parents b89dd96 + ce79a4d commit b4e1c87

38 files changed

Lines changed: 709 additions & 369 deletions

src/components/AddressForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ function AddressForm({
134134
if (countrySpecificZipRegex) {
135135
if (!countrySpecificZipRegex.test(values.zipPostCode?.trim().toUpperCase())) {
136136
if (isRequiredFulfilled(values.zipPostCode?.trim())) {
137-
errors.zipPostCode = translate('privatePersonalDetails.error.incorrectZipFormat', countryZipFormat);
137+
errors.zipPostCode = translate('privatePersonalDetails.error.incorrectZipFormat', {zipFormat: countryZipFormat});
138138
} else {
139139
errors.zipPostCode = translate('common.error.fieldRequired');
140140
}

src/components/ExceededCommentLength.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function ExceededCommentLength({maxCommentLength = CONST.MAX_COMMENT_LENGTH, isT
2020
style={[styles.textMicro, styles.textDanger, styles.chatItemComposeSecondaryRow, styles.mlAuto, styles.pl2]}
2121
numberOfLines={1}
2222
>
23-
{translate(translationKey, numberFormat(maxCommentLength))}
23+
{translate(translationKey, {formattedMaxLength: numberFormat(maxCommentLength)})}
2424
</Text>
2525
);
2626
}

src/components/FocusModeNotification.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function FocusModeNotification({onClose}: FocusModeNotificationProps) {
3131
onCancel={onClose}
3232
prompt={
3333
<View style={[styles.renderHTML, styles.flexRow]}>
34-
<RenderHTML html={translate('focusModeUpdateModal.prompt', priorityModePageUrl)} />
34+
<RenderHTML html={translate('focusModeUpdateModal.prompt', {priorityModePageUrl})} />
3535
</View>
3636
}
3737
isVisible

src/components/ImportColumn.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ function ImportColumn({column, columnName, columnRoles, columnIndex, shouldShowD
178178
// eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps -- we don't want this effect to run again
179179
}, []);
180180

181-
const columnHeader = containsHeader ? column.at(0) : translate('spreadsheet.column', columnName);
181+
const columnHeader = containsHeader ? column.at(0) : translate('spreadsheet.column', {name: columnName});
182182

183183
return (
184184
<View style={[styles.importColumnCard, styles.mt4]}>

src/components/ImportSpreadsheetConfirmModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function ImportSpreadsheetConfirmModal({isVisible, closeImportPageAndModal, onMo
3232
}
3333
const title = spreadsheet.importFinalModal.titleKey ? translate(spreadsheet.importFinalModal.titleKey) : '';
3434
const prompt = spreadsheet.importFinalModal.promptKey
35-
? translate(spreadsheet.importFinalModal.promptKey, ...(spreadsheet.importFinalModal.promptKeyParams as TranslationParameters<typeof spreadsheet.importFinalModal.promptKey>))
35+
? translate(spreadsheet.importFinalModal.promptKey, spreadsheet.importFinalModal.promptKeyParams as TranslationParameters<typeof spreadsheet.importFinalModal.promptKey>[0])
3636
: '';
3737
setTitleText(title);
3838
setPromptText(prompt);

src/components/UploadFile.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ function UploadFile({
8383
}
8484

8585
if (fileLimit && resultedFiles.length > 0 && resultedFiles.length > fileLimit) {
86-
setError(translate('attachmentPicker.tooManyFiles', fileLimit));
86+
setError(translate('attachmentPicker.tooManyFiles', {fileLimit}));
8787
return;
8888
}
8989

src/languages/de.ts

Lines changed: 54 additions & 31 deletions
Large diffs are not rendered by default.

src/languages/en.ts

Lines changed: 52 additions & 31 deletions
Large diffs are not rendered by default.

src/languages/es.ts

Lines changed: 31 additions & 31 deletions
Large diffs are not rendered by default.

src/languages/fr.ts

Lines changed: 52 additions & 31 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)