fix: Glossary sort order: Change src length sort condition and use Language Dependent sorter #1154
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
- Add sort test cases with locales - GlossarySearcher ctor accept src and target language - use startsWith instead of contains for src length sort detection - fix target term length sort argument. Signed-off-by: Hiroshi Miura <[email protected]>
- Use GlossarySearcher#search - Drop duplicated search in GlossarySearcher Signed-off-by: Hiroshi Miura <[email protected]>
- Move test cases to GlossarySearcherTest.java Signed-off-by: Hiroshi Miura <[email protected]>
|
❌ Unit Tests, Quality checks, and Acceptance Tests failed. Please look a Gradle Scan page for details: |
Signed-off-by: Hiroshi Miura <[email protected]>
miurahr
commented
Oct 25, 2024
Comment on lines
275
to
277
| if (c == 0 && Preferences.isPreferenceDefault(Preferences.GLOSSARY_SORT_BY_SRC_LENGTH, true) | ||
| && (o2.getSrcText().contains(o1.getSrcText()) | ||
| || o1.getSrcText().contains(o2.getSrcText()))) { | ||
| && (o2.getSrcText().startsWith(o1.getSrcText()) | ||
| || o1.getSrcText().startsWith(o2.getSrcText()))) { |
There was a problem hiding this comment.
In org.omegat.gui.preferences.view.GlossaryPreferencesController#initFromPrefs, the default value of Preferences.GLOSSARY_SORT_BY_SRC_LENGTH is false but here is true.
panel.sortBySrcTextLengthCheckBox.setSelected(Preferences.isPreferenceDefault(
Preferences.GLOSSARY_SORT_BY_SRC_LENGTH, false));It should be false for consistency.
and update preference explanation
miurahr
requested review from
Kazephil,
brandelune and
kosivantsov
as code owners
I think this is a clearer description.
Kazephil
reviewed
Oct 27, 2024
| @@ -2768,7 +2768,7 @@ PREFS_GLOSSARY_STEMMING=Use &stemming | |||
| PREFS_GLOSSARY_REPLACE_ON_INSERT=Replace matches when inserting source text | |||
| PREFS_GLOSSARY_REQUIRE_SIMILAR_CASE=&Ignore matches with very different case (e.g. FOO vs foo) | |||
| PREFS_GLOSSARY_MERGE_ALTERNATE_DEFINITIONS=Merge alternate definitions of the same term | |||
| PREFS_GLOSSARY_SORT_BY_SRC_LENGTH=Sort by Source Term Length | |||
| PREFS_GLOSSARY_SORT_BY_SRC_LENGTH=Sort by Source Term Length when two or more terms start with the same characters | |||
There was a problem hiding this comment.
I tried to reword the description a little.
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.
Pull request type
Which ticket is resolved?
What does this PR change?
Other information