fix: translate channel log by namhihi237 · Pull Request #32612 · Expensify/App

namhihi237 · 2023-12-07T02:40:01Z

Details

A second attempt to fix #30087, after it caused regression and got reverted in #32601

Fixed Issues

$ #30087
PROPOSAL: #30087 (comment)

Tests

Create a room
Go to room details
Go to members
Click Invite and invite 1 member and more than 2 member
Change language to Spanish, and verify that the Alternate text on LHN and the message invite members in the room are translated

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

The same test

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2023-12-07.at.09.37.01.mov

Android: mWeb Chrome

Screen.Recording.2023-12-07.at.09.43.26.mov

iOS: Native

Screen.Recording.2023-12-07.at.09.48.56.mov

iOS: mWeb Safari

Screen.Recording.2023-12-07.at.09.49.33.mov

MacOS: Chrome / Safari

Screen.Recording.2023-12-07.at.09.42.20.mov

MacOS: Desktop

Screen.Recording.2023-12-07.at.09.51.38.mov

melvin-bot · 2023-12-07T02:55:40Z

@cubuspl42 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

jakub-trzebiatowski · 2023-12-07T10:23:36Z

Is this related?

Yeah, Currently the error happen because required cycle. In en.ts import ReportActionsUtils and ReportActionsUtils.ts we import Localize.ts.

#30927 (comment)

jakub-trzebiatowski · 2023-12-07T10:32:11Z

Please force-push this branch, rewriting it in the folloiwng way...

First, un-revert (revert the revert)
Then, apply the actual new fixes in one or more commits

This is not reviewable in this state

namhihi237 · 2023-12-07T10:50:31Z

@cubuspl42 revert and add commit fix.

jakub-trzebiatowski · 2023-12-07T10:51:45Z

Oh, so the circular import was the thing that caused the seemingly SVG-related error?

namhihi237 · 2023-12-07T10:53:42Z

Yeah I am not sure why, but it lead this error.

jakub-trzebiatowski · 2023-12-07T12:35:31Z

Please include the relevant context in the "Details" section, for example:

"A second attempt to fix (issue link), after it caused (regression issue link) and got reverted in (revert PR link). If somebody will ever need to navigate this graph (and this happens), they will be grateful.

namhihi237 · 2023-12-07T12:40:19Z

yeah, I updated detail

jakub-trzebiatowski · 2023-12-11T19:17:12Z

We have a conflict, but it's not a random one. I think we're conflicting with the actual revert we want to revert.

I'm sorry to ask, but would you rewrite the history again, but this time revert the revert using git revert? The commit will have a title like...

Revert "Revert "translate invite member to room""

[some more lines, if there was a conflict]

On top of that, you can cherry-pick the commit with the new fix.

Thank you for understanding.

If that's easier for you, you can take these commits directly from here. I have fixed the conflict and cherry-picked your changes.

Assuming you're on fix-30087-translate-channel-log and the repository state is clean:

git remote add cubuspl42 https://github.com/cubuspl42/App.git
git fetch cubuspl42
git reset --hard cubuspl42/translate-channel-log-rewritten-1
git push --force

This reverts commit 9d31e4b.

namhihi237 · 2023-12-12T06:32:17Z

Thanks, I updated based on your suggestion and merged main.

