Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Translation for system message #21780

Conversation

tienifr
Copy link
Contributor

@tienifr tienifr commented Jun 28, 2023

Details

System messages are currently hard-coded strings. This PR added translationKey for them.

Fixed Issues

$ #19449
PROPOSAL: #19449 (comment)

Tests

  1. Login with any account
  2. Go to Settings > Preferences > Language
  3. Select Spanish language and go back
  4. Go to any chat
  5. Send an Attachment
  6. Verify that [Archivo adjunto] shows on LHN
  • Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

  1. Login with any account
  2. Go to Settings > Preferences > Language
  3. Select Spanish language and go back
  4. Go to any chat
  5. Send an Attachment
  6. Verify that [Archivo adjunto] shows on LHN
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android / native
    • Android / Chrome
    • iOS / native
    • iOS / Safari
    • MacOS / Chrome / Safari
    • MacOS / Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • 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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web
Screencast.from.28-06-2023.16.53.59.webm
Mobile Web - Chrome
video_2023-07-07_23-58-03.mp4
Mobile Web - Safari
original-0E4EA68E-32B7-45EC-AAE8-8FB8B355AF1A.mp4
Desktop
Screen.Recording.2023-07-09.at.15.27.43.mov
iOS
Screen.Recording.2023-07-09.at.15.36.58.mov
Android
Screencast.from.07-07-2023.23.46.56.webm

@tienifr tienifr marked this pull request as ready for review June 28, 2023 09:54
@tienifr tienifr requested a review from a team as a code owner June 28, 2023 09:54
@melvin-bot melvin-bot bot removed the request for review from a team June 28, 2023 09:54
@melvin-bot
Copy link

melvin-bot bot commented Jun 28, 2023

@eVoloshchak 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]

@melvin-bot melvin-bot bot requested a review from eVoloshchak June 28, 2023 09:54
@tienifr
Copy link
Contributor Author

tienifr commented Jun 28, 2023

@eVoloshchak I added new logic for translationKey but since old messages haven't had translationKey yet, I also kept the old logic, for example in isReportMessageAttachment function.

@tienifr
Copy link
Contributor Author

tienifr commented Jun 28, 2023

@yuwenmemon As mentioned above, since all the old report actions haven't had translationKey yet, thus if we proceed my solution, I suggest the back-end changes as follow:

  1. Add translationKey field under message to all old report actions. Defaults to empty string, if attachment then common.attachment.
  2. Add lastMessageTranslationKey key to all reports. Also defaults to empty string, if attachment then common.attachment.

@yuwenmemon
Copy link
Contributor

yuwenmemon commented Jun 28, 2023

@tienifr I think we can proceed without worrying about the old messages if that makes things simpler. This only effects the most recent message shown in the LHN anyway, so I don't see a need to fix the old messages for that reason either.

@tienifr
Copy link
Contributor Author

tienifr commented Jun 29, 2023

Okay so we'll keep both the old and new logic, right?

@yuwenmemon
Copy link
Contributor

Ah, okay then I guess so, but then why would you need this?

Add translationKey field under message to all old report actions. Defaults to empty string, if attachment then common.attachment.

@tienifr
Copy link
Contributor Author

tienifr commented Jun 29, 2023

Take isReportMessageAttachment function for example:

  1. Currently we check if the message.text equals [Attachment] and message.html is either an attachment URI or Uploading attachment.
  2. But after adding translationKey, we only need to compare whether the key equals common.attachment.

Thus I think if we want to completely migrate to the translationKey approach, we SHOULD add the translationKey to all old messages. Otherwise, I'll keep both (1) and (2) logic.

This only effects the most recent message shown in the LHN

This is not true since isReportMessageAttachment is used in a lot of places.

@abdulrahuman5196
Copy link
Contributor

Just providing some information on the subtitle translation issues discussion we had previously for LHN since I saw this PR which was mentioned in another issue. @yuwenmemon @eVoloshchak
We are having different translation issues and previously discussed here - https://expensify.slack.com/archives/C01GTK53T8Q/p1687190693298329

The last callout was to avoid complicated solutions incase of LHN translations and leave out small bugs if only way forward is a complex solution. Even attachments was mentioned there and the current path seems to have backend changes and complex solutions.
And one more concern is that, it not just we have either translated or non-translated subtitles, we also have complex subtitles where the message has part translated and part non-translated content, which would not have solved by the new translation key and we can't use the translation key in this case. For Eg.

