Commit 05d8ffb4 authored by Shawn Rutledge's avatar Shawn Rutledge
Browse files

Revert: use the new form of QTranslator::load() for more flexibility

This reverts commit 427646b8

.
It seems that it should have been more correct, but we are still not
shipping English translations, and static QString find_translation()
in qtranslator.cpp will return any language which is in
QLocale::uiLanguages() for which the translation file is found.
That is a long list on OSX.

Reverting the patch means find_translation() is not called in
such cases.  This change can be re-done whenever we are more sure
that the attempt to find a translation will succeed in finding a
sensible one, or fall back to not translating, rather than choosing
a language that the user didn't intend.

Task-number: QTBUG-41977
Change-Id: I425946cc71cec96b4f38629eb2b7e80220c5236d
Reviewed-by: default avatarJan Arve Sæther <jan-arve.saether@theqtcompany.com>
parent 94297b4c
No related merge requests found
Showing with 13 additions and 16 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment