Repository navigation
fix: unify on פַּעֲמָה / פְּעָמוֹת, and match אי־זוגי - #1106
Merged
Merged
Conversation
The bank, the lessons and the tests mixed פעמה with פעימה, which is the pulse of physics rather than the musical beat. Both spellings are now the vocalized Academy form, including the regexes that match prompts. Item ids and order are unchanged. An odd/even answer written with a maqaf (אי־זוגי) now matches the same word written with an ASCII hyphen, so the sound plan is not dropped on the hyphen. Co-authored-by: Aviran Swissa <swissa.aviran@s.afeka.ac.il>
Codecov Report❌ Patch coverage is
📢 Thoughts on this report? Let us know! |
Keep the count-up stand marker and difference prompts from master, and name those beats with the Academy spelling פַּעֲמָה. The phone-speaker check uses that same spelling so the 4/4 phrase still plans. Co-authored-by: Aviran Swissa <swissa.aviran@s.afeka.ac.il>
This file contains hidden or 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
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.
Why
Issue #1096, owner's decision: one Hebrew term, the Academy's music word פַּעֲמָה / פְּעָמוֹת, everywhere in the bank, the UI, the tests and the regexes. "פעימה" is the pulse used in physics and sport. The bank was mixing the two (and an unvocalized פעמה).
The replacement is spelling only. Item ids are
grade-skill-indexin the bank array, and nothing was inserted, deleted or reordered, so ids stay put. Bells (פעמון) and "פעמיים" were not touched.Regexes that looked for the old stem (
פעימ) could not see the vocalized word, because the vowel marks sit between the letters. Those checks now strip the marks and look for פעמ.Also from #1085:
dataWorldscompared the parity answer with!==, soאי-זוגיandאי־זוגיdid not match and an odd item would not sound. The comparison now folds hyphen and maqaf. The revealed answer keeps the spelling the item itself uses.isCorrectalready treated them as the same typed answer.Size
About 1,900 changed lines, almost all one-word substitutions across 113 files. It is over the 400-line auto-merge ceiling. Splitting it would leave the bank on one spelling and a regex on the other, so this stays one change.
Tests
test/paamaSpelling.test.jswalkssrcandtestand fails if the old spellings remain, and it checks that a maqaf answer and an ASCII-hyphen answer both plan the same odd sum.Refs #1096, #1085. Do not merge from this branch.