Port changes to sorting & localized sorting #220
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
Core Foundation functions have names that indicate when you own a returned object: Object-creation functions that have "Create" embedded in the name; Object-duplication functions that have "Copy" embedded in the name. If you own an object, it is your responsibility to relinquish ownership (using CFRelease) when you have finished with it.
On Windows the existing solution for localized comparison seems to do the wrong thing, but evidence suggests that comparison of wstring should work. Convert the strings before comparison on Windows. At the same time, do the reverse conversion on MacOS (this won't actually be used anywhere in the current code, but it seemse a good idea to implement it while we had the experimental data to suggest it was necessary.
Look for calls which sort strings in a non-localized manner.
These are the ones that were caught by the recently improved check.
The two checks were detecting string types in completely different ways. Make them both behave the same way, and remove the now-unused approach.
Warn about comparison or sorting of pairs or tuples where one of the elements is a string.
This doesn't actually catch any more real cases in the current code, but it future-proofs while I'm thinking about such things.
The results were already being sorted, it makes sense to be consistent and sort the components too.
sort_case_insensitive_less relied on toupper(), which will not work well for non-English languages. Remove it and replace its uses with localized_compare.
Sort the list of item types in the wish menu. Using a localized sort on the names as displayed in that menu.
|
I can't really test MacOS myself either. But the tests pass, meaning it at least isn't causing memory corruption. |
I don't see travis though. Did it not run, or github just hides it from me for some reason? |
|
The travis was broken for some reason. After I fixed it, I looked at the history and saw that this PR only failed at Android builds, which are currently bugged for PRs because of #200. |
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.
Summary
SUMMARY: I18N "Switch lists in some menus to use localized sorting; improve the sorting on Windows and MacOS (ported from DDA)"
Purpose of change
Port from DDA PRs that switch various menus to use localized sorting (instead of sorting by id, or by blindly comparing strings).
Also port PRs that fix localized sorting on Windows and MacOS.
Describe the solution
Cherry-picked without changes (the single merge conflict was due to different header inclusions, wow) the following PRs from DDA:
CleverRaven#40100
CleverRaven#40131
CleverRaven#44288
CleverRaven#40062
CleverRaven#40041
CleverRaven#40291
CleverRaven#44078
CleverRaven#41104
Describe alternatives you've considered
Looking for a cross-platform library that can:
Right now those are done via locale-dependent standard library or platform-specific crutches, and these solutions are far from reliable. From personal experience:
However, integrating such library into the codebase is a big project, with all the problems that entails.
Testing
List in "wish for items" is now sorted alphabetically under both Linux and Windows 10 in both English & Russian.
List of character templates is now sorted alphabetically under Linux in both English and Russian, and under Windows 10 in English.
Didn't test the rest of the menus, since the code looks correct.
Didn't test on MacOS or Android, since I don't own the first and can't build for second.
Additional context