Added pluralization system for lang translations #45892

shubham1206agra · 2024-07-22T10:40:14Z

Details

Fixed Issues

$ #38614

Tests

Navigate to a chat room or report that contains messages with pluralized text related to expense counts (e.g., "2 expenses, 1 scanning").
Verify that the pluralized text is displayed correctly based on the count (e.g., "1 expense" for count 1, "2 expenses, 1 scanning" for counts 2 expenses and 1 scanning receipt).
Change the app's language to a different supported language (e.g., Spanish) and verify that the pluralized text is correctly translated and displayed based on the counts.
Navigate to a workspace settings page that shows the "Selected" count for members (e.g., "2 selected").
Verify that the pluralized text is displayed correctly based on the count (e.g., "1 selected" for count 1, "5 selected" for count 5).
Change the app's language to a different supported language (e.g., Spanish) and verify that the pluralized text is correctly translated and displayed based on the count.
Navigate to a workspace settings page that displays options related to distance rates (e.g., "Delete rates", "Enable rates", "Disable rate", "Are you sure you want to delete these rates?").
Verify that the pluralized text is displayed correctly based on the count for each option.
Change the app's language to a different supported language (e.g., Spanish) and verify that the pluralized text is correctly translated and displayed based on the count for each option.

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-08-05.at.10.42.37.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-08-05.at.9.38.05.PM.mov

iOS: Native

Screen.Recording.2024-08-05.at.10.21.26.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-08-05.at.9.33.41.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-08-05.at.9.29.21.PM.mov

MacOS: Desktop

Screen.Recording.2024-08-05.at.9.41.20.PM.mov

shubham1206agra · 2024-07-22T11:25:24Z

@jayeshmangwani You can start testing this PR.

jayeshmangwani · 2024-07-22T11:29:15Z

You can start testing this PR.

Sure, will start testing in an hour

src/languages/en.ts

Co-authored-by: Jayesh Mangwani <35371050+jayeshmangwani@users.noreply.github.com>

src/languages/es.ts

shubham1206agra · 2024-07-25T09:47:06Z

@jayeshmangwani Can you test this PR once?

jayeshmangwani · 2024-07-25T10:17:41Z

@shubham1206agra Yes, I have tested it and suggested a few changes above. When running the app, I haven't faced any issues yet.

jayeshmangwani · 2024-07-25T10:21:50Z

@shubham1206agra If you feel that the PR is ready for verifying the TypeScript changes, then we can tag the TS expert to verify the type changes.

jayeshmangwani · 2024-07-25T11:19:56Z

src/libs/Localize/index.ts

+            if (typeof calledTranslatedPhrase === 'string') {
+                return calledTranslatedPhrase;
+            }
+            const count = phraseParameters[1] ?? 0;


Why are we setting the count default to 0 if there is a first element?

Nope, this is different logic. This logic gives a fallback value to count. This is to make TS happy only.

Why are we setting the count default to 0 if there is a first element?

This will not be a case always.

What I am trying to say is that we should not add the fallback to 0. If there is no count, then we can return the translatedPhrase, right?

src/languages/en.ts

jayeshmangwani · 2024-07-26T09:53:41Z

@shubham1206agra The PR is working fine for me; I haven't found any issues. I think we can proceed with opening this PR for the type changes. WDYT ?

src/pages/home/report/ReportActionCompose/ReportActionCompose.tsx

jayeshmangwani · 2024-07-30T11:28:09Z

@shubham1206agra Would you complete the checklist here?

jayeshmangwani · 2024-07-30T11:31:35Z

@blazejkustra Tagging you here for verifying 👀 the TypeScript changes on the PR

blazejkustra

Couple comments, looking really solid from TS perspective!

src/components/AddressForm.tsx

src/components/ArchivedReportFooter.tsx

src/components/Search/SearchPageHeader.tsx

src/languages/types.ts

shubham1206agra · 2024-09-27T05:16:40Z

@ZhenjaHorbach This is ready for review again.

ZhenjaHorbach · 2024-09-27T06:10:12Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

android-web.mov

iOS: Native

ios.mov

iOS: mWeb Safari

ios-web.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

ZhenjaHorbach · 2024-09-27T12:30:50Z

LGTM !

iwiznia

Going to approve since I posted this to see if we enable the eslint rule for it: https://expensify.slack.com/archives/C01GTK53T8Q/p1727441233067399

src/languages/en.ts

iwiznia · 2024-09-27T13:51:25Z

@jayeshmangwani can you re-review and tag me to merge once you are done, please?

ZhenjaHorbach · 2024-09-27T13:55:51Z

@jayeshmangwani can you re-review and tag me to merge once you are done, please?

Technically I'm a reviewer here !

https://expensify.slack.com/archives/C02NK2DQWUX/p1724766480541149

So we can move on

iwiznia · 2024-09-27T13:57:59Z

Ah got it!

melvin-bot · 2024-09-27T13:58:45Z

@iwiznia looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

iwiznia · 2024-09-27T13:59:19Z

Same as in #45892 this PR touches a lot of unrelated files and we don't want to fix existing eslint problems as part of it.

OSBotify · 2024-09-27T14:08:52Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2024-09-27T17:58:14Z

🚀 Deployed to staging by https://github.com/iwiznia in version: 9.0.41-0 🚀

platform	result
🤖 android 🤖	cancelled 🔪
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

kavimuru · 2024-09-30T18:16:25Z

@jayeshmangwani @blazejkustra Could you help us with 1st 3 steps where do we see the following?

Navigate to a chat room or report that contains messages with pluralized text related to the maximum number of participants (e.g., "You've selected the maximum number (2) of participants.").

Verify that the pluralized text is displayed correctly based on the count (e.g., "You've selected the maximum number (2) of participants." for count 2, and "You've selected the maximum number (5) of participants." for count 5).

Change the app's language to a different supported language (e.g., Spanish) and verify that the pluralized text is correctly translated and displayed based on the count.

github-actions · 2024-09-30T22:40:01Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.0.41-10 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

shubham1206agra · 2024-10-01T01:42:26Z

@jayeshmangwani @blazejkustra Could you help us with 1st 3 steps where do we see the following?

Navigate to a chat room or report that contains messages with pluralized text related to the maximum number of participants (e.g., "You've selected the maximum number (2) of participants.").

Verify that the pluralized text is displayed correctly based on the count (e.g., "You've selected the maximum number (2) of participants." for count 2, and "You've selected the maximum number (5) of participants." for count 5).

Change the app's language to a different supported language (e.g., Spanish) and verify that the pluralized text is correctly translated and displayed based on the count.

@kavimuru Sorry, I forgot to remove this old test.

shubham1206agra added 2 commits July 22, 2024 16:09

Added pluralization system for lang translations

e69dd46

Fix lint

e7df141

shubham1206agra commented Jul 22, 2024

View reviewed changes

src/languages/en.ts Outdated Show resolved Hide resolved

jayeshmangwani reviewed Jul 25, 2024

View reviewed changes

src/languages/en.ts Outdated Show resolved Hide resolved

shubham1206agra commented Jul 25, 2024

View reviewed changes

src/languages/en.ts Outdated Show resolved Hide resolved

Apply suggestions from code review

dbc34e6

Co-authored-by: Jayesh Mangwani <35371050+jayeshmangwani@users.noreply.github.com>

shubham1206agra commented Jul 25, 2024

View reviewed changes

src/languages/es.ts Outdated Show resolved Hide resolved

shubham1206agra commented Jul 25, 2024

View reviewed changes

src/languages/es.ts Outdated Show resolved Hide resolved

Apply suggestions from code review

7f91f9b

jayeshmangwani reviewed Jul 25, 2024

View reviewed changes

src/languages/en.ts Outdated Show resolved Hide resolved

Merge branch 'main' into pluralizing-translation

9e2861d

shubham1206agra commented Jul 29, 2024

View reviewed changes

src/pages/home/report/ReportActionCompose/ReportActionCompose.tsx Outdated Show resolved Hide resolved

Apply suggestions from code review

c8dd8d1

blazejkustra suggested changes Jul 30, 2024

View reviewed changes

shubham1206agra and others added 4 commits July 30, 2024 18:11

Fixed unused type

3a15ab3

Merge branch 'main' into pluralizing-translation

8af7a6f

Fixed lint

fd0b5e7

Fixed lint

e29c4bf

shubham1206agra mentioned this pull request Jul 31, 2024

#45951 & #45958: Implement <ApprovalWorkflowSection /> component and Enhance toLocaleOrdinal to support string ordinals #46562

Merged

50 tasks

shubham1206agra added 2 commits August 1, 2024 17:58

Merge main

c4c5787

Apply suggestions

5eed7b5

shubham1206agra mentioned this pull request Sep 26, 2024

Added count param to phrase param and return plural form accordingly #48229

Merged

50 tasks

shubham1206agra added 2 commits September 27, 2024 10:20

Merge main

75ad856

