Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Change default strings export to named lstrings export #4100

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

Merged
Jon-edge merged 1 commit into develop from jon/fix/lstring-update
Apr 5, 2023

Conversation

@Jon-edge
Copy link
Collaborator

@Jon-edge Jon-edge commented Apr 4, 2023 •
edited
Loading

CHANGELOG

none

Dependencies

none

Requirements

If you have made any visual changes to the GUI. Make sure you have:

  • Tested on iOS device
  • Tested on Android device
  • Tested on small-screen device (iPod Touch)
  • Tested on large-screen device (tablet)

Copy link
Contributor

@swansontec swansontec left a comment

Choose a reason for hiding this comment

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

When you rebase this, be sure to run the precommit hooks. You may have missed src/__tests__/creditCardPlugin.test.ts and src/__tests__/reducers/sendConfirmationReducer.test.ts.

Jon-edge reacted with thumbs up emoji
Comment on lines 47 to 55
mergeStrings(out.strings, allLocales[lang])
mergeStrings(out.lstrings, allLocales[lang])
}

// Find an exact match
// @ts-expect-error
if (allLocales[normalizedLocale] !== undefined) {
found = true
// @ts-expect-error
mergeStrings(out.strings, allLocales[normalizedLocale])
mergeStrings(out.lstrings, allLocales[normalizedLocale])
Copy link
Contributor

@swansontec swansontec Apr 4, 2023

Choose a reason for hiding this comment

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

Ditch the "out" variable and just call mergeStrings(lstrings, ...) directly.

}
}

return false
Copy link
Contributor

@swansontec swansontec Apr 4, 2023

Choose a reason for hiding this comment

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

You accidentally deleted this line!

@Jon-edge Jon-edge force-pushed the jon/fix/lstring-update branch from 174df35 to a8487e5 Compare April 5, 2023 02:18
@Jon-edge Jon-edge merged commit 571a04b into develop Apr 5, 2023
@Jon-edge Jon-edge deleted the jon/fix/lstring-update branch April 5, 2023 02:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@swansontec swansontec swansontec requested changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

AltStyle によって変換されたページ (->オリジナル) /