lastMessageText =
Localize.translate(preferredLocale, 'reportActionsView.beginningOfChatHistory') +
_.map(displayNamesWithTooltips, ({displayName, pronouns}, index) => {
const formattedText = _.isEmpty(pronouns) ? displayName : `${displayName} (${pronouns})`;
if (index === displayNamesWithTooltips.length - 1) {
return `${formattedText}.`;
}
if (index === displayNamesWithTooltips.length - 2) {
return `${formattedText} ${Localize.translate(preferredLocale, 'common.and')}`;
}
if (index < displayNamesWithTooltips.length - 2) {
return `${formattedText},`;
}
}).join(' ');
}

But anyways just providing my 2 cents from the last discussion I had and leaving it up for you guys to decide.

@bernhardoj
Copy link
Contributor

The proposal
here #19449 (comment) is actually a straight and easy solution.

@eVoloshchak
Copy link
Contributor

@abdulrahuman5196, thanks for attaching the discussion!
According to the thread:

would be totally fine if server side messages are not translated ever, since translating the backend is not something we did yet and whenever we want to fully internationalize the app, we will need to add backend translation anyway
I am also fine leaving small bugs related to this, especially when switching languages

It is a rare bug that can be reproduced only when switching languages, I agree this isn't a top priority. I think the implementation in this PR is correct, so in case we decide to implement this later - we should use it.
Asking if we should proceed in slack thread

@tienifr
Copy link
Contributor Author

tienifr commented Jul 6, 2023

@eVoloshchak Any update?

Copy link
Contributor

@eVoloshchak eVoloshchak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tienifr, the translation in LHN works well now.
I think we should translate "Uploading attachment" message too

Screen.Recording.2023-07-06.at.17.39.28.mov

@tienifr
Copy link
Contributor Author

tienifr commented Jul 6, 2023

We are going to remove the Uploading attachment message, aren't we? I thought we have already agreed on translating [Attachment] only.

@eVoloshchak
Copy link
Contributor

eVoloshchak commented Jul 7, 2023

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 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
Screen.Recording.2023-07-10.at.14.02.38.mov
Mobile Web - Chrome
screen-20230710-140726.mp4
Mobile Web - Safari
Screen.Recording.2023-07-10.at.15.10.04.mov
Desktop
Screen.Recording.2023-07-10.at.14.14.37.mov
iOS
Screen.Recording.2023-07-10.at.15.08.13.mov
Android
screen-20230710-140856.mp4

@eVoloshchak
Copy link
Contributor

We are going to remove the Uploading attachment message, aren't we? I thought we have already agreed on translating [Attachment] only.

Ah, you're correct, we indeed have an issue for that

Looks good to me, there are only two steps left

  1. Merge with main
  2. Upload videos for the remaining platforms

@tienifr
Copy link
Contributor Author

tienifr commented Jul 7, 2023

@eVoloshchak main was pulled. I'll upload the rest videos in the next hour.

@tienifr
Copy link
Contributor Author

tienifr commented Jul 9, 2023

@eVoloshchak All were updated. Thanks for your patience.

Copy link
Contributor

@eVoloshchak eVoloshchak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@melvin-bot melvin-bot bot requested a review from yuwenmemon July 10, 2023 12:15
@eVoloshchak
Copy link
Contributor

@tienifr, could you please take a look at the failing PR Author check?
It might have been updated

@tienifr
Copy link
Contributor Author

tienifr commented Jul 10, 2023

@eVoloshchak Thanks, I've updated that.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/yuwenmemon in version: 1.3.40-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.40-5 🚀

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

@@ -249,6 +249,7 @@ function addActions(reportID, text = '', file) {

const optimisticReport = {
lastVisibleActionCreated: currentTime,
lastMessageTranslationKey: lodashGet(lastAction, 'message[0].translationKey', ''),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like that push event should also update this field to update let LHN message after sending an attachment, like this case #22937

@@ -249,6 +249,7 @@ function addActions(reportID, text = '', file) {

const optimisticReport = {
lastVisibleActionCreated: currentTime,
lastMessageTranslationKey: lodashGet(lastAction, 'message[0].translationKey', ''),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi all, this PR caused a regression Red dot and [Attachment] shows in LHN even after close error message

This is because we didn't set failure data for lastMessageTranslationKey

* @returns {Boolean}
*/
export default function isReportMessageAttachment({text, html}) {
export default function isReportMessageAttachment({text, html, translationKey}) {
if (translationKey) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👋 This was partially responsible for a regression in #24246
It was mainly a back-end problem, the translation key is not set/reset when we change from a message with a translation key to one without, or vice-versa
While this wasn't caused by this PR, leaving a note to myself and others to test more complex test cases (this one included testing with two accounts)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @eVoloshchak

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants