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.

Sign up for GitHub

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

Jump to bottom

Translate alternate text to Spanish #7552

Merged
merged 4 commits into from
Feb 10, 2022
Merged

Translate alternate text to Spanish #7552

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf9d0af
Translate alternate text to Spanish
sobitneupane Feb 3, 2022
64dab20
Set alternateText to Attachment from OptionsListUtils if Attachment
sobitneupane Feb 6, 2022
6188268
Simplify ternary operator in lastMessageText
sobitneupane Feb 9, 2022
8ff224d
Syntatic Change in lastMessageTextFromReport
sobitneupane Feb 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/libs/OptionsListUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ function createOption(personalDetailList, report, {
const personalDetail = personalDetailList[0];
const hasDraftComment = hasReportDraftComment(report);
const hasOutstandingIOU = lodashGet(report, 'hasOutstandingIOU', false);
const isLastMessageAttachment = report ? ReportUtils.isReportMessageAttachment(report.lastMessageText) : false;
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
const isLastMessageAttachment = report ? ReportUtils.isReportMessageAttachment(report.lastMessageText) : false;

const iouReport = hasOutstandingIOU
? lodashGet(iouReports, `${ONYXKEYS.COLLECTION.REPORT_IOUS}${report.iouReportID}`, {})
: {};
Expand All @@ -230,7 +231,7 @@ function createOption(personalDetailList, report, {
? (hasMultipleParticipants && lastActorDetails
? `${lastActorDetails.displayName}: `
: '')
+ Str.htmlDecode(report.lastMessageText)
+ (isLastMessageAttachment ? `[${Localize.translateLocal('common.attachment')}]` : Str.htmlDecode(report.lastMessageText))
Copy link
Member

Choose a reason for hiding this comment

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

Could we please simplify this ternary? lets not nest it multi levels.

Copy link
Contributor Author

@sobitneupane sobitneupane Feb 8, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

This should be okay. Any suggestion?

    const lastMessageTextFromReport = isLastMessageAttachment ? `[${Localize.translateLocal('common.attachment')}]` : Str.htmlDecode(report.lastMessageText);
    const lastMessageText = report
        ? (hasMultipleParticipants && lastActorDetails
            ? `${lastActorDetails.displayName}: `
            : '')
        + (lastMessageTextFromReport)
        : '';

Copy link
Member

Choose a reason for hiding this comment

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

Let's break the concatenation into the next line.

const lastMessageTextFromReport = isLastMessageAttachment ? `[${Localize.translateLocal('common.attachment')}]` : Str.htmlDecode(report.lastMessageText);
 let lastMessageText = report && hasMultipleParticipants && lastActorDetails
            ? `${lastActorDetails.displayName}: `
            : '';
            
     lastMessageText  +=  report? lastMessageTextFromReport : '';

: '';

const tooltipText = ReportUtils.getReportParticipantsTitle(lodashGet(report, ['participants'], []));
Expand Down