Resolve a bug with the glossary variations #1706
Conversation
|
The glossary variations are matched in an enterely different way on #1373 |
|
@pedro-mendonca I detected this problem when I was setting up my environment with your .pot file and your glossary CSV, but with the Develop branchThis is the regex using Pedro's glossary
and this is the matched string, the same that I showed in the first screenshot in this PR:
The regex from the unit test
and this is the matched string (different from the previous screenshot):
This PRWith this PR, this is the regex using Pedro's glossary
and this is the matched string, the same that I showed in the second screenshot in this PR:
The regex from the unit test
and this is the matched string:
This PR is need, because currently the variations are not well managed, but I didn't add enough different items in the glossary to make fail the previous code with the new tests. I have added a few items to the glossaries in one test, so the previous code will fail with the |
* Add 'ed', 'ion', and 'ing' to suffix list for glossary term ending with 'e' * Add known suffixes for nouns and verbs * Revert previous commits to further rebase * Add known suffixes for nouns and verbs * Replace the whole list of known plurals by part_of_speech. * Only trims ending pipe * Check if key term is set and is an array * Make suffix doc more clear * Add unit tests for suffixes * Fix tests descriptions * Rename variables for a generic approach for nouns and verbs * Improve list of Nouns formed by verbs with the suffix -ion * Move 'changes' to the pairs ending => change * Improve suffixes changes documentation * Test verbs that form nouns ending with -tion * Test verbs that form nouns ending with -sion * Remove unnecessary code * Fix endings documentation and some formatting * Apply coding standards * Add link to the plurals formation documentation * Improve suffix comment * Don't duplicate endings to glossary entry suffixes. * Combine the suffixes for shorter regular expression. (#1651) * Combine the suffixes for shorter regular expression. * Whitespace * Add unit tests --------- Co-authored-by: Alex Kirk <[email protected]> # Conflicts: # tests/phpunit/testcases/test_template_helper_functions.php * We don't need it anymore because the match checks what precedes the ending * Fix part of speech for its own set of endings * Make the Suffix list filterable. * Rename filter and improve description * Fix typo in tests part_of_speech introduced in PR #1706 * Remove matching for irregular Nouns ending with '-an' * Improve legibility and consistency of dockblocks comments * Add support for verbs ending with single sibilant '-s' (bias) * Fix error in ending size * Improve glossary matches doc comments * Change matches array keys order, preceded first * Use actual preceded for any letters instead of null value. * Add support for placeholders in the endings, to allow reuse of the current ending * Add matches that double the ending consonant * Add check_map_glossary() to test different glossary matches * Fix comment. * Add all the glossary matches tests using check_map_glossary() * Remove irregular Noun plural match * Add test for verb focus * Fixed comments * Add data files for manual testing * Remove ending newlines in example data file * Add glossary matching case example in docblock * Remove glossary suffix .pot and .csv example files * Add check_map_glossary() docblock types --------- Co-authored-by: Jesús Amieiro Becerra <[email protected]>
Problem
In #1696 I introduced a bug with the glossary variations, not detecting them. You can see it in the next screenshot.
Solution
This PR updates the regular expression that splits the original string with the glossary terms and with the placeholders.
Testing Instructions
I have added two new tests to avoid this error another time:
The load time using this method is very similar: