feat: plural foods and units, and aliases #2674
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Originally I was going to wait until #2632 was merged, but the data pages got reverted anyway so there shouldn't be any merge conflicts either way |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
(REQUIRED)
What this PR does / why we need it:
(REQUIRED)
This PR adds plural names and aliases to foods and units (and a plural abbreviation for units). When parsing, the parser takes all names/abbreviations/aliases into account when matching against an input.
In addition, as you'd expect, foods/units conditionally render their plural counterparts, depending on the quantity and such:
If a food or unit is missing its plural counterpart (i.e. everyone's data prior to this getting merged) it falls back to singular (i.e. on migration nothing will look any different).
The data management pages have been updated to accommodate these changes, along with some helpful hint text:
Which issue(s) this PR fixes:
(REQUIRED)
Closes #1242
Special notes for your reviewer:
(fill-in or delete this section)
Technically this adds several hundred tests... apparently you can chain
pytest.mark.parametrize... lol. However none of them do anything expensive (such as database access) so they zoom.Testing
(fill-in or delete this section)
Pytest for backend, updated composable for frontend (and manually tested).