Merge conflicts

1dde318

shubham1206agra requested a review from ZhenjaHorbach September 27, 2024 05:16

ZhenjaHorbach approved these changes Sep 27, 2024

View reviewed changes

melvin-bot bot requested a review from iwiznia September 27, 2024 12:30

iwiznia previously approved these changes Sep 27, 2024

View reviewed changes

src/languages/en.ts Outdated Show resolved Hide resolved

iwiznia requested review from jayeshmangwani and blazejkustra September 27, 2024 13:06

Fix backticks usage

e514a72

shubham1206agra dismissed iwiznia’s stale review via e514a72 September 27, 2024 13:44

blazejkustra approved these changes Sep 27, 2024

View reviewed changes

iwiznia approved these changes Sep 27, 2024

View reviewed changes

iwiznia merged commit 77e2fd9 into Expensify:main Sep 27, 2024
21 of 22 checks passed

melvin-bot bot added the Emergency label Sep 27, 2024

iwiznia removed the Emergency label Sep 27, 2024

github-actions bot mentioned this pull request Sep 27, 2024

Deploy Checklist: New Expensify 2024-09-27 #49855

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added pluralization system for lang translations #45892

Added pluralization system for lang translations #45892

shubham1206agra commented Jul 22, 2024 •

edited

Loading

shubham1206agra commented Jul 22, 2024

jayeshmangwani commented Jul 22, 2024

shubham1206agra commented Jul 25, 2024

jayeshmangwani commented Jul 25, 2024

jayeshmangwani commented Jul 25, 2024

jayeshmangwani Jul 25, 2024

shubham1206agra Jul 25, 2024

shubham1206agra Jul 25, 2024

jayeshmangwani Jul 25, 2024 •

edited

Loading

jayeshmangwani commented Jul 26, 2024

jayeshmangwani commented Jul 30, 2024

jayeshmangwani commented Jul 30, 2024

blazejkustra left a comment

shubham1206agra commented Sep 27, 2024

ZhenjaHorbach commented Sep 27, 2024 •

edited

Loading

ZhenjaHorbach commented Sep 27, 2024

iwiznia left a comment

iwiznia commented Sep 27, 2024

ZhenjaHorbach commented Sep 27, 2024 •

edited

Loading

iwiznia commented Sep 27, 2024

melvin-bot bot commented Sep 27, 2024

iwiznia commented Sep 27, 2024

OSBotify commented Sep 27, 2024

github-actions bot commented Sep 27, 2024

kavimuru commented Sep 30, 2024

github-actions bot commented Sep 30, 2024

shubham1206agra commented Oct 1, 2024

Added pluralization system for lang translations #45892

Added pluralization system for lang translations #45892

Conversation

shubham1206agra commented Jul 22, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

shubham1206agra commented Jul 22, 2024

jayeshmangwani commented Jul 22, 2024

shubham1206agra commented Jul 25, 2024

jayeshmangwani commented Jul 25, 2024

jayeshmangwani commented Jul 25, 2024

jayeshmangwani Jul 25, 2024

Choose a reason for hiding this comment

shubham1206agra Jul 25, 2024

Choose a reason for hiding this comment

shubham1206agra Jul 25, 2024

Choose a reason for hiding this comment

jayeshmangwani Jul 25, 2024 • edited Loading

Choose a reason for hiding this comment

jayeshmangwani commented Jul 26, 2024

jayeshmangwani commented Jul 30, 2024

jayeshmangwani commented Jul 30, 2024

blazejkustra left a comment

Choose a reason for hiding this comment

shubham1206agra commented Sep 27, 2024

ZhenjaHorbach commented Sep 27, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

ZhenjaHorbach commented Sep 27, 2024

iwiznia left a comment

Choose a reason for hiding this comment

iwiznia commented Sep 27, 2024

ZhenjaHorbach commented Sep 27, 2024 • edited Loading

iwiznia commented Sep 27, 2024

melvin-bot bot commented Sep 27, 2024

iwiznia commented Sep 27, 2024

OSBotify commented Sep 27, 2024

github-actions bot commented Sep 27, 2024

kavimuru commented Sep 30, 2024

github-actions bot commented Sep 30, 2024

shubham1206agra commented Oct 1, 2024

shubham1206agra commented Jul 22, 2024 •

edited

Loading

jayeshmangwani Jul 25, 2024 •

edited

Loading

ZhenjaHorbach commented Sep 27, 2024 •

edited

Loading

ZhenjaHorbach commented Sep 27, 2024 •

edited

Loading