1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QMimeType::comments(): skip locale-name-trimming

Browse Source 
Pruning the part of a locale name after the first '_' should now be
redundant, as QLocale::uiLanguages() now includes the resulting
truncations. It may do so later in the sequence than the pruning used
here, where the pruned version either might be a bad choice (due to
being in a script incompatible with what we started on, e.g. pruning
pa_PK to pa, which uses a different script) or would also arise from
some later, more specific, entry (as when uiLanguages() is expanded
from {en_NL, en_150}, where checking en immediately after en_NL would
bypass the more specific en_150 when present).

Pick-to: 6.9
Change-Id: I4c7c199ca16a8e4803843547c5a689cea11af1f2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2025-01-16 14:35:17 +01:00
parent bc733ea787
commit 9574e8cbef
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/mimetypes/qmimetype.cpp
View File

@ -213,13 +213,6 @@ QString QMimeType::comment() const
QString comm = localeComments.value(lang); QString comm = localeComments.value(lang);
if (!comm.isEmpty()) if (!comm.isEmpty())
return comm; return comm;
const qsizetype cut = lang.indexOf(u'_');
// If "de_CH" is missing, check for "de" (and similar):
if (cut != -1) {
comm = localeComments.value(lang.left(cut));
if (!comm.isEmpty())
return comm;
}
} }
// Use the mimetype name as fallback // Use the mimetype name as fallback