8c93587612
On back-porting commit 7f9ee43de783105d8de0a0b614751eec639131f8 to 6.8, I worked out how to move the maximal version of each locale ID to the front, while keeping it after a shorter ID that can't be derived from it. Forward-port a refactored (and more systematic) version of those changes now to dev (and thus 6.9) so that we get reasonable compatibility between versions (albeit with 6.8 still lacking truncated forms, since its QTranslator takes care of those). This, however, brought to light a problem in the subsequent addition and insertion of truncations. Since non-equivalent truncations of the maximal version may (and often do) use the same script, they match equivalents that are now later than the maximal one, which caused all truncations to be appended, where some should be inserted just after the equivalents. Furthermore, had the truncations of the maximal one been inserted, they'd have appeared just after it, before some of its equivalents, where it should be after. Reworked the handling of truncations to take account of the fact that entries come in blocks of equivalent forms; any truncations inserted instead of appended should be inserted after this block, not between its members. Adapt tests to match. As a "drive-by", shuffle some Punjabi tests so that the comment that applies to two of them is followed by those two. Task-number: QTBUG-131894 Change-Id: I67ea21cf279e8a3b2e8413c27ac0fa5dfabdaca7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit b6122866962880251fa8a82856d1fb9db43900d6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>