jakub-trzebiatowski · 2023-12-12T12:28:54Z

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 / Chrome
- iOS / native
- iOS / 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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(themeColors.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 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 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 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 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

Web

translate-channel-log-again-web.mp4

Mobile Web - Chrome

translate-channel-log-again-android-web-compressed.mp4

Mobile Web - Safari

translate-channel-log-again-ios-web.mp4

Desktop

translate-channel-log-again-desktop.mp4

iOS

translate-channel-log-again-ios.mp4

Android

translate-channel-log-again-android-compressed.mp4

mountiny

This is a tricky one, thanks for sticking through it

OSBotify · 2023-12-12T13:17:13Z

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

OSBotify · 2023-12-13T11:30:19Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.12-0 🚀

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

OSBotify · 2023-12-13T11:51:02Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.12-0 🚀

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

OSBotify · 2023-12-13T12:18:36Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.12-0 🚀

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

OSBotify · 2023-12-14T15:25:19Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.12-2 🚀

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

tienifr · 2023-12-20T08:02:46Z

+        .map((messageElement) => {
+            switch (messageElement.kind) {
+                case 'userMention':
+                    return `<mention-user accountID=${messageElement.accountID}></mention-user>`;


@namhihi237 Why didn't we include the mentioned display name here? Did it cause any regression? For example:

`<mention-user accountID=${messageElement.accountID}>${messageElement.content}</mention-user>`

@tienifr As I know currently mention-user use MentionUserRenderer to display, in here the display name will get by accountID if we pass accountID

I think if we use like you mention i think the ${messageElement.content} does not effect because we pass the accountID

Yeah thanks! I just want to make sure adding ${messageElement.content} does not cause any issue.

tienifr · 2023-12-20T08:03:14Z

I'm working on copying channel log function, I have two questions:

Do we apply this change (translate message) with added or removed member messages? Because as I see, we didn't do it for removed, but code changes imply the difference.

https://github.com/Expensify/App/pull/32612/files#r1432377947

@namhihi237 Please support me. Thanks!

namhihi237 · 2023-12-20T08:46:19Z

@tienifr In This scope of PR we only support isMemberChangeAction

namhihi237 marked this pull request as ready for review December 7, 2023 02:55

namhihi237 requested a review from a team as a code owner December 7, 2023 02:55

melvin-bot Bot requested review from jakub-trzebiatowski and removed request for a team December 7, 2023 02:55

namhihi237 mentioned this pull request Dec 7, 2023

translate invite member to room #30927

Merged

58 tasks

jakub-trzebiatowski reviewed Dec 7, 2023

View reviewed changes

namhihi237 force-pushed the fix-30087-translate-channel-log branch from 294de20 to 35c409e Compare December 7, 2023 10:46

tienifr mentioned this pull request Dec 8, 2023

Turn channel log member message into HTML #32161

Merged

56 tasks

jakub-trzebiatowski mentioned this pull request Dec 11, 2023

[HOLD for payment 2023-12-15] [$500] Dev: Alternate text on sidebar does not translate when Invite member to room #30087

Closed

6 tasks

jakub-trzebiatowski and others added 2 commits December 11, 2023 20:21

Revert "Revert "translate invite member to room""

07d6418

This reverts commit 9d31e4b.

Fix the circural import

09f457e

namhihi237 force-pushed the fix-30087-translate-channel-log branch from df8904d to 09f457e Compare December 12, 2023 06:25

merge main

dd9c3cd

jakub-trzebiatowski approved these changes Dec 12, 2023

View reviewed changes

melvin-bot Bot requested a review from mountiny December 12, 2023 12:29

mountiny assigned namhihi237 Dec 12, 2023

mountiny approved these changes Dec 12, 2023

View reviewed changes

mountiny merged commit 897dead into Expensify:main Dec 12, 2023

github-actions Bot mentioned this pull request Dec 13, 2023

[$500] Deploy Checklist: New Expensify 2023-12-13 #32963

Closed

64 tasks

tienifr reviewed Dec 20, 2023

View reviewed changes

Conversation

namhihi237 commented Dec 7, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Dec 7, 2023

Uh oh!

jakub-trzebiatowski Dec 7, 2023

Choose a reason for hiding this comment

Uh oh!

namhihi237 Dec 7, 2023

Choose a reason for hiding this comment

Uh oh!

namhihi237 Dec 7, 2023

Choose a reason for hiding this comment

Uh oh!

jakub-trzebiatowski commented Dec 7, 2023

Uh oh!

namhihi237 commented Dec 7, 2023

Uh oh!

jakub-trzebiatowski commented Dec 7, 2023

Uh oh!

namhihi237 commented Dec 7, 2023

Uh oh!

jakub-trzebiatowski commented Dec 7, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

namhihi237 commented Dec 7, 2023

Uh oh!

jakub-trzebiatowski commented Dec 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

namhihi237 commented Dec 12, 2023

Uh oh!

jakub-trzebiatowski commented Dec 12, 2023

Reviewer Checklist

Screenshots/Videos

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Dec 12, 2023

Uh oh!

OSBotify commented Dec 13, 2023

Uh oh!

OSBotify commented Dec 13, 2023

Uh oh!

OSBotify commented Dec 13, 2023

Uh oh!

OSBotify commented Dec 14, 2023

Uh oh!

tienifr Dec 20, 2023

Choose a reason for hiding this comment

Uh oh!

namhihi237 Dec 20, 2023

Choose a reason for hiding this comment

Uh oh!

namhihi237 Dec 20, 2023

Choose a reason for hiding this comment

Uh oh!

tienifr Dec 20, 2023

Choose a reason for hiding this comment

Uh oh!

tienifr commented Dec 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

namhihi237 commented Dec 20, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

namhihi237 commented Dec 7, 2023 •

edited

Loading

jakub-trzebiatowski commented Dec 7, 2023 •

edited

Loading

jakub-trzebiatowski commented Dec 11, 2023 •

edited

Loading

tienifr commented Dec 20, 2023 •

edited

Loading