Skip to content

Conversation

@Jon-edge
Copy link
Collaborator

@Jon-edge Jon-edge commented Apr 4, 2023

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.

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

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

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!

@swansontec swansontec force-pushed the jon/fix/lstring-update branch from e4821e1 to 174df35 Compare April 5, 2023 01:44
@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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants